more bandaids

diff --git a/cmd/forward/opername.pl b/cmd/forward/opername.pl
index 57af6505da02019d36283fed1d12fd8b2556cb5a..a80d0ec9e64329273efde7b434ac5467645cc93b 100644 (file)
--- a/cmd/forward/opername.pl
+++ b/cmd/forward/opername.pl
@@ -31,7 +31,7 @@ foreach $call (@f) {
                my $node = $ref->homenode;
                my $latlong = DXBearing::lltos($lat, $long) if $lat && $long;
                if ($name) {
-                       my $l = DXProt::pc41($call, 1, $name);
+                       my $l = DXProt::pc41($DXProt::me, $call, 1, $name);
                        DXProt::eph_dup($l);
                        DXProt::broadcast_all_ak1a($l, $DXProt::me) ;
                }

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 875d2b6694314691dd9b219ae03401227870bfdd..a689088a3faf444cfbf07ab3855bbe3138af3f29 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1431,7 +1431,11 @@ sub send_local_config
        
        # get all the users connected on the above nodes and send them out
        foreach $n (@localnodes, @remotenodes) {
-               send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
+               if ($r) {
+                       send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
+               } else {
+                       dbg('chan', "sent a null value");
+               }
        }
 }
 

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index bd210d880be9ed06a12813a5805b9c3a51bf82ad..52d4d7281b6fee6744fc7fa957141a492f3bdd7d 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -278,9 +278,8 @@ sub pc41
        my $call = shift;
        $call = shift if ref $call;
        
-       my ($sort, $info) = @_;
-       $sort ||= '0';
-       $info ||= ' ';
+       my $sort = shift || '0';
+       my $info = shift || ' ';
        my $hops = shift || get_hops(41);
        return "PC41^$call^$sort^$info^$hops^~";
 }