X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=8525b5396aef6c8bb0405e7e713746dc568a1535;hb=6460e56097f40c33f85ceb57e20028de50023c02;hp=42c995510c2c265d6bf8aa52b0bbc91a4e5945a0;hpb=2080db6b0892798e5f321098f59c1216f21a331d;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 42c99551..8525b539 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -6,12 +6,12 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
-# 
+#
+#
 
 package DXProt;
 
-@ISA = qw(DXProt DXChannel);
+@ISA = qw(DXChannel);
 
 use DXUtil;
 use DXM;
@@ -19,6 +19,11 @@ use DXDebug;
 
 use strict;
 
+use vars qw($sentencelth $pc19_version $pc9x_nodupe_first_slot $pc92c_ipaddr_enable);
+
+$sentencelth = 180;
+$pc9x_nodupe_first_slot = 1;
+
 #
 # All the PCxx generation routines
 #
@@ -26,107 +31,134 @@ use strict;
 # create a talk string ($from, $to, $via, $text)
 sub pc10
 {
-	my ($from, $to, $via, $text) = @_;
+	my ($from, $to, $via, $text, $origin) = @_;
 	my ($user1, $user2);
-	if ($via && $via ne $to) {
+	if ($via && $via ne $to && $via ne '*') {
 		$user1 = $via;
 		$user2 = $to;
 	} else {
 		$user2 = ' ';
 		$user1 = $to;
 	}
+	$origin ||= $main::mycall;
 	$text = unpad($text);
 	$text = ' ' unless $text && length $text > 0;
-	$text =~ s/\^/%5E/g;
-	return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~";  
+	$text =~ s/\^/~/g;
+	return "PC10^$from^$user1^$text^*^$user2^$origin^~";
 }
 
-# create a dx message (call, freq, dxcall, text) 
+# create a dx message (call, freq, dxcall, text) see also pc61
 sub pc11
 {
 	my ($mycall, $freq, $dxcall, $text) = @_;
 	my $hops = get_hops(11);
 	my $t = time;
 	$text = ' ' if !$text;
-	$text =~ s/\^/%5E/g;
+	$text =~ s/\^/~/g;
 	return sprintf "PC11^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$hops^~", $freq, cldate($t), ztime($t);
 }
 
+# create a dx message (call, freq, dxcall, text, $ipaddr) see also pc11
+sub pc61
+{
+	my ($mycall, $freq, $dxcall, $text, $ipaddr) = @_;
+	my $hops = get_hops(61) || get_hops(11);
+	my $t = time;
+	$text = ' ' if !$text;
+	$text =~ s/\^/~/g;
+	return sprintf "PC61^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$ipaddr^$hops^~", $freq, cldate($t), ztime($t);
+}
+
 # create an announce message
 sub pc12
 {
-	my ($call, $text, $tonode, $sysop, $wx) = @_;
+	my ($call, $text, $tonode, $sysop, $wx, $origin) = @_;
 	my $hops = get_hops(12);
-	$sysop = ' ' if !$sysop;
-	$text = ' ' if !$text;
-	$wx = '0' if !$wx;
-	$tonode = '*' if !$tonode;
-	$text =~ s/\^/%5E/g;
-	return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
+	$text ||= ' ';
+	$text =~ s/\^/~/g;
+	$tonode ||= '*';
+	$sysop ||= ' ';
+	$wx ||= '0';
+	$origin ||= $main::mycall;
+	return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
 }
 
 #
-# add one or more users (I am expecting references that have 'call', 
-# 'confmode' & 'here' method) 
+# add one or more users (I am expecting references that have 'call',
+# 'conf' & 'here' method)
 #
 # this will create a list of PC16 with up pc16_max_users in each
 # called $self->pc16(..)
 #
 sub pc16
 {
-	my $self = shift;
+	my $node = shift;
+	my $ncall = $node->call;
 	my @out;
-	my $i;
 
-	for ($i = 0; @_; ) {
-		my $str = "PC16^$self->{call}";
-		for ( ; @_ && $i < $DXProt::pc16_max_users; $i++) {
-			my $ref = shift;
-			$str .= sprintf "^%s %s %d", $ref->call, $ref->confmode ? '*' : '-', $ref->here;
+	my $s = "";
+	for (@_) {
+		next unless $_;
+		my $ref = $_;
+		my $str = sprintf "^%s %s %d", $ref->call, $ref->conf ? '*' : '-', $ref->here;
+		if (length($s) + length($str) > $sentencelth) {
+			push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
+			$s = "";
 		}
-		$str .= sprintf "^%s^", get_hops(16);
-		push @out, $str;
-		$i = 0;
+		$s .= $str;
 	}
-	return (@out);
+	push @out, "PC16^$ncall" . $s . sprintf "^%s^", get_hops(16);
+	return @out;
 }
 
 # remove a local user
 sub pc17
 {
-	my ($self, $ref) = @_;
-	my $hops = get_hops(17);
-	return "PC17^$ref->{call}^$self->{call}^$hops^";
+	my @out;
+	while (@_) {
+		my $node = shift;
+		my $ref = shift;
+		my $hops = get_hops(17);
+		my $ncall = $node->call;
+		my $ucall = $ref->call;
+		push @out, "PC17^$ucall^$ncall^$hops^";
+	}
+	return @out;
 }
 
 # Request init string
 sub pc18
 {
-	return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
+	my $flags = shift;
+	return "PC18^DXSpider Version: $main::version Build: $main::build Git: $main::gitbranch/$main::gitversion$flags^$DXProt::myprot_version^";
 }
 
 #
-# add one or more nodes 
-# 
+# add one or more nodes
+#
 sub pc19
 {
-	my $self = shift;
 	my @out;
-	my $i;
-	
-
-	for ($i = 0; @_; ) {
-		my $str = "PC19";
-		for (; @_ && $i < $DXProt::pc19_max_nodes; $i++) {
-			my $ref = shift;
-			my $here = $ref->{here} ? '1' : '0';
-			my $confmode = $ref->{confmode} ? '1' : '0';
-			$str .= "^$here^$ref->{call}^$confmode^$ref->{pcversion}";
+	my @in;
+
+	my $s = "";
+	for (@_) {
+		next unless $_;
+		my $ref = $_;
+		my $call = $ref->call;
+		my $here = $ref->here;
+		my $conf = $ref->conf;
+		my $version = $ref->version;
+		$version = $pc19_version unless $version =~ /^\d\d\d\d$/;
+
+		my $str = "^$here^$call^$conf^$version";
+		if (length($s) + length($str) > $sentencelth) {
+			push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
+			$s = "";
 		}
-		$str .= sprintf "^%s^", get_hops(19);
-		push @out, $str;
-		$i = 0;
+		$s .= $str;
 	}
+	push @out, "PC19" . $s . sprintf "^%s^", get_hops(19);
 	return @out;
 }
 
@@ -139,10 +171,14 @@ sub pc20
 # delete a node
 sub pc21
 {
-	my ($call, $reason) = @_;
-	my $hops = get_hops(21);
-	$reason = "Gone." if !$reason;
-	return "PC21^$call^$reason^$hops^";
+	my @out;
+	while (@_) {
+		my $node = shift;
+		my $hops = get_hops(21);
+		my $call = $node->call;
+		push @out, "PC21^$call^Gone^$hops^";
+	}
+	return @out;
 }
 
 # end of init phase
@@ -157,13 +193,13 @@ sub pc24
 	my $self = shift;
 	my $call = $self->call;
 	my $flag = $self->here ? '1' : '0';
-	my $hops = get_hops(24);
-  
+	my $hops = shift || get_hops(24);
+
 	return "PC24^$call^$flag^$hops^";
 }
 
 
-# create a merged dx message (freq, dxcall, t, text, spotter, orig-node) 
+# create a merged dx message (freq, dxcall, t, text, spotter, orig-node)
 sub pc26
 {
 	my ($freq, $dxcall, $t, $text, $spotter, $orignode) = @_;
@@ -187,15 +223,16 @@ sub pc28
 	my $time = ztime($t);
 	$private = $private ? '1' : '0';
 	$rr = $rr ? '1' : '0';
+	$subject ||= ' ';
 	return "PC28^$tonode^$fromnode^$to^$from^$date^$time^$private^$subject^ ^5^$rr^ ^$origin^~";
 }
 
 # message text (from and to node same way round as pc29)
-sub pc29 
+sub pc29
 {
 	my ($fromnode, $tonode, $stream, $text) = @_;
-	$text = ' ' unless $text && length $text > 0;
-	$text =~ s/\^/%5E/og;			# remove ^
+	$text = ' ' unless defined $text && length $text > 0;
+	$text =~ s/\^/~/g;			# remove ^
 	return "PC29^$fromnode^$tonode^$stream^$text^~";
 }
 
@@ -244,8 +281,7 @@ sub pc35
 # send all the DX clusters I reckon are connected
 sub pc38
 {
-	my @nodes = map { ($_->dxchan && $_->dxchan->isolate) ? () : $_->call } DXNode->get_all();
-	return "PC38^" . join(',', @nodes) . "^~";
+	return join '^', "PC38", map {$_->call} Route::Node::get_all();
 }
 
 # tell the local node to discconnect
@@ -268,9 +304,12 @@ sub pc40
 # user info
 sub pc41
 {
-	my ($call, $sort, $info) = @_;
-	my $hops = get_hops(41);
-	$sort = $sort ? "$sort" : '0';
+	my $call = shift;
+	$call = shift if ref $call;
+
+	my $sort = shift || '0';
+	my $info = shift || ' ';
+	my $hops = shift || get_hops(41);
 	return "PC41^$call^$sort^$info^$hops^~";
 }
 
@@ -314,9 +353,11 @@ sub pc49
 # periodic update of users, plus keep link alive device (always H99)
 sub pc50
 {
-	my $n = shift;
-	$n = 0 unless $n >= 0;
-	return "PC50^$main::mycall^$n^H99^";
+	my $self = shift;
+	my $call = $self->call;
+	my $n = shift || '0';
+	my $hops = shift || 'H99';
+	return "PC50^$call^$n^$hops^";
 }
 
 # generate pings
@@ -340,6 +381,113 @@ sub pc85
 	return "PC85^$tonode^$fromnode^$call^$msg^~";
 }
 
+# spider route broadcasts
+#
+
+
+sub _gen_pc92
+{
+	my $sort = shift;
+	my $ext = shift;
+	my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^$sort";
+	if ($pc9x_nodupe_first_slot && ($sort eq 'A' || $sort eq 'D') && $_[0]->call eq $main::mycall) {
+		shift;
+		$s .= '^';
+	}
+	for (@_) {
+		$s .= '^' . _encode_pc92_call($_, $ext);
+		$ext = 0 unless $sort eq 'A ';				# only the first slot has an ext except A
+		$ext = 2 if $pc92c_ipaddr_enable && $sort eq 'C';
+	}
+	return $s . '^H99^';
+}
+
+sub gen_pc92_with_time
+{
+	my $call = shift;
+	my $sort = shift;
+	my $t = shift;
+	my $ext = 1;
+	my $s = "PC92^$call^$t^$sort";
+	if ($pc9x_nodupe_first_slot && ($sort eq 'A' || $sort eq 'D') && $_[0]->call eq $main::mycall) {
+		shift;
+		$s .= '^';
+	}
+	for (@_) {
+		$s .= "^" . _encode_pc92_call($_, $ext);
+	}
+	return $s . '^H99^';
+}
+
+# add a local one
+sub pc92a
+{
+	return _gen_pc92('A', 2, @_);
+}
+
+# delete a local one
+sub pc92d
+{
+	return _gen_pc92('D', 0, @_);
+}
+
+# send a config
+sub pc92c
+{
+	return _gen_pc92('C', $pc92c_ipaddr_enable ? 2 : 1, @_);
+}
+
+# send a keep alive
+sub pc92k
+{
+	my $nref = shift;
+	my $s = "PC92^$main::mycall^" . gen_pc9x_t() . "^K";
+	$s .= "^" . _encode_pc92_call($nref, 1) . ":$main::me->{build}";
+	$s .= "^" . scalar $nref->nodes;
+	$s .= "^" . scalar $nref->users;
+	return $s . '^H99^';
+}
+
+# send a 'find' message
+sub pc92f
+{
+	my $target = shift;
+	my $from = shift;
+	return "PC92^$main::mycall^" . gen_pc9x_t() . "^F^$from^$target^H99^"
+}
+
+# send a 'reply' message
+sub pc92r
+{
+	my $to = shift;
+	my $target = shift;
+	my $flag = shift;
+	my $ms = shift;
+	return "PC92^$main::mycall^" . gen_pc9x_t() . "^R^$to^$target^$flag^$ms^H99^"
+}
+
+sub pc93
+{
+	my $to = shift;				# *, callsign, chat group name, sysop
+	my $from = shift;			# from user callsign
+	my $via = shift || '*';			# *, node call
+	my $line = shift;			# the text
+	my $origin = shift;			# this will be present on proxying from PC10
+	my $ipaddr = shift;
+
+	$line = unpad($line);
+	$line =~ s/\^/~/g;		# remove any ^ characters
+	my $s = "PC93^$main::mycall^" . gen_pc9x_t() . "^$to^$from^$via^$line";
+	$s .= "^$origin" if $origin;
+	if ($ipaddr) {
+		$s .= '^' unless $origin;
+		$ipaddr =~ s/:/,/;
+		$s .= "^$ipaddr";
+	}
+	$s .= "^H99^";
+	return $s;
+}
+
 1;
 __END__