From: minima <minima>
Date: Sun, 13 Mar 2005 11:14:31 +0000 (+0000)
Subject: fix DXChannel->get to DXChannel::get
X-Git-Tag: 1.53~146
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=dce19df96e5dab964cd89cab9c33af470d824109;p=spider.git

fix DXChannel->get to DXChannel::get
---

diff --git a/Changes b/Changes
index eb912b1c..6f7d92df 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+13Mar05=======================================================================
+1. There has been a mix up in the Aranea1 branch. I have managed to merge a
+change that I have been meaning to do for ages. I have now made that change
+here.
 27Feb05=======================================================================
 1. fix duping on bad spot suckers that copy the prefix that is put at the end
 of the comment section by AR-C nodes becoming the whole comment. 
diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index 19fe9208..65672647 100644
--- a/perl/AMsg.pm
+++ b/perl/AMsg.pm
@@ -186,7 +186,7 @@ sub new_channel
 	# set up the basic channel info
 	# is there one already connected to me - locally? 
 	my $user = DXUser->get_current($call);
-	my $dxchan = DXChannel->get($call);
+	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
 		if ($main::bumpexisting) {
 			my $ip = $conn->{peerhost} || 'unknown';
diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index acd4245c..09290121 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -187,10 +187,10 @@ sub rec
 	}
 }
 
-# obtain a channel object by callsign [$obj = DXChannel->get($call)]
+# obtain a channel object by callsign [$obj = DXChannel::get($call)]
 sub get
 {
-	my ($pkg, $call) = @_;
+	my $call = shift;
 	return $channels{$call};
 }
 
diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index debc23d2..6eee5d45 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -494,7 +494,7 @@ sub run_cmd
 sub process
 {
 	my $t = time;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	
 	foreach $dxchan (@dxchan) {
@@ -582,7 +582,7 @@ sub broadcast
 	my $pkg = shift;			# ignored
 	my $s = shift;				# the line to be rebroadcast
 	
-    foreach my $dxchan (DXChannel->get_all()) {
+    foreach my $dxchan (DXChannel::get_all()) {
 		next unless $dxchan->{sort} eq 'U'; # only interested in user channels  
 		next if grep $dxchan == $_, @_;
 		$dxchan->send($s);			# send it
@@ -592,7 +592,7 @@ sub broadcast
 # gimme all the users
 sub get_all
 {
-	return grep {$_->{sort} eq 'U'} DXChannel->get_all();
+	return grep {$_->{sort} eq 'U'} DXChannel::get_all();
 }
 
 # run a script for this user
@@ -947,7 +947,7 @@ sub broadcast_debug
 {
 	my $s = shift;				# the line to be rebroadcast
 	
-	foreach my $dxchan (DXChannel->get_all) {
+	foreach my $dxchan (DXChannel::get_all) {
 		next unless $dxchan->{enhanced} && $dxchan->{senddbg};
 		$dxchan->send_later('L', $s);
 	}
diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 86842058..2a9913f1 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -174,7 +174,7 @@ sub process
 sub connected
 {
 	my $call = uc shift;
-	return DXChannel->get($call);
+	return DXChannel::get($call);
 }
 
 # is it remotely connected anywhere (with exact callsign)?
@@ -224,7 +224,7 @@ sub presentish_on
 sub last_connect
 {
 	my $call = uc shift;
-	return $main::systime if DXChannel->get($call);
+	return $main::systime if DXChannel::get($call);
 	my $user = DXUser->get($call);
 	return $user ? $user->lastin : 0;
 }
diff --git a/perl/DXDb.pm b/perl/DXDb.pm
index a088866c..833640f5 100644
--- a/perl/DXDb.pm
+++ b/perl/DXDb.pm
@@ -277,7 +277,7 @@ sub handle_45
 	# incoming DB Information
 	my $n = getstream($_[3]);
 	if ($n) {
-		my $mchan = DXChannel->get($n->{call});
+		my $mchan = DXChannel::get($n->{call});
 		$mchan->send($_[2] . ":$_[4]") if $mchan;
 	}
 }
diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 67165ef4..b25b70a5 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -479,7 +479,7 @@ sub notify
 	my $ref = shift;
 	my $to = $ref->{to};
 	my $uref = DXUser->get_current($to);
-	my $dxchan = DXChannel->get($to);
+	my $dxchan = DXChannel::get($to);
 	if (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
 		my $email = $uref->email;
 		if ($email) {
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 9dc9d5e4..46fda570 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -438,8 +438,8 @@ sub handle_10
 #	RouteDB::update($to, $_[6]);
 
 	# it is here and logged on
-	$dxchan = DXChannel->get($main::myalias) if $to eq $main::mycall;
-	$dxchan = DXChannel->get($to) unless $dxchan;
+	$dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall;
+	$dxchan = DXChannel::get($to) unless $dxchan;
 	if ($dxchan && $dxchan->is_user) {
 		$_[3] =~ s/\%5E/^/g;
 		$dxchan->talk($from, $to, $via, $_[3]);
@@ -663,7 +663,7 @@ sub handle_12
 
 	my $dxchan;
 	
-	if ((($dxchan = DXChannel->get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
+	if ((($dxchan = DXChannel::get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
 		$self->send_chat($line, @_[1..6]);
 	} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
 
@@ -779,7 +779,7 @@ sub handle_16
 						}
 					}
 					$user->wantroutepc19(1) unless defined $wantpc19; # for now we work on the basis that pc16 = real route 
-					$user->lastin($main::systime) unless DXChannel->get($ncall);
+					$user->lastin($main::systime) unless DXChannel::get($ncall);
 					$user->put;
 						
 					# route the pc19 - this will cause 'stuttering PC19s' for a while
@@ -850,7 +850,7 @@ sub handle_16
 		$user = DXUser->new($call) if !$user;
 		$user->homenode($parent->call) if !$user->homenode;
 		$user->node($parent->call);
-		$user->lastin($main::systime) unless DXChannel->get($call);
+		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
 	}
 	$self->route_pc16($origin, $line, $parent, @rout) if @rout;
@@ -1016,7 +1016,7 @@ sub handle_19
 		next if $call eq $main::mycall;
 
 		# check that this PC19 isn't trying to alter the wrong dxchan
-		my $dxchan = DXChannel->get($call);
+		my $dxchan = DXChannel::get($call);
 		if ($dxchan && $dxchan != $self) {
 			dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
 			next;
@@ -1098,7 +1098,7 @@ sub handle_19
 		my $mref = DXMsg::get_busy($call);
 		$mref->stop_msg($call) if $mref;
 				
-		$user->lastin($main::systime) unless DXChannel->get($call);
+		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
 	}
 
@@ -1167,7 +1167,7 @@ sub handle_21
 			my $node = Route::Node::get($call);
 			if ($node) {
 						
-				my $dxchan = DXChannel->get($call);
+				my $dxchan = DXChannel::get($call);
 				if ($dxchan && $dxchan != $self) {
 					dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
 					return;
@@ -1549,10 +1549,10 @@ sub handle_51
 			# it's a reply, look in the ping list for this one
 			my $ref = $pings{$from};
 			if ($ref) {
-				my $tochan =  DXChannel->get($from);
+				my $tochan =  DXChannel::get($from);
 				while (@$ref) {
 					my $r = shift @$ref;
-					my $dxchan = DXChannel->get($r->{call});
+					my $dxchan = DXChannel::get($r->{call});
 					next unless $dxchan;
 					my $t = tv_interval($r->{t}, [ gettimeofday ]);
 					if ($dxchan->is_user) {
@@ -1700,7 +1700,7 @@ sub handle_default
 sub process
 {
 	my $t = time;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $pc50s;
 	
@@ -1761,7 +1761,7 @@ sub send_dx_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	
 	# send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1812,7 +1812,7 @@ sub send_wwv_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my @dxcc = ((Prefix::cty_data($_[6]))[0..2], (Prefix::cty_data($_[7]))[0..2]);
 
@@ -1846,7 +1846,7 @@ sub send_wcy_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my @dxcc = ((Prefix::cty_data($_[10]))[0..2], (Prefix::cty_data($_[11]))[0..2]);
 	
@@ -1879,7 +1879,7 @@ sub send_announce
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $target;
 	my $to = 'To ';
@@ -1944,7 +1944,7 @@ sub send_chat
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $target = $_[3];
 	my $text = unpad($_[2]);
@@ -2085,7 +2085,7 @@ sub route
 	}
 
 	# always send it down the local interface if available
-	my $dxchan = DXChannel->get($call);
+	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
 		dbg("route: $call -> $dxchan->{call} direct" ) if isdbg('route');
 	} else {
@@ -2108,7 +2108,7 @@ sub route
 				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
 				return;
 			}
-			$dxchan = DXChannel->get($rcall);
+			$dxchan = DXChannel::get($rcall);
 			dbg("route: $call -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
 		}
 	}
@@ -2189,7 +2189,7 @@ sub addping
 	my $r = {};
 	$r->{call} = $from;
 	$r->{t} = [ gettimeofday ];
-	if ($via && (my $dxchan = DXChannel->get($via))) {
+	if ($via && (my $dxchan = DXChannel::get($via))) {
 		$dxchan->send(pc51($to, $main::mycall, 1));
 	} else {
 		route(undef, $to, pc51($to, $main::mycall, 1));
@@ -2241,13 +2241,13 @@ sub process_rcmd_reply
 	if ($tonode eq $main::mycall) {
 		my $s = $rcmds{$fromnode};
 		if ($s) {
-			my $dxchan = DXChannel->get($s->{call});
-			my $ref = $user eq $tonode ? $dxchan : (DXChannel->get($user) || $dxchan);
+			my $dxchan = DXChannel::get($s->{call});
+			my $ref = $user eq $tonode ? $dxchan : (DXChannel::get($user) || $dxchan);
 			$ref->send($line) if $ref;
 			delete $rcmds{$fromnode} if !$dxchan;
 		} else {
 			# send unsolicited ones to the sysop
-			my $dxchan = DXChannel->get($main::myalias);
+			my $dxchan = DXChannel::get($main::myalias);
 			$dxchan->send($line) if $dxchan;
 		}
 	} else {
diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 62f26290..8b856b13 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -264,7 +264,7 @@ sub get_current
 	my $pkg = shift;
 	my $call = uc shift;
   
-	my $dxchan = DXChannel->get($call);
+	my $dxchan = DXChannel::get($call);
 	return $dxchan->user if $dxchan;
 	my $rref = Route::get($call);
 	return $rref->user if $rref && exists $rref->{user};
diff --git a/perl/Filter.pm b/perl/Filter.pm
index 4443fc55..a2f5ce46 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -307,7 +307,7 @@ sub install
 	} elsif ($name eq 'USER_DEFAULT') {
 		@dxchan = DXChannel::get_all_users();
 	} else {
-		$dxchan = DXChannel->get($name);
+		$dxchan = DXChannel::get($name);
 		push @dxchan, $dxchan if $dxchan;
 	}
 	foreach $dxchan (@dxchan) {
diff --git a/perl/Investigate.pm b/perl/Investigate.pm
index e1cb9b28..426e23eb 100644
--- a/perl/Investigate.pm
+++ b/perl/Investigate.pm
@@ -95,7 +95,7 @@ sub handle_ping
 			$user->set_believe($self->{call});
 			$user->put;
 		}
-		my $dxchan = DXChannel->get($self->{via});
+		my $dxchan = DXChannel::get($self->{via});
 		if ($dxchan) {
 			dbg("Investigate: sending PC19 for $self->{call}") if isdbg('investigate');
 			foreach my $pc (@{$self->{pcxx}}) {
diff --git a/perl/Route.pm b/perl/Route.pm
index 0f52e39b..abd3dcbb 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -203,7 +203,7 @@ sub config
 		$call = ' ' x length $call; 
 		
 		# recursion detector
-		if ((DXChannel->get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
+		if ((DXChannel::get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
 			$line .= ' ...';
 			push @out, $line;
 			return @out;
@@ -281,7 +281,7 @@ sub alldxchan
 	my @dxchan;
 #	dbg("Trying node $self->{call}") if isdbg('routech');
 
-	my $dxchan = DXChannel->get($self->{call});
+	my $dxchan = DXChannel::get($self->{call});
 	push @dxchan, $dxchan if $dxchan;
 	
 	# it isn't, build up a list of dxchannels and possible ping times 
@@ -290,7 +290,7 @@ sub alldxchan
 		foreach my $p (@{$self->{parent}}) {
 #			dbg("Trying parent $p") if isdbg('routech');
 			next if $p eq $main::mycall; # the root
-			my $dxchan = DXChannel->get($p);
+			my $dxchan = DXChannel::get($p);
 			if ($dxchan) {
 				push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan;
 			} else {
@@ -310,7 +310,7 @@ sub dxchan
 	my $self = shift;
 	
 	# ALWAYS return the locally connected channel if present;
-	my $dxchan = DXChannel->get($self->call);
+	my $dxchan = DXChannel::get($self->call);
 	return $dxchan if $dxchan;
 	
 	my @dxchan = $self->alldxchan;
diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1448ba91..5fc41ef7 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -172,7 +172,7 @@ sub new_channel
 	# set up the basic channel info
 	# is there one already connected to me - locally? 
 	my $user = DXUser->get_current($call);
-	my $dxchan = DXChannel->get($call);
+	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
 		if ($user && $user->is_node) {
 			already_conn($conn, $call, DXM::msg($lang, 'concluster', $call, $main::mycall));
@@ -254,13 +254,13 @@ sub cease
 	dbg("Local::finish error $@") if $@;
 
 	# disconnect nodes
-	foreach $dxchan (DXChannel->get_all_nodes) {
+	foreach $dxchan (DXChannel::get_all_nodes) {
 	    $dxchan->disconnect(2) unless $dxchan == $main::me;
 	}
 	Msg->event_loop(100, 0.01);
 
 	# disconnect users
-	foreach $dxchan (DXChannel->get_all_users) {
+	foreach $dxchan (DXChannel::get_all_users) {
 		$dxchan->disconnect;
 	}