X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=798f0a82f98748a836ae5ccd782fde79b810b30c;hb=c3c15883cf25add24fc49e32eb0d17dce6839a62;hp=f7c503acfa019af5335fb333bb62e12cc9ef4a54;hpb=87b2f58b1b0df6c0cb5c5f0070db554ec2d2a961;p=spider.git diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm index f7c503ac..798f0a82 100644 --- a/perl/Thingy/Rt.pm +++ b/perl/Thingy/Rt.pm @@ -18,21 +18,24 @@ use DXChannel; use DXDebug; use DXUtil; use Thingy; +use Thingy::RouteFilter; use Spot; use vars qw(@ISA); -@ISA = qw(Thingy); +@ISA = qw(Thingy Thingy::RouteFilter); sub gen_Aranea { my $thing = shift; unless ($thing->{Aranea}) { - my @items; - push @items, 's', $thing->{'s'} if $thing->{'s'}; - push @items, 'n', $thing->{n} if $thing->{n}; - push @items, 'v', $thing->{v} if $thing->{v}; - push @items, 'u', $thing->{u} if $thing->{u}; - $thing->{Aranea} = Aranea::genmsg($thing, 'RT', @items) if @items; + my $ref; + if ($ref = $thing->{anodes}) { + $thing->{n} = join(':', map {$_->{call}} @$ref); + } + if ($ref = $thing->{ausers}) { + $thing->{u} = join(':', map {$_->{call}} @$ref); + } + $thing->{Aranea} = Aranea::genmsg($thing, [qw(s n u)]); } return $thing->{Aranea}; } @@ -44,67 +47,13 @@ sub from_Aranea return $thing; } -sub gen_DXProt -{ - my $thing = shift; - my $dxchan = shift; - my $s = $thing->{'s'}; - if ($s eq 'au') { - my $n = $thing->{n} || $thing->{user}; - my @out; - if ($n && (my $u = $thing->{u})) { - my $s = ''; - for (split /:/, $u) { - my ($here, $call) = unpack "A1 A*", $_; - my $str = sprintf "^%s * %d", $call, $here; - if (length($s) + length($str) > $DXProt::sentencelth) { - push @out, "PC16^$n" . $s . sprintf "^%s^", DXProt::get_hops(16); - $s = ''; - } - $s .= $str; - } - push @out, "PC16^$n" . $s . sprintf "^%s^", DXProt::get_hops(16); - $thing->{DXProt} = @out > 1 ? \@out : $out[0]; - } - } elsif ($s eq 'du') { - my $n = $thing->{n} || $thing->{user}; - my $hops = DXProt::get_hops(17); - if ($n && (my $u = $thing->{u})) { - $thing->{DXProt} = "PC17^$u^$n^$hops^"; - } - } elsif ($s eq 'an') { - } elsif ($s eq 'dn') { - } - return $thing->{DXProt}; -} - -#sub gen_DXCommandmode -#{ -# my $thing = shift; -# my $dxchan = shift; -# my $buf; -# -# return $buf; -#} - -sub from_DXProt -{ - my $thing = shift; - while (@_) { - my $k = shift; - $thing->{$k} = shift; - } - ($thing->{hops}) = $thing->{DXProt} =~ /\^H(\d+)\^?~?$/ if exists $thing->{DXProt}; - return $thing; -} - sub handle { my $thing = shift; my $dxchan = shift; - if ($thing->{t}) { - my $sub = "handle_$thing->{t}"; + if ($thing->{'s'}) { + my $sub = "handle_$thing->{s}"; if ($thing->can($sub)) { no strict 'refs'; $thing = $thing->$sub($dxchan); @@ -114,97 +63,6 @@ sub handle } } -# these contain users and either a node (for externals) or the from address -sub handle_au -{ - my $thing = shift; - my $dxchan = shift; - - my $node = $thing->{n} || $thing->{user}; - my $nref = Route::Node::get($node); - - if ($nref) { - if (my $u = $thing->{u}) { - for (split /:/, $u) { - my ($here, $call) = unpack "A1 A*", $_; - add_user($nref, $call, $here); - my $h = $dxchan->{call} eq $nref->{call} ? 3 : ($thing->{hops} || 99); - RouteDB::update($call, $dxchan->{call}, $h); - } - } - } else { - dbg("Thingy::Rt::au: $node not found") if isdbg('chanerr'); - return; - } - return $thing; -} - -sub handle_du -{ - my $thing = shift; - my $dxchan = shift; - - my $node = $thing->{n} || $thing->{user}; - my $nref = Route::Node::get($node); - - if ($nref) { - if (my $u = $thing->{u}) { - for (split /:/, $u) { - my ($here, $call) = unpack "A1 A*", $_; - my $uref = Route::User::get($call); - unless ($uref) { - dbg("Thingy::Rt::du $call not a user") if isdbg('chanerr'); - next; - } - $nref->del_user($uref); - RouteDB::delete($call, $dxchan->{call}); - } - RouteDB::update($nref->{call}, $dxchan->{call}, $dxchan->{call} eq $nref->{call} ? 2 : ($thing->{hops} || 99)); - } - } else { - dbg("Thingy::Rt::du: $node not found") if isdbg('chanerr'); - return; - } - - return $thing; -} - -sub in_filter -{ - my $thing = shift; - my $dxchan = shift; - - # global route filtering on INPUT - if ($dxchan->{inroutefilter}) { - my $r = Route::Node::get($thing->{origin}); - my ($filter, $hops) = $dxchan->{inroutefilter}->it($dxchan->{call}, $dxchan->{dxcc}, $dxchan->{itu}, $dxchan->{cq}, $r->{call}, $r->{dxcc}, $r->{itu}, $r->{cq}, $dxchan->{state}, $r->{state}); - unless ($filter) { - dbg("PCPROT: Rejected by input route filter") if isdbg('chanerr'); - return; - } - } - return 1; -} - -sub out_filter -{ - my $thing = shift; - my $dxchan = shift; - - # global route filtering on OUTPUT - if ($dxchan->{routefilter}) { - my $r = Route::Node::get($thing->{origin}); - my ($filter, $hops) = $dxchan->{routefilter}->it($dxchan->{call}, $dxchan->{dxcc}, $dxchan->{itu}, $dxchan->{cq}, $r->{call}, $r->{dxcc}, $r->{itu}, $r->{cq}, $dxchan->{state}, $r->{state}); - unless ($filter) { - dbg("PCPROT: Rejected by output route filter") if isdbg('chanerr'); - return; - } - $thing->{hops} = $hops if $hops; - } elsif ($dxchan->{isolate}) { - return; - } - return 1; -} sub add_user { @@ -228,7 +86,43 @@ sub upd_user_rec $user = DXUser->new($call) if !$user; $user->homenode($parentcall) if !$user->homenode; $user->node($parentcall); - $user->lastin($main::systime) unless DXChannel->get($call); + $user->lastin($main::systime) unless DXChannel::get($call); return $user; } + +# +# Generate a configuration for onward broadcast +# +# Basically, this creates a thingy with list of nodes and users that +# are on this node. This the normal method of spreading this +# info whenever a node connects and also periodically. +# + +sub new_lcf +{ + my $pkg = shift; + my $thing = $pkg->SUPER::new(@_); + + $thing->{'s'} = 'lcf'; + + my @nodes; + my @users; + + foreach my $dxchan (DXChannel::get_all()) { + if ($dxchan->is_node || $dxchan->is_aranea) { + my $ref = Route::Node::get($dxchan->{call}); + push @nodes, $ref if $ref; + } else { + my $ref = Route::User::get($dxchan->{call}); + push @users, $ref if $ref; + } + } + $thing->{anodes} = \@nodes if @nodes; + $thing->{ausers} = \@users if @users; + return $thing; +} + + + + 1;