X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=44846c53312f12a370b2babd6cd5acd888605c4d;hb=86d0e8cc034db0b0d23afc09b6f596c38a57885d;hp=0188e49c76bb16af614f161361407fec9f222420;hpb=3e1e7b56903a67dde9ea8ecebbc507fcf9bbb402;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 0188e49c..44846c53 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -37,7 +37,7 @@ sub enqueue
 {
 	my ($conn, $msg) = @_;
 	unless ($msg =~ /^[ABZ]/) {
-		if ($msg =~ /^E[-\w]+\|([01])/ && $conn->{csort} eq 'telnet') {
+		if ($msg =~ m{^E[-\w\/]+\|([01])} && $conn->{csort} eq 'telnet') {
 			$conn->{echo} = $1;
 			if ($1) {
 #				$conn->send_raw("\xFF\xFC\x01");
@@ -45,7 +45,7 @@ sub enqueue
 #				$conn->send_raw("\xFF\xFB\x01");
 			}
 		} else {
-			$msg =~ s/^[-\w]+\|//;
+			$msg =~ s{^[-\w\/]+\|}{};
 			push (@{$conn->{outqueue}}, $msg . $conn->{lineend});
 		}
 	}
@@ -99,18 +99,23 @@ sub dequeue
 				&{$conn->{rproc}}($conn, "I$conn->{call}|$msg");
 			} elsif ($conn->{state} eq 'WL' ) {
 				$msg = uc $msg;
-				if (is_callsign($msg) && $msg !~ m|/| ) {
-					my $sort = $conn->{csort};
-					$sort = 'local' if $conn->{peerhost} =~ /127\.\d+\.\d+\.\d+$/ || $conn->{peerhost} eq '::1';
-					my $uref;
-					if ($main::passwdreq || ($uref = DXUser::get_current($msg)) && $uref->passwd ) {
-						$conn->conns($msg);
-						$conn->{state} = 'WP';
-						$conn->{decho} = $conn->{echo};
-						$conn->{echo} = 0;
-						$conn->send_raw('password: ');
+				if (is_callsign($msg)) {
+					if ($main::allowslashcall || $msg !~ m|/|) {
+						my $sort = $conn->{csort};
+						$sort = 'local' if $conn->{peerhost} =~ /127\.\d+\.\d+\.\d+$/ || $conn->{peerhost} eq '::1';
+						my $uref;
+						if ($main::passwdreq || ($uref = DXUser::get_current($msg)) && $uref->passwd ) {
+							$conn->conns($msg);
+							$conn->{state} = 'WP';
+							$conn->{decho} = $conn->{echo};
+							$conn->{echo} = 0;
+							$conn->send_raw('password: ');
+						} else {
+							$conn->to_connected($msg, 'A', $sort);
+						}
 					} else {
-						$conn->to_connected($msg, 'A', $sort);
+						$conn->send_now("Sorry $msg is an invalid callsign");
+						$conn->disconnect;
 					}
 				} else {
 					$conn->send_now("Sorry $msg is an invalid callsign");
@@ -152,7 +157,7 @@ sub to_connected
 	delete $conn->{timeout};
 	$conn->{csort} = $sort;
 	&{$conn->{rproc}}($conn, "$dir$call|$sort");
-	$conn->_send_file("$main::data/connected") unless $conn->{outgoing};
+	$conn->_send_file(localdata("connected")) unless $conn->{outgoing};
 }
 
 sub new_client {
@@ -162,7 +167,7 @@ sub new_client {
 	my $conn = $server_conn->SUPER::new_client($client);
 	# send login prompt
 	$conn->{state} = 'WL';
-	$conn->_send_file("$main::data/issue");
+	$conn->_send_file(localdata("issue"));
 	$conn->send_raw("login: ");
 	$conn->_dotimeout(60);
 	$conn->{echo} = 1;