X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=acb538826e2bc40c43aa51ec40f96c64afb786aa;hb=5756741d9682667ae5b0442c4e6f609bd481b6eb;hp=657057c9e03cbb99f056457018714bdc050af177;hpb=6181396aed78196fdff45033de7b59d6a2fcd6c1;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 657057c9..acb53882 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,15 +19,10 @@ use DXDebug; use strict; -use vars qw($VERSION $BRANCH); -$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); -$main::build += $VERSION; -$main::branch += $BRANCH; - -use vars qw($sentencelth $handle_xml); +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 @@ -38,7 +33,7 @@ sub pc10 { 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 { @@ -48,28 +43,39 @@ sub pc10 $origin ||= $main::mycall; $text = unpad($text); $text = ' ' unless $text && length $text > 0; - $text =~ s/\^/%5E/g; - return "PC10^$from^$user1^$text^*^$user2^$origin^~"; + $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, $origin) = @_; my $hops = get_hops(12); $text ||= ' '; - $text =~ s/\^/%5E/g; + $text =~ s/\^/~/g; $tonode ||= '*'; $sysop ||= ' '; $wx ||= '0'; @@ -78,8 +84,8 @@ sub pc12 } # -# add one or more users (I am expecting references that have 'call', -# 'conf' & '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(..) @@ -115,7 +121,7 @@ sub pc17 my $hops = get_hops(17); my $ncall = $node->call; my $ucall = $ref->call; - push @out, "PC17^$ucall^$ncall^$hops^"; + push @out, "PC17^$ucall^$ncall^$hops^"; } return @out; } @@ -123,14 +129,13 @@ sub pc17 # Request init string sub pc18 { - my $flags = ""; - $flags .= " xml" if $handle_xml; - return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$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 @out; @@ -144,6 +149,8 @@ sub pc19 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); @@ -187,12 +194,12 @@ sub pc24 my $call = $self->call; my $flag = $self->here ? '1' : '0'; 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) = @_; @@ -221,11 +228,11 @@ sub pc28 } # message text (from and to node same way round as pc29) -sub pc29 +sub pc29 { my ($fromnode, $tonode, $stream, $text) = @_; $text = ' ' unless defined $text && length $text > 0; - $text =~ s/\^/%5E/og; # remove ^ + $text =~ s/\^/~/g; # remove ^ return "PC29^$fromnode^$tonode^$stream^$text^~"; } @@ -299,7 +306,7 @@ sub pc41 { my $call = shift; $call = shift if ref $call; - + my $sort = shift || '0'; my $info = shift || ' '; my $hops = shift || get_hops(41); @@ -374,9 +381,111 @@ sub pc85 return "PC85^$tonode^$fromnode^$call^$msg^~"; } -# spider route broadcast -sub pc90 +# 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;