Compare commits
11 Commits
b322a3f0b0
...
5312bee9bc
Author | SHA1 | Date | |
---|---|---|---|
5312bee9bc | |||
c0517c04f0 | |||
b5e76c77f8 | |||
b67ae28b98 | |||
521a9b0679 | |||
24144de193 | |||
aabc8b5a65 | |||
1aabd323bb | |||
bf3fce252d | |||
72ad1307c5 | |||
f0f2d74a14 |
@ -360,11 +360,11 @@ abstract class Protocol
|
||||
* Setup a session with a remote client
|
||||
*
|
||||
* @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
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function session(SocketClient $client,Address $o=NULL): int
|
||||
public function session(SocketClient $client,Address $o): int
|
||||
{
|
||||
if ($o->exists)
|
||||
Log::withContext(['ftn'=>$o->ftn]);
|
||||
@ -395,14 +395,17 @@ abstract class Protocol
|
||||
}
|
||||
|
||||
// We are an IP node
|
||||
$this->optionSet(self::O_TCP);
|
||||
|
||||
$this->client = $client;
|
||||
// @todo This appears to be a bug in laravel? Need to call app()->isDownForMaintenance() twice?
|
||||
app()->isDownForMaintenance();
|
||||
$this->down = app()->isDownForMaintenance();
|
||||
|
||||
switch (get_class($this)) {
|
||||
case EMSI::class:
|
||||
Log::debug(sprintf('%s:- Starting EMSI',self::LOGKEY));
|
||||
|
||||
$this->optionSet(self::O_TCP);
|
||||
$rc = $this->protocol_init();
|
||||
if ($rc < 0) {
|
||||
Log::error(sprintf('%s:! Unable to start EMSI [%d]',self::LOGKEY,$rc));
|
||||
@ -417,10 +420,14 @@ abstract class Protocol
|
||||
case Binkp::class:
|
||||
Log::debug(sprintf('%s:- Starting BINKP',self::LOGKEY));
|
||||
|
||||
$this->optionSet(self::O_TCP);
|
||||
$rc = $this->protocol_session($this->originate);
|
||||
|
||||
break;
|
||||
|
||||
case DNS::class:
|
||||
return $this->protocol_session();
|
||||
|
||||
default:
|
||||
Log::error(sprintf('%s:! Unsupported session type [%s]',self::LOGKEY,get_class($this)));
|
||||
|
||||
|
@ -155,7 +155,8 @@ final class SocketServer {
|
||||
$r = new SocketClient($this->server);
|
||||
|
||||
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
|
||||
usleep(50000);
|
||||
|
Loading…
Reference in New Issue
Block a user