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

Fix UDP services (ie: DNS)
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 38s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m34s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 11s
Details

Browse Source
This commit is contained in:
Deon George 2024-11-26 17:03:59 +11:00
parent c0517c04f0
commit 5312bee9bc
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Classes/Protocol.php
View File

@ -360,11 +360,11 @@ abstract class Protocol
* Setup a session with a remote client * Setup a session with a remote client
* *
* @param SocketClient $client Socket details of session * @param SocketClient $client Socket details of session
* @param Address|null $o If we have an address, we originated a session to this Address * @param Address $o If we have an address, we originated a session to this Address
* @return int * @return int
* @throws \Exception * @throws \Exception
*/ */
public function session(SocketClient $client,Address $o=NULL): int public function session(SocketClient $client,Address $o): int
{ {
if ($o->exists) if ($o->exists)
Log::withContext(['ftn'=>$o->ftn]); Log::withContext(['ftn'=>$o->ftn]);
@ -395,7 +395,7 @@ abstract class Protocol
} }
// We are an IP node // We are an IP node
$this->optionSet(self::O_TCP);
$this->client = $client; $this->client = $client;
// @todo This appears to be a bug in laravel? Need to call app()->isDownForMaintenance() twice? // @todo This appears to be a bug in laravel? Need to call app()->isDownForMaintenance() twice?
app()->isDownForMaintenance(); app()->isDownForMaintenance();
@ -405,6 +405,7 @@ abstract class Protocol
case EMSI::class: case EMSI::class:
Log::debug(sprintf('%s:- Starting EMSI',self::LOGKEY)); Log::debug(sprintf('%s:- Starting EMSI',self::LOGKEY));
$this->optionSet(self::O_TCP);
$rc = $this->protocol_init(); $rc = $this->protocol_init();
if ($rc < 0) { if ($rc < 0) {
Log::error(sprintf('%s:! Unable to start EMSI [%d]',self::LOGKEY,$rc)); Log::error(sprintf('%s:! Unable to start EMSI [%d]',self::LOGKEY,$rc));
@ -419,10 +420,14 @@ abstract class Protocol
case Binkp::class: case Binkp::class:
Log::debug(sprintf('%s:- Starting BINKP',self::LOGKEY)); Log::debug(sprintf('%s:- Starting BINKP',self::LOGKEY));
$this->optionSet(self::O_TCP);
$rc = $this->protocol_session($this->originate); $rc = $this->protocol_session($this->originate);
break; break;
case DNS::class:
return $this->protocol_session();
default: default:
Log::error(sprintf('%s:! Unsupported session type [%s]',self::LOGKEY,get_class($this))); Log::error(sprintf('%s:! Unsupported session type [%s]',self::LOGKEY,get_class($this)));

3
app/Classes/Sock/SocketServer.php
View File

@ -155,7 +155,8 @@ final class SocketServer {
$r = new SocketClient($this->server); $r = new SocketClient($this->server);
if ($r->hasData(30)) { if ($r->hasData(30)) {
$this->handler[0]->{$this->handler[1]}($r); if (! ($this->handler[0]->{$this->handler[1]}($r)))
exit(0);
// Sleep so our thread has a chance to pick up the data from our connection // Sleep so our thread has a chance to pick up the data from our connection
usleep(50000); usleep(50000);