X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=352a4f6a4aae9bd715467aab117ad842bd295dd9;hb=0f0ef738611adb7e4a2b6ae8207a8506d3f26563;hp=612e59b6c93e62fbefa1a52a6dc4823ed5e001a1;hpb=5aaaa0212b6bda5def233ffce515d889b8e547e7;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 612e59b6..352a4f6a 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -35,26 +35,23 @@ use Route::Node; use Script; use Investigate; use RouteDB; -use Thingy; -use Thingy::Dx; -use Thingy::Rt; -use Thingy::Ping; -use Thingy::T; -use Thingy::Hello; -use Thingy::Bye; + use strict; use vars qw($VERSION $BRANCH); - -main::mkver($VERSION = q$Revision$); +$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($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 $pingint $obscount %pc19list $chatdupeage $chatimportfn $investigation_int $pc19_version $myprot_version %nodehops $baddx $badspotter $badnode $censorpc $rspfcheck - $allowzero $decode_dk0wcy $send_opernam @checklist); + $allowzero $decode_dk0wcy $send_opernam @checklist + $handle_xml); $pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11 $pc23_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc23 @@ -82,11 +79,12 @@ $chatdupeage = 20 * 60 * 60; $chatimportfn = "$main::root/chat_import"; $investigation_int = 12*60*60; # time between checks to see if we can see this node $pc19_version = 5466; # the visible version no for outgoing PC19s generated from pc59 +$handle_xml = 0; # handle XML sentences @checklist = ( [ qw(i c c m bp bc c) ], # pc10 - [ qw(i f m d t m c c h) ], # pc11 + [ qw(i f bm d t m c c h) ], # pc11 [ qw(i c bm m bm bm p h) ], # pc12 [ qw(i c h) ], # [ qw(i c h) ], # @@ -223,7 +221,7 @@ sub init $main::me->{metric} = 0; $main::me->{pingave} = 0; $main::me->{registered} = 1; - $main::me->{version} = 5252 + $main::version; + $main::me->{version} = $main::version; $main::me->{build} = $main::build; } @@ -239,11 +237,7 @@ sub new my $pkg = shift; my $call = shift; $main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall; - if ($self->{call} ne $main::mycall) { - my $thing = Thingy::Hello->new(user=>$call); - $thing->broadcast($self); - } - + return $self; } @@ -257,7 +251,10 @@ sub start my $user = $self->{user}; # log it - my $host = $self->{conn}->{peerhost} || "unknown"; + my $host = $self->{conn}->{peerhost}; + $host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport}; + $host ||= "unknown"; + Log('DXProt', "$call connected from $host"); # remember type of connection @@ -313,9 +310,6 @@ sub start $self->state('init'); $self->{pc50_t} = $main::systime; - my $thing = Thingy::Hello->new(origin=>$main::mycall, user=>$call); - $thing->broadcast($self); - # send info to all logged in thingies $self->tell_login('loginn'); @@ -334,7 +328,6 @@ sub sendinit $self->send(pc18()); } - # # This is the normal pcxx despatcher # @@ -349,6 +342,7 @@ sub normal # print join(',', @field), "\n"; + # process PC frames, this will fail unless the frame starts PCnn my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number unless (defined $pcno && $pcno >= 10 && $pcno <= 99) { @@ -363,16 +357,6 @@ sub normal return; } - # decrement any hop fields at this point - if ($line =~ /\^H(\d\d?)\^?~?$/) { - my $hops = $1 - 1; - if ($hops < 0) { - dbg("PCPROT: zero hop count, dumped") if isdbg('chanerr'); - return; - } - $line =~ s/\^H\d\d?(\^?~?)$/^H$hops$1/; - } - my $origin = $self->{call}; no strict 'subs'; my $sub = "handle_$pcno"; @@ -437,7 +421,7 @@ sub handle_10 } # remember a route to this node and also the node on which this user is - RouteDB::update($_[6], $origin); + RouteDB::update($_[6], $self->{call}); # RouteDB::update($to, $_[6]); # it is here and logged on @@ -514,7 +498,7 @@ sub handle_11 } # is it 'baddx' - if ($baddx->in($_[2]) || BadWords::check($_[2])) { + if ($baddx->in($_[2]) || BadWords::check($_[2]) || $_[2] =~ /COCK/) { dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr'); return; } @@ -538,15 +522,27 @@ sub handle_11 # RouteDB::update($_[7], $self->{call}); # RouteDB::update($_[6], $_[7]); - my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $_[6], $_[7]); - - my $thing = Thingy::Dx->new(origin=>$main::mycall); - $thing->from_DXProt(DXProt=>$line,spotdata=>\@spot); - $thing->process($self); + my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7]); + # global spot filtering on INPUT + if ($self->{inspotsfilter}) { + my ($filter, $hops) = $self->{inspotsfilter}->it(@spot); + unless ($filter) { + dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr'); + 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(@spot[0..4,5])) { + dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr'); + return; + } + + # add it + Spot::add(@spot); + # # @spot at this point contains:- # freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node @@ -600,6 +596,20 @@ sub handle_11 } } } + + # local processing + my $r; + eval { + $r = Local::spot($self, @spot); + }; + # dbg("Local::spot1 error $@") if isdbg('local') if $@; + return if $r; + + # DON'T be silly and send on PC26s! + return if $pcno == 26; + + # send out the filtered spots + send_dx_spot($self, $line, @spot) if @spot; } # announces @@ -691,7 +701,7 @@ sub handle_16 # dos I want users from this channel? unless ($self->user->wantpc16) { - dbg("PCPROT: don't send users to $origin") if isdbg('chanerr'); + dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr'); return; } # is it me? @@ -750,7 +760,7 @@ sub handle_16 dbg("PCPROT: PC19 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr'); $parent = undef; } - if ($parent) { + if ($parent) { my $r = $parent->add($ncall, $_->[1], $_->[2]); push @nrout, $r unless @nrout; } @@ -776,7 +786,7 @@ sub handle_16 return; } } else { - + $dxchan = $parent->dxchan; if ($dxchan && $dxchan ne $self) { dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr'); @@ -787,23 +797,17 @@ sub handle_16 return unless $self->in_filter_route($parent); } - # is he under the control of the new protocol? - if ($parent && $parent->np) { - dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr'); - return; - } - my $i; my @rout; for ($i = 2; $i < $#_; $i++) { my ($call, $conf, $here) = $_[$i] =~ /^(\S+) (\S) (\d)/o; next unless $call && $conf && defined $here && is_callsign($call); next if $call eq $main::mycall; - + eph_del_regex("^PC17\\^$call\\^$ncall"); - + $conf = $conf eq '*'; - + # reject this if we think it is a node already my $r = Route::Node::get($call); my $u = DXUser->get_current($call) unless $r; @@ -811,10 +815,10 @@ sub handle_16 dbg("PCPROT: $call is a node") if isdbg('chanerr'); next; } - + $r = Route::User::get($call); my $flags = Route::here($here)|Route::conf($conf); - + if ($r) { my $au = $r->addparent($parent); if ($r->flags != $flags) { @@ -826,7 +830,7 @@ sub handle_16 push @rout, $parent->add_user($call, $flags); } - + # add this station to the user database, if required $call =~ s/-\d+$//o; # remove ssid for users my $user = DXUser->get_current($call); @@ -889,12 +893,6 @@ sub handle_17 return; } - # is he under the control of the new protocol? - if ($parent && $parent->np) { - dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr'); - return; - } - # input filter if required and then remove user if present if ($parent) { # return unless $self->in_filter_route($parent); @@ -923,8 +921,8 @@ sub handle_18 # record the type and version offered if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) { - $self->version(52.51 + $1); - $self->user->version(52.51 + $1); + $self->version(53 + $1); + $self->user->version(53 + $1); $self->build(0 + $2); $self->user->build(0 + $2); unless ($self->is_spider) { @@ -932,6 +930,7 @@ sub handle_18 $self->user->put; $self->sort('S'); } + $self->{handle_xml}++ if $_[1] =~ /\bxml\b/; } else { $self->version(50.0); $self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/; @@ -939,7 +938,7 @@ sub handle_18 } # first clear out any nodes on this dxchannel - my $parent = Route::Node::get($origin); + my $parent = Route::Node::get($self->{call}); my @rout = $parent->del_nodes; $self->route_pc21($origin, $line, @rout, $parent) if @rout; $self->send_local_config(); @@ -961,9 +960,9 @@ sub handle_19 my @rout; # first get the INTERFACE node - my $parent = Route::Node::get($origin); + my $parent = Route::Node::get($self->{call}); unless ($parent) { - dbg("DXPROT: my parent $origin has disappeared"); + dbg("DXPROT: my parent $self->{call} has disappeared"); $self->disconnect; return; } @@ -1007,7 +1006,7 @@ sub handle_19 # check that this PC19 isn't trying to alter the wrong dxchan my $dxchan = DXChannel::get($call); if ($dxchan && $dxchan != $self) { - dbg("PCPROT: PC19 from $origin trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr'); + dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr'); next; } @@ -1022,19 +1021,19 @@ sub handle_19 } $user->sort('A') unless $user->is_node; - RouteDB::update($call, $origin); + RouteDB::update($call, $self->{call}); # do we believe this call? my $genline = "PC19^$here^$call^$conf^$ver^$_[-1]^"; - unless ($call eq $origin || $self->is_believed($call)) { - my $pt = $user->lastping($origin) || 0; - if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $origin)) { - my $ivp = Investigate->new($call, $origin); + unless ($call eq $self->{call} || $self->is_believed($call)) { + my $pt = $user->lastping($self->{call}) || 0; + if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $self->{call})) { + my $ivp = Investigate->new($call, $self->{call}); $ivp->version($ver); $ivp->here($here); $ivp->store_pcxx($pcno,$genline,$origin,'PC19',$here,$call,$conf,$ver,$_[-1]); } else { - dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr'); + dbg("PCPROT: We don't believe $call on $self->{call}") if isdbg('chanerr'); } $user->put; next; @@ -1048,11 +1047,6 @@ sub handle_19 my $r = Route::Node::get($call); my $flags = Route::here($here)|Route::conf($conf); - # is he under the control of the new protocol? - if ($r && $r->np) { - dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr'); - next; - } # modify the routing table if it is in it, otherwise store it in the pc19list for now if ($r) { my $ar; @@ -1072,7 +1066,7 @@ sub handle_19 } else { # if he is directly connected or allowed then add him, otherwise store him up for later - if ($call eq $origin || $user->wantroutepc19) { + if ($call eq $self->{call} || $user->wantroutepc19) { my $new = Route->new($call); # throw away if ($self->in_filter_route($new)) { my $ar = $parent->add($call, $ver, $flags); @@ -1084,7 +1078,7 @@ sub handle_19 } else { $pc19list{$call} = [] unless exists $pc19list{$call}; my $nl = $pc19list{$call}; - push @{$pc19list{$call}}, [$origin, $ver, $flags] unless grep $_->[0] eq $origin, @$nl; + push @{$pc19list{$call}}, [$self->{call}, $ver, $flags] unless grep $_->[0] eq $self->{call}, @$nl; } } @@ -1111,10 +1105,6 @@ sub handle_20 $self->send(pc22()); $self->state('normal'); $self->{lastping} = 0; - my $thing = Thingy::Rt->new(user=>$self->{call}); - my $nref = Route::Node::get($self->{call}); - $thing->broadcast if $thing->copy_pc16_data($nref); - $self->lastcf($main::systime); } # delete a cluster from the list @@ -1135,14 +1125,14 @@ sub handle_21 return; } - RouteDB::delete($call, $origin); + RouteDB::delete($call, $self->{call}); # check if we believe this - unless ($call eq $origin || $self->is_believed($call)) { - if (my $ivp = Investigate::get($call, $origin)) { + unless ($call eq $self->{call} || $self->is_believed($call)) { + if (my $ivp = Investigate::get($call, $self->{call})) { $ivp->store_pcxx($pcno,$line,$origin,@_); } else { - dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr'); + dbg("PCPROT: We don't believe $call on $self->{call}") if isdbg('chanerr'); } return; } @@ -1151,13 +1141,13 @@ sub handle_21 # this routing table manipulation, just remove it from the list and dump it my @rout; if (my $nl = $pc19list{$call}) { - $pc19list{$call} = [ grep {$_->[0] ne $origin} @$nl ]; + $pc19list{$call} = [ grep {$_->[0] ne $self->{call}} @$nl ]; delete $pc19list{$call} unless @{$pc19list{$call}}; } else { - my $parent = Route::Node::get($origin); + my $parent = Route::Node::get($self->{call}); unless ($parent) { - dbg("DXPROT: my parent $origin has disappeared"); + dbg("DXPROT: my parent $self->{call} has disappeared"); $self->disconnect; return; } @@ -1167,18 +1157,12 @@ sub handle_21 my $dxchan = DXChannel::get($call); if ($dxchan && $dxchan != $self) { - dbg("PCPROT: PC21 from $origin trying to alter locally connected $call, ignored!") if isdbg('chanerr'); + dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr'); return; } # input filter it return unless $self->in_filter_route($node); - - # is he under the control of the new protocol? - if ($node->np) { - dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr'); - return; - } # routing objects push @rout, $node->del($parent); @@ -1201,10 +1185,6 @@ sub handle_22 my $origin = shift; $self->state('normal'); $self->{lastping} = 0; - my $thing = Thingy::Rt->new(user=>$self->{call}); - my $nref = Route::Node::get($self->{call}); - $thing->broadcast if $thing->copy_pc16_data($nref); - $self->lastcf($main::systime); } # WWV info @@ -1239,13 +1219,24 @@ sub handle_23 dbg("PCPROT: WWV Date ($_[1] $_[2]) out of range") if isdbg('chanerr'); return; } - if (Geomag::dup($d,$sfi,$k,$i,$_[6])) { + + # global wwv filtering on INPUT + my @dxcc = ((Prefix::cty_data($_[7]))[0..2], (Prefix::cty_data($_[8]))[0..2]); + if ($self->{inwwvfilter}) { + my ($filter, $hops) = $self->{inwwvfilter}->it(@_[7,8], $origin, @dxcc); + unless ($filter) { + dbg("PCPROT: Rejected by input wwv filter") if isdbg('chanerr'); + return; + } + } + $_[7] =~ s/-\d+$//o; # remove spotter's ssid + if (Geomag::dup($d,$sfi,$k,$i,$_[6],$_[7])) { dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr'); return; } - $_[7] =~ s/-\d+$//o; # remove spotter's ssid - my $wwv = Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r); + # note this only takes the first one it gets + Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r); my $rep; eval { @@ -1407,7 +1398,7 @@ sub handle_39 my $pcno = shift; my $line = shift; my $origin = shift; - if ($_[1] eq $origin) { + if ($_[1] eq $self->{call}) { $self->disconnect(1); } else { dbg("PCPROT: came in on wrong channel") if isdbg('chanerr'); @@ -1523,11 +1514,11 @@ sub handle_50 my $call = $_[1]; - RouteDB::update($call, $origin); + RouteDB::update($call, $self->{call}); my $node = Route::Node::get($call); if ($node) { - return unless $node->call eq $origin; + return unless $node->call eq $self->{call}; $node->usercount($_[2]); # input filter if required @@ -1585,11 +1576,11 @@ sub handle_51 $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6); } $tochan->{nopings} = $nopings; # pump up the timer - if (my $ivp = Investigate::get($from, $origin)) { + if (my $ivp = Investigate::get($from, $self->{call})) { $ivp->handle_ping; } } elsif (my $rref = Route::Node::get($r->{call})) { - if (my $ivp = Investigate::get($from, $origin)) { + if (my $ivp = Investigate::get($from, $self->{call})) { $ivp->handle_ping; } } @@ -1599,7 +1590,7 @@ sub handle_51 } } else { - RouteDB::update($from, $origin); + RouteDB::update($from, $self->{call}); if (eph_dup($line)) { dbg("PCPROT: dup PC51 detected") if isdbg('chanerr'); @@ -1765,6 +1756,36 @@ sub process # +sub send_dx_spot +{ + my $self = shift; + my $line = shift; + my @dxchan = DXChannel::get_all(); + my $dxchan; + + # send it if it isn't the except list and isn't isolated and still has a hop count + # taking into account filtering and so on + foreach $dxchan (@dxchan) { + next if $dxchan == $main::me; + next if $dxchan == $self && $self->is_node; + $dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call}); + } +} + +sub dx_spot +{ + my $self = shift; + my $line = shift; + my $isolate = shift; + my ($filter, $hops); + + if ($self->{spotsfilter}) { + ($filter, $hops) = $self->{spotsfilter}->it(@_); + return unless $filter; + } + send_prot_line($self, $filter, $hops, $isolate, $line); +} + sub send_prot_line { my ($self, $filter, $hops, $isolate, $line) = @_; @@ -1814,7 +1835,7 @@ sub wwv my ($filter, $hops); if ($self->{wwvfilter}) { - ($filter, $hops) = $self->{wwvfilter}->it(@_); + ($filter, $hops) = $self->{wwvfilter}->it(@_[7..$#_]); return unless $filter; } send_prot_line($self, $filter, $hops, $isolate, $line) @@ -2018,7 +2039,7 @@ sub send_local_config # don't appear outside of this node # send locally connected nodes - my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && ($_->is_node || $_->is_aranea) } DXChannel::get_all(); + my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes(); @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan; $self->send_route($main::mycall, \&pc19, scalar(@localnodes)+1, $main::routeroot, @localnodes); @@ -2138,7 +2159,7 @@ sub adjust_hops $s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops; } else { # simply decrement it -# $hops--; this is done on receipt now + $hops--; return "" if !$hops; $s =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops; } @@ -2325,9 +2346,6 @@ sub disconnect # broadcast to all other nodes that all the nodes connected to via me are gone unless ($pc39flag && $pc39flag == 2) { - my $thing = Thingy::Bye->new(user=>$call); - $thing->broadcast($self); - $self->route_pc21($main::mycall, undef, @rout) if @rout; }