X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=8f41a1b8b619ed8f68079e81dff90615b3ba17d2;hb=1ee64082ae257818e71f8ec1a471dbac31bd746a;hp=6bd0c7440aeb1f0a9556bfdc0e7c4d2ba690a2e0;hpb=2090157518d0d2da860345507680f4ad91b043a2;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 6bd0c744..8f41a1b8 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -31,6 +31,7 @@ $yes = 'Yes'; # visual representation of yes $no = 'No'; # ditto for no $user_interval = 11*60; # the interval between unsolicited prompts if no traffic + # make sure that modules are searched in the order local then perl BEGIN { umask 002; @@ -90,12 +91,11 @@ use DXVars; use SysVar; # order here is important - DXDebug snarfs Carp et al so that Mojo errors go into the debug log -use DXDebug; use Mojolicious 7.26; use Mojo::IOLoop; - $DOWARN = 1; +use DXDebug; use Msg; use IntMsg; use Internet; @@ -147,7 +147,7 @@ use DXXml; use DXSql; use IsoTime; use BPQMsg; - +use RBN; use Data::Dumper; @@ -192,6 +192,7 @@ our $ending; # signal that we are ending; our $broadcast_debug; # allow broadcasting of debug info down "enhanced" user connections our $clssecs; # the amount of cpu time the DXSpider process have consumed our $cldsecs; # the amount of cpu time any child processes have consumed +our $allowslashcall; # Allow / in connecting callsigns (ie PA0/G1TLH, or even PA0/G1TLH/2) # send a message to call on conn and disconnect @@ -349,7 +350,9 @@ sub new_channel $user->startt($systime); # mark the start time of this connection if ($user->is_node) { - $dxchan = DXProt->new($call, $conn, $user); + $dxchan = DXProt->new($call, $conn, $user); + } elsif ($user->is_rbn) { + $dxchan = RBN->new($newcall, $conn, $user); } elsif ($user->is_user) { $dxchan = DXCommandmode->new($newcall, $conn, $user); } else { @@ -566,14 +569,14 @@ sub setup_start my $oldsort = $ref->sort; if ($oldsort ne 'S') { $ref->sort('S'); - dbg "Resetting node type from $oldsort -> DXSpider ('S')"; + dbg("Resetting node type from $oldsort -> DXSpider ('S')"); } $ref = DXUser::get($myalias); die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9; $oldsort = $ref->sort; if ($oldsort ne 'U') { $ref->sort('U'); - dbg "Resetting sysop user type from $oldsort -> User ('U')"; + dbg("Resetting sysop user type from $oldsort -> User ('U')"); } }