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

Fix for unknown FTN when connection is not established, try and catch unknown socket exception during session initialisation

Browse Source
This commit is contained in:
Deon George 2021-09-11 11:47:26 +10:00
parent 72bc9790d1
commit 7e176d7bc1
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Classes/Protocol.php
View File

@ -304,7 +304,7 @@ abstract class Protocol
Log::info(sprintf('%s: Total: %s - %d:%02d:%02d online, (%d) %lu%s sent, (%d) %lu%s received - %s', Log::info(sprintf('%s: Total: %s - %d:%02d:%02d online, (%d) %lu%s sent, (%d) %lu%s received - %s',
self::LOGKEY, self::LOGKEY,
$this->node->address->ftn, $this->node->address ? $this->node->address->ftn : 'Unknown',
$this->node->session_time/3600, $this->node->session_time/3600,
$this->node->session_time%3600/60, $this->node->session_time%3600/60,
$this->node->session_time%60, $this->node->session_time%60,

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

@ -100,7 +100,15 @@ final class SocketServer {
if (($accept = socket_accept($this->server)) === FALSE) if (($accept = socket_accept($this->server)) === FALSE)
throw new SocketException(SocketException::CANT_ACCEPT,socket_strerror(socket_last_error($this->server))); throw new SocketException(SocketException::CANT_ACCEPT,socket_strerror(socket_last_error($this->server)));
$this->handler[0]->{$this->handler[1]}(new SocketClient($accept)); try {
$r = new SocketClient($accept);
} catch (\ErrorException $e) {
Log::error(sprintf('%s:! Creating Socket client failed? [%s]',self::LOGKEY,$e->getMessage()));
continue;
}
$this->handler[0]->{$this->handler[1]}($r);
} }
} }