decrement the build to account for added modul

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 295fad8d5284ebd8f4d6c06218bdf479bb1a3b85..a2664b7730f3f64676fcce922d3461b66fddc0e5 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -101,6 +101,7 @@ use UDPMsg;
 use QSL;
 use Thingy;
 use RouteDB;
+use AMsg;
 
 use Data::Dumper;
 use IO::File;
@@ -128,7 +129,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 += 4;                             # add an offset to make it bigger than last system
+$main::build += 1;                             # add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -194,24 +195,8 @@ sub new_channel
                $user = DXUser->new($call);
        }
        
-
        # 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;
-               }
-       } elsif ($user->is_node) {
+       if ($user->is_node) {
                $dxchan = DXProt->new($call, $conn, $user);
        } elsif ($user->is_user) {
                $dxchan = DXCommandmode->new($call, $conn, $user);
@@ -432,14 +417,16 @@ DXUser->init($userfn, 1);
 # start listening for incoming messages/connects
 dbg("starting listeners ...");
 my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
-$conn->conns("Server $clusteraddr/$clusterport");
+$conn->conns("Server $clusteraddr/$clusterport using IntMsg");
 push @listeners, $conn;
-dbg("Internal port: $clusteraddr $clusterport");
+dbg("Internal port: $clusteraddr $clusterport using IntMsg");
 foreach my $l (@main::listen) {
-       $conn = ExtMsg->new_server($l->[0], $l->[1], \&login);
-       $conn->conns("Server $l->[0]/$l->[1]");
+       no strict 'refs';
+       my $pkg = $l->[2] || 'ExtMsg';
+       $conn = $pkg->new_server($l->[0], $l->[1], \&login);
+       $conn->conns("Server $l->[0]/$l->[1] using $pkg");
        push @listeners, $conn;
-       dbg("External Port: $l->[0] $l->[1]");
+       dbg("External Port: $l->[0] $l->[1] using $pkg");
 }
 
 dbg("AGW Listener") if $AGWMsg::enable;