X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fclient.pl;h=bc2d46c7f9b2e322b55275f1991b91fd51133e8b;hb=632bda2671a8b0cf73b1a0bffa7b906c8744b14f;hp=0199084fdabf101c62fe0f6585a2d663edab924b;hpb=09c40605dd6922b1ac8d08767614697f51e094b2;p=spider.git

diff --git a/perl/client.pl b/perl/client.pl
index 0199084f..bc2d46c7 100755
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -304,6 +304,14 @@ sub timeout
 	cease(0);
 }
 
+# handle callsign and connection type firtling
+sub doclient
+{
+	my $line = shift;
+	my @f = split /\s+/, $line;
+	$call = uc $f[0] if $f[0];
+	$csort = $f[1] if $f[1];
+}
 
 #
 # initialisation
@@ -403,15 +411,6 @@ if ($loginreq) {
 	alarm(0);
 }
 
-# handle callsign and connection type firtling
-sub doclient
-{
-	my $line = shift;
-	my @f = split /\s+/, $line;
-	$call = uc $f[0] if $f[0];
-	$csort = $f[1] if $f[1];
-}
-
 # is this an out going connection?
 if ($connsort eq "connect") {
 	my $mcall = lc $call;
@@ -429,8 +428,8 @@ if ($connsort eq "connect") {
 		doconnect($1, $2) if /^\s*co\w*\s+(\w+)\s+(.*)$/io;
 		doabort($1) if /^\s*a\w*\s+(.*)/io;
 		dotimeout($1) if /^\s*t\w*\s+(\d+)/io;
-		dochat($1, $2) if /\s*\'(.*)\'\s+\'(.*)\'/io;
-		if (/\s*cl\w+\s+(.*)/io) {
+		dochat($1, $2) if /^\s*\'(.*)\'\s+\'(.*)\'/io;
+		if (/^\s*cl\w+\s+(.*)/io) {
 			doclient($1);
 			last;
 		}
@@ -467,6 +466,20 @@ if ($connsort eq "connect") {
 $mode = ($connsort eq 'ax25') ? 1 : 2;
 setmode();
 
+# adjust the callsign if it has an SSID, SSID <= 8 are legal > 8 are netrom connections
+my ($scall, $ssid) = split /-/, $call;
+$ssid = undef unless $ssid && $ssid =~ /^\d+$/;  
+if ($ssid) {
+	$ssid = 15 if $ssid > 15;
+	if ($connsort eq 'ax25') {
+		if ($ssid > 8) {
+			$ssid = 15 - $ssid;
+		}
+	}
+	$call = "$scall-$ssid";
+}
+
+
 $conn = Msg->connect("$clusteraddr", $clusterport, \&rec_socket);
 if (! $conn) {
 	if (-r "$data/offline") {