X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=87182fc69f08b44218f9f8fb2e9b29251469280d;hb=7c7080ad7019d6e23a8ad401256122e81fa03a5a;hp=854a635496e058a651896d04bc8f412a381f84ea;hpb=ab811a0c902225075a9bd69749f65594079433a9;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 854a6354..87182fc6 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -65,7 +65,7 @@ sub new
 	my $pkg = shift;
 	my $call = shift;
 #	my @rout = $main::routeroot->add_user($call, Route::here(1));
-	DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1]);
+	DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1, undef, undef, $self->{conn}->peerhost], );
 
 	# ALWAYS output the user
 	my $ref = Route::User::get($call);
@@ -89,7 +89,7 @@ sub start
 	my $name = $user->{name};
 	
 	# log it
-	my $host = $self->{conn}->{peerhost};
+	my $host = $self->{conn}->peerhost;
 	$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
 	$host ||= "unknown";
 	LogDbg('DXCommand', "$call connected from $host");
@@ -133,23 +133,8 @@ sub start
 		$self->{registered} = 1;
 	}
 
-
-	# decide which motd to send
-	my $motd;
-	unless ($self->{registered}) {
-		$motd = "${main::motd}_nor_$self->{lang}";
-		$motd = "${main::motd}_nor" unless -e $motd;
-	}
-	$motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd;
-	$motd = $main::motd unless $motd && -e $motd;
-	if ($self->conn->{csort} eq 'ax25') {
-		if ($motd) {
-			$motd = "${motd}_ax25" if -e "${motd}_ax25";
-		} else {
-			$motd = "${main::motd}_ax25" if -e "${main::motd}_ax25";
-		}
-	}
-	$self->send_file($motd) if -e $motd;
+	# send the relevant MOTD
+	$self->send_motd;
 
 	# sort out privilege reduction
 	$self->{priv} = 0 if $line =~ /^(ax|te)/ && !$self->conn->{usedpasswd};
@@ -218,7 +203,7 @@ sub start
 	foreach my $call (@{$user->buddies}) {
 		my $ref = Route::User::get($call);
 		if ($ref) {
-			foreach my $node (@{$ref->parent}) {
+			foreach my $node ($ref->parents) {
 				$self->send($self->msg($node eq $main::mycall ? 'loginb' : 'loginbn', $call, $node));
 			} 
 		}
@@ -1226,5 +1211,27 @@ sub print_find_reply
 	my $sort = $flag == 2 ? "External" : "Local";
 	$self->send("$sort $target found at $node in $ms ms" );
 }
+
+# send the most relevant motd
+sub send_motd
+{
+	my $self = shift;
+	my $motd;
+
+	unless ($self->{registered}) {
+		$motd = "${main::motd}_nor_$self->{lang}";
+		$motd = "${main::motd}_nor" unless -e $motd;
+	}
+	$motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd;
+	$motd = $main::motd unless $motd && -e $motd;
+	if ($self->conn->{csort} eq 'ax25') {
+		if ($motd) {
+			$motd = "${motd}_ax25" if -e "${motd}_ax25";
+		} else {
+			$motd = "${main::motd}_ax25" if -e "${main::motd}_ax25";
+		}
+	}
+	$self->send_file($motd) if -e $motd;
+}
 1;
 __END__