diff --git a/app/Classes/Protocol/Binkd.php b/app/Classes/Protocol/Binkp.php similarity index 99% rename from app/Classes/Protocol/Binkd.php rename to app/Classes/Protocol/Binkp.php index 9b45169..ffcfc86 100644 --- a/app/Classes/Protocol/Binkd.php +++ b/app/Classes/Protocol/Binkp.php @@ -14,7 +14,7 @@ use App\Classes\Sock\SocketClient; use App\Classes\Sock\SocketException; use App\Models\Address; -final class Binkd extends BaseProtocol +final class Binkp extends BaseProtocol { /* -- */ private const BP_PROT = 'binkp'; /* protocol text */ @@ -591,7 +591,7 @@ final class Binkd extends BaseProtocol $rc = 0; while(($rem_aka = $this->strsep($buf,' '))) { - Log::debug(sprintf('%s: - Parsing AKA [%s]',__METHOD__,$rem_aka)); + Log::info(sprintf('%s: - Parsing AKA [%s]',__METHOD__,$rem_aka)); try { if (! ($o = Address::findFTN($rem_aka))) { diff --git a/app/Console/Commands/BinkpReceive.php b/app/Console/Commands/BinkpReceive.php index d52ffc8..5d99e17 100644 --- a/app/Console/Commands/BinkpReceive.php +++ b/app/Console/Commands/BinkpReceive.php @@ -5,7 +5,7 @@ namespace App\Console\Commands; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; -use App\Classes\Protocol\Binkd as BinkdClass; +use App\Classes\Protocol\Binkp; use App\Classes\Sock\SocketException; use App\Classes\Sock\SocketServer; use App\Models\Setup; @@ -36,7 +36,7 @@ class BinkpReceive extends Command Log::info('Listening for BINKP connections...'); $server = new SocketServer(Setup::BINKP_PORT,Setup::BINKP_BIND); - $server->setConnectionHandler([new BinkdClass(Setup::findOrFail(config('app.id'))),'onConnect']); + $server->setConnectionHandler([new Binkp(Setup::findOrFail(config('app.id'))),'onConnect']); try { $server->listen(); diff --git a/app/Console/Commands/BinkpSend.php b/app/Console/Commands/BinkpSend.php index 0d34156..9dfbb72 100644 --- a/app/Console/Commands/BinkpSend.php +++ b/app/Console/Commands/BinkpSend.php @@ -6,7 +6,7 @@ use Illuminate\Console\Command; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Support\Facades\Log; -use App\Classes\Protocol\Binkd as BinkdClass; +use App\Classes\Protocol\Binkp; use App\Classes\Sock\SocketClient; use App\Models\{Address,Setup}; @@ -31,6 +31,7 @@ class BinkpSend extends Command * * @return mixed * @throws \App\Classes\Sock\SocketException + * @throws \Exception */ public function handle() { @@ -48,8 +49,8 @@ class BinkpSend extends Command $client = SocketClient::create($no->system->mailer_address,$no->system->mailer_port); - $o = new BinkdClass(Setup::findOrFail(config('app.id'))); - $o->session(BinkdClass::SESSION_BINKP,$client,$no); + $o = new Binkp(Setup::findOrFail(config('app.id'))); + $o->session(Binkp::SESSION_BINKP,$client,$no); Log::info(sprintf('Connection ended: %s',$client->getAddress()),['m'=>__METHOD__]); } diff --git a/app/Console/Commands/EMSIReceive.php b/app/Console/Commands/EMSIReceive.php index 871b12b..f330fe6 100644 --- a/app/Console/Commands/EMSIReceive.php +++ b/app/Console/Commands/EMSIReceive.php @@ -5,7 +5,7 @@ namespace App\Console\Commands; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; -use App\Classes\Protocol\EMSI as EMSIClass; +use App\Classes\Protocol\EMSI; use App\Classes\Sock\SocketException; use App\Classes\Sock\SocketServer; use App\Models\Setup; @@ -36,7 +36,7 @@ class EMSIReceive extends Command Log::info('Listening for EMSI connections...'); $server = new SocketServer(Setup::EMSI_PORT,Setup::EMSI_BIND); - $server->setConnectionHandler([new EMSIClass(Setup::findOrFail(config('app.id'))),'onConnect']); + $server->setConnectionHandler([new EMSI(Setup::findOrFail(config('app.id'))),'onConnect']); try { $server->listen(); diff --git a/app/Console/Commands/EMSISend.php b/app/Console/Commands/EMSISend.php index f957f3d..4280f85 100644 --- a/app/Console/Commands/EMSISend.php +++ b/app/Console/Commands/EMSISend.php @@ -6,7 +6,7 @@ use Illuminate\Console\Command; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Support\Facades\Log; -use App\Classes\Protocol\EMSI as EMSIClass; +use App\Classes\Protocol\EMSI; use App\Classes\Sock\SocketClient; use App\Models\{Address,Setup}; @@ -48,8 +48,8 @@ class EMSISend extends Command $client = SocketClient::create($no->system->mailer_address,$no->system->mailer_port,38400); - $o = new EMSIClass(Setup::findOrFail(config('app.id'))); - $o->session(EMSIClass::SESSION_AUTO,$client,$no); + $o = new EMSI(Setup::findOrFail(config('app.id'))); + $o->session(EMSI::SESSION_AUTO,$client,$no); Log::info(sprintf('Connection ended: %s',$client->getAddress()),['m'=>__METHOD__]); } diff --git a/app/Console/Commands/StartServer.php b/app/Console/Commands/StartServer.php index a78e388..7893d54 100644 --- a/app/Console/Commands/StartServer.php +++ b/app/Console/Commands/StartServer.php @@ -5,7 +5,7 @@ namespace App\Console\Commands; use Illuminate\Console\Command; use Illuminate\Support\Facades\Log; -use App\Classes\Protocol\{Binkd,EMSI}; +use App\Classes\Protocol\{Binkp,EMSI}; use App\Classes\Sock\SocketException; use App\Classes\Sock\SocketServer; use App\Models\Setup; @@ -46,7 +46,7 @@ class StartServer extends Command 'binkp' => [ 'address'=>Setup::BINKP_BIND, 'port'=>Setup::BINKP_PORT, - 'class'=>new Binkd($o), + 'class'=>new Binkp($o), ], ];