fix some errors in sh/c

diff --git a/cmd/show/configuration.pl b/cmd/show/configuration.pl
index a49ffeec990317d55cafc473b502627d150a785d..cb9f1946297d79179a720c10f675fb23016cc7ee 100644 (file)
--- a/cmd/show/configuration.pl
+++ b/cmd/show/configuration.pl
@@ -21,24 +21,27 @@ if ($list[0] && $list[0] =~ /^NOD/) {
        
        foreach $dxchan (@ch) {
                @val = sort {$a->call cmp $b->call} grep { $_->dxchan == $dxchan } @nodes;
-               my $call = $dxchan->call;
-               $call = "($call)" if $dxchan->here == 0;
                @l = ();
+               my $call = $dxchan->call;
+               $call ||= '???';
+               $call = "($call)" unless $dxchan->here;
                push @l, $call;
                
                my $i = 0;
-               foreach $call (@val) {
+               foreach my $ref (@val) {
                        if ($i >= 5) {
                                push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
                                @l = ();
                                push @l, "";
                                $i = 0;
                        }
-                       my $s = $call->call;
-                       $s = sprintf "(%s)", $s unless $call->here;
+                       my $s = $ref->call;
+                       $s ||= '???';
+                       $s = sprintf "(%s)", $s unless $ref->here;
                        push @l, $s;
                        $i++;
                }
+               push @l, "" while ($i++ < 5);
                push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
        }
 } else {
@@ -46,8 +49,9 @@ if ($list[0] && $list[0] =~ /^NOD/) {
        foreach $node (@nodes) {
                next if scalar @list && !grep $node->call =~ /^$_/, @list;
                my $call = $node->call;
-               $call = "($call)" unless $node->here;
                @l = ();
+               $call ||= '???';
+               $call = "($call)" unless $node->here;
                push @l, $call;
                @val = sort $node->users;
 
@@ -72,6 +76,7 @@ if ($list[0] && $list[0] =~ /^NOD/) {
                        push @l, $s;
                        $i++;
                }
+               push @l, "" while ($i++ < 5);
                push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
        }
 }

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 372599af1a3806dec7c1c37e540345ce58804e45..aae692efb52e4f31230c0b04b118765ee3236775 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -112,6 +112,7 @@ $count = 0;
                  prompt => '0,Required Prompt',
                  version => '1,Node Version',
                  build => '1,Node Build',
+                 verified => '9,Verified?,yesno',
                 );
 
 use vars qw($VERSION $BRANCH);

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 330e7a60eba433069a65a217ad5ebbb56ae91312..60b0f1e6be9eec8c6ca340f5d871be739e0b45ea 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1706,7 +1706,7 @@ sub load_hops
        return $self->msg('lh1') unless -e "$main::data/hop_table.pl";
        do "$main::data/hop_table.pl";
        return $@ if $@;
-       return 0;
+       return ();
 }
 
 

diff --git a/perl/QXProt.pm b/perl/QXProt.pm
index 82cb2075d8f8196edf32524b048b96dbc7ca445c..b9cf952cb497a553d4fed6aa0069f09d7d20e2f5 100644 (file)
--- a/perl/QXProt.pm
+++ b/perl/QXProt.pm
@@ -154,10 +154,15 @@ sub handleI
        my $self = shift;
        
        my @f = split /\^/, $_[3];
-       my $inv = Verify->new($f[7]);
-       unless ($inv->verify($f[8], $main::me->user->passphrase, $main::mycall, $self->call)) {
-               $self->sendnow('D','Sorry...');
-               $self->disconnect;
+       if ($self->passphrase && $f[7] && $f[8]) {
+               my $inv = Verify->new($f[7]);
+               unless ($inv->verify($f[8], $main::me->user->passphrase, $main::mycall, $self->call)) {
+                       $self->sendnow('D','Sorry...');
+                       $self->disconnect;
+               }
+               $self->{verified} = 1;
+       } else {
+               $self->{verified} = 0;
        }
        if ($self->{outbound}) {
                $self->send($self->genI);
@@ -175,8 +180,12 @@ sub handleI
 sub genI
 {
        my $self = shift;
-       my $inp = Verify->new;
-       return frame('I', $self->call, "DXSpider", ($main::version + 53) * 100, $main::build, $inp->challenge, $inp->response($self->user->passphrase, $self->call, $main::mycall));
+       my @out = ('I', $self->call, "DXSpider", ($main::version + 53) * 100, $main::build);
+       if (my $pass = $self->user->passphrase) {
+               my $inp = Verify->new;
+               push @out, $inp->challenge, $inp->response($pass, $self->call, $main::mycall);
+       }
+       return frame(@out);
 }
 
 sub handleR