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

Fix for messages originating from a point, where PATH: is empty
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 40s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m31s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George 2025-01-07 21:02:32 +11:00
parent 29cbc80982
commit 3e202e34d2
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Classes/FTN/Message.php
View File

@ -686,7 +686,6 @@ class Message extends FTNBase
// First find our kludge lines // First find our kludge lines
$ptr_start = 0; $ptr_start = 0;
$ptr_end = 0;
try { try {
while (substr($message,$ptr_start,1) === "\x01") { while (substr($message,$ptr_start,1) === "\x01") {
@ -828,14 +827,17 @@ class Message extends FTNBase
$m = []; $m = [];
preg_match('/^([^\s]+:?)+\s+(.*)$/',$line,$m); preg_match('/^([^\s]+:?)+\s+(.*)$/',$line,$m);
$o->kludges = [$m[1],$m[2]];
// Messages that originate from a point dont have anything in a PATH
if (count($m) === 2)
$o->kludges = [$m[1],$m[2]];
} }
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error(sprintf('%s:! Error parsing message, now at offset [0x%02x] (%s)', Log::error(sprintf('%s:! Error parsing message, now at offset [0x%02x] (%s)',
self::LOGKEY, self::LOGKEY,
$ptr_start, $ptr_start,
$e->getMessage()),['dump'=>hex_dump($message)]); $e->getMessage()),['dump'=>hex_dump($message),'line'=>$e->getLine(),'file'=>$e->getFile()]);
throw new InvalidPacketException('Error parsing message'); throw new InvalidPacketException('Error parsing message');
} }

10
app/Classes/FTN/Packet.php
View File

@ -142,7 +142,13 @@ abstract class Packet extends FTNBase implements \Iterator, \Countable
Log::info(sprintf('%s:- Packet [%s] is a [%s] packet',self::LOGKEY,$o->name,get_class($o))); Log::info(sprintf('%s:- Packet [%s] is a [%s] packet',self::LOGKEY,$o->name,get_class($o)));
if ($o->fz && ($o->fd || $so)) { if ($o->fz && $o->fd) {
$o->zone = Zone::where('zone_id',$o->fz)
->join('domains',['domains.id'=>'zones.domain_id'])
->where('name',$o->fd)
->single();
} elseif ($o->fz && $so) {
Log::alert(sprintf('%s:! No domain in the packet, work it out from the system [%d] for zone [%d]',self::LOGKEY,$so->name,$o->fz)); Log::alert(sprintf('%s:! No domain in the packet, work it out from the system [%d] for zone [%d]',self::LOGKEY,$so->name,$o->fz));
if (($x=$so->zones->where('zone_id',$o->fz)->unique('domain_id'))->count() === 1) { if (($x=$so->zones->where('zone_id',$o->fz)->unique('domain_id'))->count() === 1) {
@ -163,7 +169,7 @@ abstract class Packet extends FTNBase implements \Iterator, \Countable
->sole(); ->sole();
} catch (ModelNotFoundException $e) { } catch (ModelNotFoundException $e) {
throw new InvalidPacketException(sprintf('%s:! We couldnt work out the packet zone, and there isnt a default for[%d]',self::LOGKEY,$o->fz)); throw new InvalidPacketException(sprintf('%s:! We couldnt work out the packet zone, and there isnt a default for [%d]',self::LOGKEY,$o->fz));
} }
} }