X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=7e1c530e933a248f33976a07eebfbd18c6645d9a;hb=84505457c5b3757715d97a63acd792b28fc1841a;hp=3a26ca772976f0be6972718bc12c842981f9c1d8;hpb=2546ef0cfaaca39e65985e414258071a636979af;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 3a26ca77..7e1c530e 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -19,7 +19,6 @@ use DXCluster; use DXProtVars; use DXCommandmode; use Spot; -use Date::Parse; use DXProtout; use strict; @@ -104,11 +103,12 @@ sub normal last SWITCH if grep $field[7] =~ /^$_/, @DXProt::nodx_node; # convert the date to a unix date - my $date = $field[3]; - my $time = $field[4]; - $date =~ s/^\s*(\d+)-(\w\w\w)-(19\d\d)$/$1 $2 $3/; - $time =~ s/^(\d\d)(\d\d)Z$/$1:$2 +0000/; - my $d = str2time("$date $time"); + my $d = cltounix($field[3], $field[4]); +# my $date = $field[3]; +# my $time = $field[4]; +# $date =~ s/^\s*(\d+)-(\w\w\w)-(19\d\d)$/$1 $2 $3/; +# $time =~ s/^(\d\d)(\d\d)Z$/$1:$2 +0000/; +# my $d = str2time("$date $time"); return if !$d; # bang out (and don't pass on) if date is invalid # strip off the leading & trailing spaces from the comment @@ -119,7 +119,7 @@ sub normal # format and broadcast it to users my $spotter = $field[6]; - $spotter =~ s/^(\w+)-\d+/$1/; # strip off the ssid from the spotter + $spotter =~ s/-\d+$//o; # strip off the ssid from the spotter $spotter .= ':'; # add a colon # send orf to the users @@ -135,10 +135,25 @@ sub normal # strip leading and trailing stuff my $text = unpad($field[3]); - my $target = "To Sysops" if $field[4] eq '*'; - $target = "WX" if $field[6]; + my $target; + my @list; + + if ($field[4] eq '*') { # sysops + $target = "To Sysops"; + @list = map { $_->priv >= 5 ? $_ : () } get_all_users(); + } elsif ($field[4] gt ' ') { # speciality list handling + my ($name) = split /\./, $field[4]; + $target = "To $name"; # put the rest in later (if bothered) + } + + $target = "WX" if $field[6] eq '1'; $target = "To All" if !$target; - broadcast_users("$target de $field[1]: $text"); + + if (@list > 0) { + broadcast_list("$target de $field[1]: $text", @list); + } else { + broadcast_users("$target de $field[1]: $text"); + } return if $field[2] eq $main::mycall; # it's routed to me } else { @@ -162,7 +177,8 @@ sub normal my ($call, $confmode, $here) = $field[$i] =~ /^(\w+) (-) (\d)/o; next if length $call < 3; next if !$confmode; - $call =~ s/^(\w+)-\d+/$1/; # remove ssid + $call = uc $call; + $call =~ s/-\d+$//o; # remove ssid next if DXCluster->get($call); # we already have this (loop?) $confmode = $confmode eq '*'; @@ -194,10 +210,10 @@ sub normal my $i; for ($i = 1; $i < $#field-1; $i += 4) { my $here = $field[$i]; - my $call = $field[$i+1]; + my $call = uc $field[$i+1]; my $confmode = $field[$i+2] eq '*'; my $ver = $field[$i+3]; - + # now check the call over next if DXCluster->get($call); # we already have this @@ -216,7 +232,8 @@ sub normal } if ($pcno == 21) { # delete a cluster from the list - my $ref = DXCluster->get($field[1]); + my $call = uc $field[1]; + my $ref = DXCluster->get($call); $ref->del() if $ref; last SWITCH; } @@ -225,32 +242,41 @@ sub normal if ($pcno == 23) {last SWITCH;} if ($pcno == 24) { # set here status - my $user = DXCluster->get($field[1]); - $user->here($field[2]); + my $call = uc $field[1]; + $call =~ s/-\d+//o; + my $ref = DXCluster->get($call); + $ref->here($field[2]) if $ref; last SWITCH; } if ($pcno == 25) {last SWITCH;} if ($pcno == 26) {last SWITCH;} if ($pcno == 27) {last SWITCH;} - if ($pcno == 28) {last SWITCH;} - if ($pcno == 29) {last SWITCH;} - if ($pcno == 30) {last SWITCH;} - if ($pcno == 31) {last SWITCH;} - if ($pcno == 32) {last SWITCH;} - if ($pcno == 33) {last SWITCH;} - if ($pcno == 34) {last SWITCH;} - if ($pcno == 35) {last SWITCH;} - if ($pcno == 36) {last SWITCH;} + + if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42) { # mail/file handling + DXMsg::process($self, $line); + return; + } + + if ($pcno == 34 || $pcno == 36) { # remote commands (incoming) + last SWITCH; + } + + if ($pcno == 35) { # remote command replies + last SWITCH; + } + if ($pcno == 37) {last SWITCH;} - if ($pcno == 38) {last SWITCH;} + + if ($pcno == 38) { # node connected list from neighbour + return; + } if ($pcno == 39) { # incoming disconnect $self->disconnect(); return; } - if ($pcno == 40) {last SWITCH;} if ($pcno == 41) { # user info # add this station to the user database, if required my $user = DXUser->get_current($field[1]); @@ -274,7 +300,6 @@ sub normal $user->put; last SWITCH; } - if ($pcno == 42) {last SWITCH;} if ($pcno == 43) {last SWITCH;} if ($pcno == 44) {last SWITCH;} if ($pcno == 45) {last SWITCH;} @@ -349,8 +374,20 @@ sub process sub finish { my $self = shift; - broadcast_ak1a($self->pc21('Gone.')); my $ref = DXCluster->get($self->call); + + # broadcast to all other nodes that all the nodes connected to via me are gone + my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all(); + my $node; + + foreach $node (@gonenodes) { + next if $node->call eq $self->call; + broadcast_ak1a(pc21($node->call, 'Gone'), $self); # done like this 'cos DXNodes don't have a pc21 method + $node->del(); + } + + # now broadcast to all other ak1a nodes that I have gone + broadcast_ak1a(pc21($self->call, 'Gone.'), $self); $ref->del() if $ref; } @@ -429,6 +466,17 @@ sub broadcast_users } } +# broadcast to a list of users +sub broadcast_list +{ + my $s = shift; + my $chan; + + foreach $chan (@_) { + $chan->send($s); # send it + } +} + # # gimme all the ak1a nodes #