From: minima <minima>
Date: Sat, 9 Jun 2001 23:42:28 +0000 (+0000)
Subject: more bandaids
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=9d5d323e62f989f5a1edc569ed715e6aad3ec072;p=spider.git

more bandaids
---

diff --git a/cmd/forward/opername.pl b/cmd/forward/opername.pl
index 57af6505..a80d0ec9 100644
--- 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 875d2b66..a689088a 100644
--- 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 bd210d88..52d4d728 100644
--- 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^~";
 }