X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXProt.pm;h=f68edc275bde45c1afe95bb67346136bcda02d76;hb=70908cf7f69eb4fc0caf5d735382bc2c1c1466a3;hp=7bffd606b25276058b368abf94b28de3cc4bc7ac;hpb=62d82b83c7cfef2ae3ef3a0ee6dea74ce7a37b2c;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 7bffd606..f68edc27 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -42,7 +42,7 @@ $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0; $main::build += $VERSION; $main::branch += $BRANCH; -use vars qw($pc11_max_age $pc23_max_age $last_pc50 +use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime $last_hour $last10 %eph %pings %rcmds $ann_to_talk %nodehops $baddx $badspotter $badnode $censorpc $rspfcheck $allowzero $decode_dk0wcy $send_opernam @checklist); @@ -62,6 +62,9 @@ $badnode = new DXHash "badnode"; $last10 = $last_pc50 = time; $ann_to_talk = 1; $rspfcheck = 1; +$eph_restime = 180; +$eph_info_restime = 60*60; +$eph_pc34_restime = 30; @checklist = ( @@ -193,7 +196,9 @@ sub init $main::me->{priv} = 9; $main::me->{metric} = 0; $main::me->{pingave} = 0; - + $main::me->{version} = $main::version; + $main::me->{build} = $main::build; + # $Route::Node::me->adddxchan($main::me); } @@ -346,6 +351,20 @@ sub normal $to = $field[2]; } + # if this is a 'nodx' node then ignore it + if ($badnode->in($field[6]) || ($via && $badnode->in($via))) { + dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr'); + return; + } + + # if this is a 'bad spotter' user then ignore it + my $nossid = $from; + $nossid =~ s/-\d+$//; + if ($badspotter->in($nossid)) { + dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr'); + return; + } + # if we are converting announces to talk is it a dup? if ($ann_to_talk) { if (AnnTalk::is_talk_candidate($from, $field[3]) && AnnTalk::dup($from, $to, $field[3])) { @@ -405,7 +424,9 @@ sub normal } # if this is a 'bad spotter' user then ignore it - if ($badspotter->in($field[6])) { + my $nossid = $field[6]; + $nossid =~ s/-\d+$//; + if ($badspotter->in($nossid)) { dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr'); return; } @@ -439,6 +460,7 @@ sub normal } } + my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]); # global spot filtering on INPUT if ($self->{inspotsfilter}) { @@ -448,7 +470,10 @@ sub normal return; } } - + + # this goes after the input filtering, but before the add + # so that if it is input filtered, it isn't added to the dup + # list. This allows it to come in from a "legitimate" source if (Spot::dup($field[1], $field[2], $d, $field[5])) { dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr'); return; @@ -542,6 +567,20 @@ sub normal } } + # if this is a 'nodx' node then ignore it + if ($badnode->in($field[5])) { + dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr'); + return; + } + + # if this is a 'bad spotter' user then ignore it + my $nossid = $field[1]; + $nossid =~ s/-\d+$//; + if ($badspotter->in($nossid)) { + dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr'); + return; + } + if ($field[2] eq '*' || $field[2] eq $main::mycall) { @@ -614,7 +653,7 @@ sub normal next unless $call && $conf && defined $here && is_callsign($call); next if $call eq $main::mycall; - eph_del_regex("^PC17\^$call\^$ncall"); + eph_del_regex("^PC17\\^$call\\^$ncall"); $conf = $conf eq '*'; @@ -661,12 +700,7 @@ sub normal my $ncall = $field[2]; my $ucall = $field[1]; - if (eph_dup($line)) { - dbg("PCPROT: dup PC17 detected") if isdbg('chanerr'); - return; - } - - eph_del_regex("^PC16.*$ncall.*$ucall"); + eph_del_regex("^PC16\\^$ncall.*$ucall"); if ($ncall eq $main::mycall) { dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr'); @@ -694,6 +728,12 @@ sub normal return unless $self->in_filter_route($parent); $parent->del_user($uref); + + if (eph_dup($line)) { + dbg("PCPROT: dup PC17 detected") if isdbg('chanerr'); + return; + } + $self->route_pc17($parent, $uref); return; } @@ -701,6 +741,23 @@ sub normal if ($pcno == 18) { # link request $self->state('init'); + # record the type and version offered + if ($field[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) { + $self->version(53 + $1); + $self->user->version(53 + $1); + $self->build(0 + $2); + $self->user->build(0 + $2); + unless ($self->is_spider) { + $self->user->sort('S'); + $self->user->put; + $self->sort('S'); + } + } else { + $self->version(50.0); + $self->version($field[2] / 100) if $field[2] && $field[2] =~ /^\d+$/; + $self->user->version($self->version); + } + # first clear out any nodes on this dxchannel my $parent = Route::Node::get($self->{call}); my @rout = $parent->del_nodes; @@ -736,7 +793,7 @@ sub normal my $ver = $field[$i+3]; next unless defined $here && defined $conf && is_callsign($call); - eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)"); + eph_del_regex("^PC(?:21\\^$call|17\\^[^\\^]+\\^$call)"); # check for sane parameters # $ver = 5000 if $ver eq '0000'; @@ -748,7 +805,7 @@ sub normal my $dxchan = DXChannel->get($call); if ($dxchan && $dxchan != $self) { dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr'); - return; + next; } # update it if required @@ -818,21 +875,15 @@ sub normal if ($pcno == 21) { # delete a cluster from the list my $call = uc $field[1]; - if (eph_dup($line)) { - dbg("PCPROT: dup PC21 detected") if isdbg('chanerr'); - return; - } - + eph_del_regex("^PC1[79].*$call"); + # if I get a PC21 from the same callsign as self then treat it # as a PC39: I have gone away if ($call eq $self->call) { $self->disconnect(1); - eph_del_regex("^PC(?:1[679]|21).*$field[1]"); return; } - eph_del_regex("^PC1[79].*$call"); - my @rout; my $parent = Route::Node::get($self->{call}); unless ($parent) { @@ -861,6 +912,11 @@ sub normal return; } +# if (eph_dup($line)) { +# dbg("PCPROT: dup PC21 detected") if isdbg('chanerr'); +# return; +# } + $self->route_pc21(@rout) if @rout; return; } @@ -977,11 +1033,16 @@ sub normal } if ($pcno == 34 || $pcno == 36) { # remote commands (incoming) - $self->process_rcmd($field[1], $field[2], $field[2], $field[3]); + if (eph_dup($line, $eph_pc34_restime)) { + dbg("PCPROT: dupe") if isdbg('chanerr'); + } else { + $self->process_rcmd($field[1], $field[2], $field[2], $field[3]); + } return; } if ($pcno == 35) { # remote command replies + eph_del_regex("^PC35\\^$field[2]\\^$field[1]\\^"); $self->process_rcmd_reply($field[1], $field[2], $field[1], $field[3]); return; } @@ -995,7 +1056,6 @@ sub normal if ($pcno == 39) { # incoming disconnect if ($field[1] eq $self->{call}) { $self->disconnect(1); - eph_del_regex("^PC(?:1[679]|21).*$field[1]"); } else { dbg("PCPROT: came in on wrong channel") if isdbg('chanerr'); } @@ -1005,6 +1065,11 @@ sub normal if ($pcno == 41) { # user info my $call = $field[1]; + if (eph_dup($line, $eph_info_restime)) { + dbg("PCPROT: dupe") if isdbg('chanerr'); + return; + } + # input filter if required # my $ref = Route::get($call) || Route->new($call); # return unless $self->in_filter_route($ref); @@ -1035,11 +1100,11 @@ sub normal } elsif ($field[2] == 4) { $user->homenode($field[3]); } elsif ($field[2] == 5) { - if (is_qra($field[3])) { - my ($lat, $long) = DXBearing::qratoll($field[3]); + if (is_qra(uc $field[3])) { + my ($lat, $long) = DXBearing::qratoll(uc $field[3]); $user->lat($lat); $user->long($long); - $user->qra($field[3]); + $user->qra(uc $field[3]); } else { dbg('PCPROT: not a valid QRA locator') if isdbg('chanerr'); return; @@ -1048,9 +1113,13 @@ sub normal $user->lastoper($main::systime); # to cut down on excessive for/opers being generated $user->put; + unless ($self->{isolate}) { + DXChannel::broadcast_nodes($line, $self); # send it to everyone but me + } + # perhaps this IS what we want after all # $self->route_pc41($ref, $call, $field[2], $field[3], $field[4]); -# return; + return; } if ($pcno == 43) { @@ -1118,11 +1187,6 @@ sub normal } else { $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6); } -# my $st; -# for (@{$tochan->{pingtime}}) { -# $st += $_; -# } -# $tochan->{pingave} = $st / @{$tochan->{pingtime}}; $tochan->{nopings} = $nopings; # pump up the timer } } @@ -1185,6 +1249,27 @@ sub normal if ($pcno == 85) { # remote command replies $self->process_rcmd_reply($field[1], $field[2], $field[3], $field[4]); + return; + } + if ($pcno == 90) { # new style PC16,17,19,21 + my $node = $field[1]; + + # mark this node as wanting PC90s + my $parent = Route::Node::get($node); + if ($parent) { + my $t = hex $field[2]; + my $last = $parent->lastpc90 || 0; + if ($last < $t) { + $parent->pc90(1); + $parent->lastpc90($t); + my ($updsort, $n) = unpack "AA*", $field[3]; + for (my $i = 4; $i < $#field; $i++) { + my ($sort, $flag, $node, $ping) = $field[$i] =~ m{(\w)(\d)([-\w+])(,\d+)?}; + $ping /= 10 if (defined $ping); + } + } + } + return; } } @@ -1228,8 +1313,12 @@ sub process next unless $dxchan->is_node(); next if $dxchan == $main::me; - # send the pc50 - $dxchan->send($pc50s) if $pc50s; + # send the pc50 or PC90 + if ($pc50s && $dxchan->user->wantpc90) { + $dxchan->send_route(\&pc90, 1, $main::me, 'T', @dxchan); + } else { + $dxchan->send($pc50s) if $pc50s; + } # send a ping out on this channel if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) { @@ -1265,6 +1354,7 @@ sub process # some active measures # + sub send_dx_spot { my $self = shift; @@ -1519,6 +1609,7 @@ sub send_local_config unshift @localnodes, $main::routeroot; } + send_route($self, \&pc19, scalar(@localnodes)+scalar(@remotenodes), @localnodes, @remotenodes); # get all the users connected on the above nodes and send them out @@ -1529,6 +1620,7 @@ sub send_local_config dbg("sent a null value") if isdbg('chanerr'); } } + $self->send_route(\&pc90, 1, $main::me, 'T', DXChannel::get_all()) if $self->user->wantpc90; } # @@ -1745,6 +1837,10 @@ sub disconnect $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op"))); } + # get rid of any PC16 and 19s + eph_del_regex("^PC16\\^$call"); + eph_del_regex("^PC19\\^.*$call"); + # do routing stuff my $node = Route::Node::get($call); my @rout; @@ -1891,6 +1987,12 @@ sub route_pc50 broadcast_route($self, \&pc50, 1, @_); } +sub route_pc90 +{ + my $self = shift; + broadcast_route($self, \&pc90, 1, @_); +} + sub in_filter_route { my $self = shift; @@ -1907,12 +2009,13 @@ sub in_filter_route sub eph_dup { my $s = shift; + my $t = shift || $eph_restime; my $r; # chop the end off $s =~ s/\^H\d\d?\^?\~?$//; $r = 1 if exists $eph{$s}; # pump up the dup if it keeps circulating - $eph{$s} = $main::systime; + $eph{$s} = $main::systime + $t; return $r; } @@ -1932,11 +2035,26 @@ sub eph_clean my ($key, $val); while (($key, $val) = each %eph) { - if ($main::systime - $val > 180) { + if ($main::systime >= $val) { delete $eph{$key}; } } } +sub eph_list +{ + my ($key, $val); + my @out; + + while (($key, $val) = each %eph) { + push @out, $key, $val; + } + return @out; +} + +sub run_cmd +{ + goto &DXCommandmode::run_cmd; +} 1; __END__