use QSL;
use Thingy;
use RouteDB;
+use AMsg;
use Data::Dumper;
use IO::File;
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 += 2; # add an offset to make it bigger than last system
$main::build += $VERSION;
$main::branch += $BRANCH;
$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);
# 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;