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

Enable systems to configure their packet type

Browse Source
This commit is contained in:
Deon George
2023-06-26 21:19:42 +12:00
parent a26f61d75d
commit 75549590fc
8 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Classes/FTN/Packet.php
View File

@@ -22,11 +22,11 @@ class Packet extends FTNBase implements \Iterator, \Countable
private const BLOCKSIZE = 1024;
protected const PACKED_MSG_LEAD = "\02\00";
private const PACKET_TYPES = [
FTNBase\Packet\FSC45::class,
FTNBase\Packet\FSC48::class,
FTNBase\Packet\FSC39::class,
FTNBase\Packet\FTS1::class,
public const PACKET_TYPES = [
'2.2' => FTNBase\Packet\FSC45::class,
'2+' => FTNBase\Packet\FSC48::class,
'2e' => FTNBase\Packet\FSC39::class,
'2.0' => FTNBase\Packet\FTS1::class,
];
protected array $header; // Packet Header

2
app/Http/Controllers/SystemController.php
View File

@@ -276,7 +276,7 @@ class SystemController extends Controller
$this->authorize('update',$o);
if ($request->post()) {
foreach (['name','location','sysop','hold','phone','address','port','active','method','notes','mailer_type','mailer_address','mailer_port','zt_id'] as $key)
foreach (['name','location','sysop','hold','phone','address','port','active','method','notes','mailer_type','mailer_address','mailer_port','zt_id','pkt_type'] as $key)
$o->{$key} = $request->post($key);
$o->save();

4
app/Http/Requests/SystemRegister.php
View File

@@ -5,7 +5,9 @@ namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Gate;
use Illuminate\Validation\Rule;
use App\Classes\FTN\Packet;
use App\Models\System;
class SystemRegister extends FormRequest
@@ -48,7 +50,6 @@ class SystemRegister extends FormRequest
],
($this->so->exists || ($request->action !== 'create')) ? [
'location' => 'required|min:3',
'sysop' => 'required|min:3',
'phone' => 'nullable|regex:/^([0-9-]+)$/',
'address' => 'nullable|regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i',
@@ -58,6 +59,7 @@ class SystemRegister extends FormRequest
'mailer_address' => 'nullable|regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i',
'mailer_port' => 'nullable|digits_between:2,5',
'zt_id' => 'nullable|size:10|regex:/^([A-Fa-f0-9]){10}$/|unique:systems,zt_id,'.($this->so->exists ? $this->so->id : 0),
'pkt_type' => ['required',Rule::in(array_keys(Packet::PACKET_TYPES))],
] : [],
$this->so->exists ? [
'active' => 'required|boolean',

5
app/Models/Address.php
View File

@@ -650,8 +650,9 @@ class Address extends Model
if (! $ao)
return NULL;
// @todo make packet type configurable by each system
$o = new Packet\FSC48;
// Get packet type
$type = collect(Packet::PACKET_TYPES)->get($this->system->pkt_type ?: config('app.default_pkt'));
$o = new $type;
$o->addressHeader($ao,$this);
// $oo = Netmail/Echomail Model