X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=655a986b1af35dfd881795a3a3ffb320a867dc82;hb=74803d3f4937220f536cd67b515faa15da6e0520;hp=f1cf1227ca77b3b55f55fad314c1861b7860af44;hpb=0f5b89524c760b174f9788bdd1f1b4bed3aa9e2d;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index f1cf1227..655a986b 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -96,6 +96,8 @@ use Route::Node; use Route::User; use Editable; use Mrtg; +use USDB; +use UDPMsg; use Data::Dumper; use IO::File; @@ -123,7 +125,7 @@ $reqreg = 0; # 1 = registration required, 2 = deregister people use vars qw($VERSION $BRANCH $build $branch); $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); -$main::build += 8; # add an offset to make it bigger than last system +$main::build += 6; # add an offset to make it bigger than last system $main::build += $VERSION; $main::branch += $BRANCH; @@ -274,6 +276,9 @@ sub cease # disconnect AGW AGWMsg::finish(); + # disconnect UDP customers + UDPMsg::finish(); + # end everything else Msg->event_loop(100, 0.01); DXUser::finish(); @@ -394,7 +399,9 @@ dbg("DXSpider Version $version, build $build started"); # load Prefixes dbg("loading prefixes ..."); -Prefix::load(); +my $r = Prefix::load(); +confess $r if $r; +dbg(USDB::init()); # load band data dbg("loading band data ..."); @@ -424,8 +431,13 @@ foreach my $l (@main::listen) { push @listeners, $conn; dbg("External Port: $l->[0] $l->[1]"); } + +dbg("AGW Listener") if $AGWMsg::enable; AGWrestart(); +dbg("UDP Listener") if $UDPMsg::enable; +UDPMsg::init(\&new_channel); + # load bad words dbg("load badwords: " . (BadWords::load or "Ok")); @@ -453,23 +465,29 @@ unless ($is_win) { } # start dupe system +dbg("Starting Dupe system"); DXDupe::init(); # read in system messages +dbg("Read in Messages"); DXM->init(); # read in command aliases +dbg("Read in Aliases"); CmdAlias->init(); # initialise the Geomagnetic data engine +dbg("Start WWV"); Geomag->init(); +dbg("Start WCY"); WCY->init(); # initial the Spot stuff +dbg("Starting DX Spot system"); Spot->init(); # initialise the protocol engine -dbg("reading in duplicate spot and WWV info ..."); +dbg("Start Protocol Engines ..."); DXProt->init(); QXProt->init();