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

Only consider NR mode if the offset presented is -1

Browse Source
This commit is contained in:
Deon George 2023-07-09 22:19:11 +10:00
parent 52055c5217
commit 029ec9c209
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Classes/Protocol.php
View File

@ -249,14 +249,13 @@ abstract class Protocol
*/ */
public function onConnect(SocketClient $client): ?int public function onConnect(SocketClient $client): ?int
{ {
$ppid = getmypid();
$pid = pcntl_fork(); $pid = pcntl_fork();
if ($pid === -1) if ($pid === -1)
throw new SocketException(SocketException::CANT_ACCEPT,'Could not fork process'); throw new SocketException(SocketException::CANT_ACCEPT,'Could not fork process');
if ($pid) if ($pid)
Log::info(sprintf('%s:- Running connection in pid [%d] (%d)',self::LOGKEY,$pid,$ppid)); Log::info(sprintf('%s:+ New connection, thread [%d] created',self::LOGKEY,$pid));
// Parent return ready for next connection // Parent return ready for next connection
return $pid; return $pid;

4
app/Classes/Protocol/Binkp.php
View File

@ -13,7 +13,7 @@ use App\Classes\Crypt;
use App\Classes\Protocol as BaseProtocol; use App\Classes\Protocol as BaseProtocol;
use App\Classes\Sock\SocketClient; use App\Classes\Sock\SocketClient;
use App\Classes\Sock\SocketException; use App\Classes\Sock\SocketException;
use App\Models\{Address,Setup}; use App\Models\Address;
final class Binkp extends BaseProtocol final class Binkp extends BaseProtocol
{ {
@ -900,7 +900,7 @@ final class Binkp extends BaseProtocol
Log::debug(sprintf('%s:- Getting file from offset [%ld]',self::LOGKEY,$file['offs'])); Log::debug(sprintf('%s:- Getting file from offset [%ld]',self::LOGKEY,$file['offs']));
//$this->msgs(self::BPM_GET,sprintf('%s %ld',$this->recv->name_size_time,($file['offs'] < 0) ? 0 : $file['offs'])); //$this->msgs(self::BPM_GET,sprintf('%s %ld',$this->recv->name_size_time,($file['offs'] < 0) ? 0 : $file['offs']));
if (((int)$file['offs'] !== -1) && (! $this->capGet(self::F_NOREL,self::O_THEY))) { if (((int)$file['offs'] === -1) && (! $this->capGet(self::F_NOREL,self::O_THEY))) {
Log::debug(sprintf('%s:- Assuming the remote wants NR mode, since offset is [%d] and they didnt specify an OPT with it',self::LOGKEY,$file['offs'])); Log::debug(sprintf('%s:- Assuming the remote wants NR mode, since offset is [%d] and they didnt specify an OPT with it',self::LOGKEY,$file['offs']));
$this->capSet(self::F_NOREL,self::O_THEY); $this->capSet(self::F_NOREL,self::O_THEY);
} }