X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=63bc5a3b08a5ba8fbb88abc8b49eaab1dfe2efca;hb=686140dd3cb3c832d8bb6c780acd82effb54834c;hp=6b06fb13440d615f40f9cba4d16702bc7be8000b;hpb=db0959118b4c5045e842cf07c399e2924bd6ca10;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 6b06fb13..63bc5a3b 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -20,10 +20,7 @@ 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; +($VERSION, $BRANCH) = dxver(q$Revision$); use vars qw($sentencelth); @@ -38,7 +35,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 { @@ -123,7 +120,7 @@ sub pc17 # Request init string sub pc18 { - my $flags = " pc92"; + my $flags = " pc9x"; $flags .= " xml" if DXXml::available(); return "PC18^DXSpider Version: $main::version Build: $main::build$flags^$DXProt::myprot_version^"; } @@ -420,6 +417,22 @@ sub pc92c return _gen_pc92('C', 1, @_); } +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 + + $line = unpad($line); + $line =~ s/\^/\\5E/g; # remove any ^ characters + my $s = "PC93^$main::mycall^" . gen_pc9x_t() . "^$to^$from^$via^$line"; + $s .= "^$origin" if $origin; + $s .= "^H99^"; + return $s; +} + 1; __END__