bbs/clrghouz
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Disabling adding to path - its adding to the end of the path which is not correct

Browse Source
This commit is contained in:
Deon George 2023-11-17 20:49:25 +11:00
parent 4a870b6587
commit 45d78233b2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Jobs/MessageProcess.php
View File

@ -287,11 +287,13 @@ class MessageProcess implements ShouldQueue
$dummy = collect(); $dummy = collect();
$path = $this->parseAddresses('path',$this->msg->path,$this->pktsrc->zone,$dummy); $path = $this->parseAddresses('path',$this->msg->path,$this->pktsrc->zone,$dummy);
/*
// If our sender is not in the path, add it // If our sender is not in the path, add it
if (! $path->contains($this->sender->id)) { if (! $path->contains($this->sender->id)) {
Log::alert(sprintf('%s:? Echomail adding sender to PATH [%s] for [%d].',self::LOGKEY,$x->ftn,$o->id)); Log::alert(sprintf('%s:? Echomail adding sender to PATH [%s] for [%d].',self::LOGKEY,$x->ftn,$o->id));
$path->push($this->sender->id); $path->push($this->sender->id);
} }
*/
$ppoid = NULL; $ppoid = NULL;
foreach ($path as $aoid) { foreach ($path as $aoid) {
@ -362,21 +364,25 @@ class MessageProcess implements ShouldQueue
if ($x=$this->msg->fboss_o) { if ($x=$this->msg->fboss_o) {
$o->fftn_id = $x->id; $o->fftn_id = $x->id;
/*
// Make sure our sender and packet source are in the path // Make sure our sender and packet source are in the path
if (! $this->msg->path->contains($x->ftn)) { if (! $this->msg->path->contains($x->ftn)) {
Log::alert(sprintf('%s:? Echomail adding sender to PATH [%s].',self::LOGKEY,$x->ftn)); Log::alert(sprintf('%s:? Echomail adding sender to PATH [%s].',self::LOGKEY,$x->ftn));
$this->msg->path->push($x->ftn); $this->msg->path->push($x->ftn);
} }
*/
} else { } else {
$o->fftn_id = NULL; // @todo This should be the node that originated the message - but since that node is not in the DB it would be null $o->fftn_id = NULL; // @todo This should be the node that originated the message - but since that node is not in the DB it would be null
} }
/*
if (! $this->msg->path->contains($this->pktsrc->id)) { if (! $this->msg->path->contains($this->pktsrc->id)) {
Log::alert(sprintf('%s:? Echomail adding pktsrc to PATH [%s].',self::LOGKEY,$x->ftn)); Log::alert(sprintf('%s:? Echomail adding pktsrc to PATH [%s].',self::LOGKEY,$x->ftn));
$this->msg->path->push($this->pktsrc->id); $this->msg->path->push($this->pktsrc->id);
} }
*/
$o->echoarea_id = $ea->id; $o->echoarea_id = $ea->id;
$o->msgid = $this->msg->msgid; $o->msgid = $this->msg->msgid;