*** empty log message ***

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 0b4e7428fcee2c421d12b348962373e7ba506900..c1301b295863b5c2d6aece03d080f9367746bf42 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -33,7 +33,7 @@ BEGIN {
 
        # try to create and lock a lockfile (this isn't atomic but 
        # should do for now
-       $lockfn = "$root/perl/cluster.lck";       # lock file name
+       $lockfn = "$root/local/cluster.lck";       # lock file name
        if (-e $lockfn) {
                open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
                my $pid = <CLLOCK>;
@@ -97,6 +97,7 @@ use Route::User;
 use Editable;
 use Mrtg;
 use USDB;
+use UDPMsg;
 
 use Data::Dumper;
 use IO::File;
@@ -124,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 += 7;                             # 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;
 
@@ -193,19 +194,14 @@ sub new_channel
 
        # create the channel
        if ($user->wantnp) {
-               if ($user->passphrase && $main::me->user->passphrase) {
-                       $dxchan = QXProt->new($call, $conn, $user);
-               } else {
-                       unless ($user->passphrase) {
-                               Log('DXCommand', "$call using NP but has no passphrase");
-                               dbg("$call using NP but has no passphrase");
-                       }
-                       unless ($main::me->user->passphrase) {
-                               Log('DXCommand', "$main::mycall using NP but has no passphrase");
-                               dbg("$main::mycall using NP but has no passphrase");
-                       }
-                       already_conn($conn, $call, "Need to exchange passphrases");
-                       return;
+               $dxchan = QXProt->new($call, $conn, $user);
+               unless ($user->passphrase) {
+                       Log('DXCommand', "$call using NP but has no passphrase");
+                       dbg("$call using NP but has no passphrase");
+               }
+               unless ($main::me->user->passphrase) {
+                       Log('DXCommand', "$main::mycall using NP but has no passphrase");
+                       dbg("$main::mycall using NP but has no passphrase");
                }
        } elsif ($user->is_node) {
                $dxchan = DXProt->new($call, $conn, $user);
@@ -275,6 +271,9 @@ sub cease
        # disconnect AGW
        AGWMsg::finish();
 
+       # disconnect UDP customers
+       UDPMsg::finish();
+
        # end everything else
        Msg->event_loop(100, 0.01);
        DXUser::finish();
@@ -427,8 +426,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"));