Log the correct callsign in merging

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 615dfdd08316b24cfec90b12ef8e0da2dc878291..6332b8bd7ff19f1a2eade9c8c6e972231b481002 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -213,7 +213,9 @@ sub start
        # remember type of connection
        $self->{consort} = $line;
        $self->{outbound} = $sort eq 'O';
-       $self->{priv} = $user->priv || 1;     # other clusters can always be 'normal' users
+       my $priv = $user->priv;
+       $priv = $user->priv(1) unless $priv;
+       $self->{priv} = $priv;     # other clusters can always be 'normal' users
        $self->{lang} = $user->lang || 'en';
        $self->{isolate} = $user->{isolate};
        $self->{consort} = $line;       # save the connection type
@@ -422,7 +424,7 @@ sub normal
                                        my $node;
                                        my $to = $user->homenode;
                                        my $last = $user->lastoper || 0;
-                                       if ($to ne $main::mycall && $send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = Route::Node::get($to)) ) {
+                                       if ($send_opernam && $to && $to ne $main::mycall && $main::systime > $last + $DXUser::lastoperinterval && ($node = Route::Node::get($to)) ) {
                                                my $cmd = "forward/opernam $spot[4]";
                                                # send the rcmd but we aren't interested in the replies...
                                                my $dxchan = $node->dxchan;
@@ -716,7 +718,7 @@ sub normal
                                        $user = DXUser->new($call);
                                        $user->sort('A');
                                        $user->priv(1);                   # I have relented and defaulted nodes
-                                       $self->{priv} = 1;                # to user RCMDs allowed
+                                       $user->lockout(1);
                                        $user->homenode($call);
                                        $user->node($call);
                                }
@@ -856,7 +858,7 @@ sub normal
                                return;
                        }
 
-                       Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]");
+                       Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[2]");
                        
                        # spots
                        if ($field[3] > 0) {
@@ -1718,7 +1720,7 @@ sub disconnect
        my $node = Route::Node::get($call);
        my @rout;
        if ($node) {
-               @rout = $node->del_nodes;    # at the next level
+#              @rout = $node->del_nodes;    # at the next level
                @rout = $node->del($main::routeroot);
        }