# print join(',', @field), "\n";
- # ignore any lines that don't start with PC
- return if !$field[0] =~ /^PC/;
- # process PC frames
+ # process PC frames, this will fail unless the frame starts PCnn
my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
return unless $pcno;
return if $pcno < 10 || $pcno > 99;
} else {
$call = $to = $field[2];
}
- $dxchan = DXChannel->get($call);
+ $dxchan = DXChannel->get($main::myalias) if $call eq $main::mycall;
+ $dxchan = DXChannel->get($call) unless $dxchan;
if ($dxchan && $dxchan->is_user) {
$field[3] =~ s/\%5E/^/g;
$dxchan->talk($field[1], $to, $via, $field[3]);
my $node;
my $to = $user->homenode;
my $last = $user->lastoper || 0;
- if ($send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = Route::Node::get($to)) ) {
+ if ($to ne $main::mycall && $send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = Route::Node::get($to)) ) {
my $cmd = "forward/opernam $spot[4]";
# send the rcmd but we aren't interested in the replies...
my $dxchan = $node->dxchan;
for ($i = 2; $i < $#field; $i++) {
my ($call, $conf, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
next unless $call && $conf && defined $here && is_callsign($call);
+ next if $call eq $main::mycall;
+
$conf = $conf eq '*';
my $r = Route::User::get($call);
my $flags = Route::here($here)|Route::conf($conf);
- if ($r && $r->flags != $flags) {
- $r->flags($flags);
- push @rout, $r;
- } elsif (!$r) {
+ if ($r) {
+ if ($r->flags != $flags) {
+ $r->flags($flags);
+ push @rout, $r;
+ }
+ $r->addparent($ncall);
+ } else {
push @rout, $parent->add_user($call, $flags);
}
# new routing list
my @rout;
my $parent = Route::Node::get($self->{call});
+ unless ($parent) {
+ dbg("DXPROT: my parent $self->{call} has disappeared");
+ $self->disconnect;
+ return;
+ }
# parse the PC19
for ($i = 1; $i < $#field-1; $i += 4) {
$ver = 5000 if $ver eq '0000';
next if $ver < 5000; # only works with version 5 software
next if length $call < 3; # min 3 letter callsigns
+ next if $call eq $main::mycall;
# update it if required
my $r = Route::Node::get($call);
if ($r) {
my $ar;
if ($call ne $parent->call) {
- $ar = $parent->add($r);
- push @rout, $ar if $ar;
+ if ($self->in_filter_route($r)) {
+ $ar = $parent->add($call, $ver, $flags);
+ push @rout, $ar if $ar;
+ } else {
+ next;
+ }
}
if ($r->version ne $ver || $r->flags != $flags) {
$r->version($ver);
- $r->flags(Route::here($here)|Route::conf($conf));
+ $r->flags($flags);
push @rout, $r unless $ar;
}
} else {
- next if $call eq $main::mycall || $call eq $self->{call};
+ if ($call eq $self->{call}) {
+ dbg("DXPROT: my channel route for $call has disappeared");
+ next;
+ };
- my $new = $parent->new($call, $ver, Route::here($here)|Route::conf($conf));
+ my $new = Route->new($call); # throw away
if ($self->in_filter_route($new)) {
- $parent->add($new);
- push @rout, $new;
+ my $r = $parent->add($call, $ver, $flags);
+ push @rout, $r;
} else {
- $new->del($parent);
+ next;
}
}
my @rout;
my $parent = Route::Node::get($self->{call});
unless ($parent) {
- dbg("PCPROT: Route::Node $call not in config") if isdbg('chanerr');
+ dbg("DXPROT: my parent $self->{call} has disappeared");
+ $self->disconnect;
return;
}
my $node = Route::Node::get($call);
if ($pcno == 24) { # set here status
my $call = uc $field[1];
- my $ref = Route::Node::get($call);
- $ref->here($field[2]) if $ref;
- $ref = Route::User::get($call);
- $ref->here($field[2]) if $ref;
+ my ($nref, $uref);
+ $nref = Route::Node::get($call);
+ $uref = Route::User::get($call);
+ return unless $nref || $uref; # if we don't know where they are, it's pointless sending it on
- # input filter if required
- return unless $self->in_filter_route($ref);
-
- $self->route_pc24($ref, $field[3]) if $ref && !eph_dup($line);
+ unless (eph_dup($line)) {
+ $nref->here($field[2]) if $nref;
+ $uref->here($field[2]) if $uref;
+ my $ref = $nref || $uref;
+ return unless $self->in_filter_route($ref);
+ $self->route_pc24($ref, $field[3]);
+ }
return;
}
}
$user->lastoper($main::systime); # to cut down on excessive for/opers being generated
$user->put;
- my $ref = Route::get($call);
+ my $ref = Route::get($call) || Route->new($call);
# input filter if required
return unless $self->in_filter_route($ref);
# taking into account filtering and so on
foreach $dxchan (@dxchan) {
next if $dxchan == $me;
- my $routeit;
- my ($filter, $hops);
+ next if $dxchan == $self;
+ $dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
+ }
+}
- if ($dxchan->{spotsfilter}) {
- ($filter, $hops) = $dxchan->{spotsfilter}->it(@_, $self->{call} );
- next unless $filter;
- }
-
- if ($dxchan->is_node) {
- next if $dxchan == $self;
- if ($hops) {
- $routeit = $line;
- $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
- } else {
- $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
- next unless $routeit;
- }
- if ($filter) {
- $dxchan->send($routeit) if $routeit;
- } else {
- $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
- }
- } elsif ($dxchan->is_user && $dxchan->{dx}) {
- my $buf = Spot::formatb($dxchan->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
- $buf .= "\a\a" if $dxchan->{beep};
- $buf =~ s/\%5E/^/g;
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
- $dxchan->send($buf);
- } else {
- $dxchan->delay($buf);
- }
- }
+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) = @_;
+ my $routeit;
+
+ if ($hops) {
+ $routeit = $line;
+ $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+ } else {
+ $routeit = adjust_hops($self, $line); # adjust its hop count by node name
+ next unless $routeit;
+ }
+ if ($filter) {
+ $self->send($routeit) if $routeit;
+ } else {
+ $self->send($routeit) unless $self->{isolate} || $isolate;
+ }
+}
+
+
sub send_wwv_spot
{
my $self = shift;
my $routeit;
my ($filter, $hops);
- if ($dxchan->{wwvfilter}) {
- ($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call}, $wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq);
- next unless $filter;
- }
- if ($dxchan->is_node) {
- if ($hops) {
- $routeit = $line;
- $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
- } else {
- $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
- next unless $routeit;
- }
- if ($filter) {
- $dxchan->send($routeit) if $routeit;
- } else {
- $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
-
- }
- } elsif ($dxchan->is_user && $dxchan->{wwv}) {
- my $buf = "WWV de $_[6] <$_[1]>: SFI=$_[2], A=$_[3], K=$_[4], $_[5]";
- $buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
- $dxchan->send($buf);
- } else {
- $dxchan->delay($buf);
- }
- }
+ $dxchan->wwv($line, $self->{isolate}, @_, $self->{call}, $wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq);
}
+
+}
+
+sub wwv
+{
+ my $self = shift;
+ my $line = shift;
+ my $isolate = shift;
+ my ($filter, $hops);
+
+ if ($self->{wwvfilter}) {
+ ($filter, $hops) = $self->{wwvfilter}->it(@_);
+ return unless $filter;
+ }
+ send_prot_line($self, $filter, $hops, $isolate, $line)
}
sub send_wcy_spot
# taking into account filtering and so on
foreach $dxchan (@dxchan) {
next if $dxchan == $me;
- my $routeit;
- my ($filter, $hops);
+ next if $dxchan == $self;
- if ($dxchan->{wcyfilter}) {
- ($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
- next unless $filter;
- }
- if ($dxchan->is_clx || $dxchan->is_spider || $dxchan->is_dxnet) {
- if ($hops) {
- $routeit = $line;
- $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
- } else {
- $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
- next unless $routeit;
- }
- if ($filter) {
- $dxchan->send($routeit) if $routeit;
- } else {
- $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
- }
- } elsif ($dxchan->is_user && $dxchan->{wcy}) {
- my $buf = "WCY de $_[10] <$_[1]> : K=$_[4] expK=$_[5] A=$_[3] R=$_[6] SFI=$_[2] SA=$_[7] GMF=$_[8] Au=$_[9]";
- $buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
- $dxchan->send($buf);
- } else {
- $dxchan->delay($buf);
- }
- }
+ $dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
+ }
+}
+
+sub wcy
+{
+ my $self = shift;
+ my $line = shift;
+ my $isolate = shift;
+ my ($filter, $hops);
+
+ if ($self->{wcyfilter}) {
+ ($filter, $hops) = $self->{wcyfilter}->it(@_);
+ return unless $filter;
}
+ send_prot_line($self, $filter, $hops, $isolate, $line) if $self->is_clx || $self->is_spider || $self->is_dxnet;
}
# send an announce
my $line = shift;
my @dxchan = DXChannel->get_all();
my $dxchan;
- my $text = unpad($_[2]);
my $target;
my $to = 'To ';
+ my $text = unpad($_[2]);
if ($_[3] eq '*') { # sysops
$target = "SYSOP";
my $routeit;
my ($filter, $hops);
- if ($dxchan->{annfilter}) {
- ($filter, $hops) = $dxchan->{annfilter}->it(@_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
- next unless $filter;
- }
- if ($dxchan->is_node && $_[1] ne $main::mycall) { # i.e not specifically routed to me
- if ($hops) {
- $routeit = $line;
- $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
- } else {
- $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
- next unless $routeit;
- }
- if ($filter) {
- $dxchan->send($routeit) if $routeit;
- } else {
- $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
-
- }
- } elsif ($dxchan->is_user) {
- unless ($dxchan->{ann}) {
- next if $_[0] ne $main::myalias && $_[0] ne $main::mycall;
- }
- next if $target eq 'SYSOP' && $dxchan->{priv} < 5;
- my $buf = "$to$target de $_[0]: $text";
- $buf =~ s/\%5E/^/g;
- $buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
- $dxchan->send($buf);
- } else {
- $dxchan->delay($buf);
- }
- }
+ $dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq)
+ }
+}
+
+sub announce
+{
+ my $self = shift;
+ my $line = shift;
+ my $isolate = shift;
+ my $to = shift;
+ my $target = shift;
+ my ($filter, $hops);
+
+ if ($self->{annfilter}) {
+ ($filter, $hops) = $self->{annfilter}->it(@_);
+ return unless $filter;
}
+ send_prot_line($self, $filter, $hops, $isolate, $line) unless $_[1] eq $main::mycall;
}
+
sub send_local_config
{
my $self = shift;
# and are not themselves isolated, this to make sure that isolated nodes
# don't appear outside of this node
my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} } DXChannel::get_all_nodes();
- @localnodes = map { Route::Node::get($_->{call}) or die "connot find node $_->{call}" } @dxchan if @dxchan;
+ @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
my @intcalls = map { $_->nodes } @localnodes if @localnodes;
my $ref = Route::Node::get($self->{call});
my @rnodes = $ref->nodes;
# always send it down the local interface if available
my $dxchan = DXChannel->get($call);
unless ($dxchan) {
- my $cl = Route::Node::get($call);
+ my $cl = Route::get($call);
$dxchan = $cl->dxchan if $cl;
if (ref $dxchan) {
if (ref $self && $dxchan eq $self) {
if ($dxchan) {
my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
if ($routeit) {
- $dxchan->send($routeit);
+ $dxchan->send($routeit) unless $dxchan == $me;
}
} else {
dbg("PCPROT: No route available, dropped") if isdbg('chanerr');
$r->{t} = $main::systime;
$r->{cmd} = $cmd;
$rcmds{$to} = $r;
-
+
my $ref = Route::Node::get($to);
my $dxchan = $ref->dxchan;
- if ($dxchan && $dxchan->is_clx) {
+ if ($dxchan && $dxchan->is_clx) {
route(undef, $to, pc84($main::mycall, $to, $self->{call}, $cmd));
} else {
route(undef, $to, pc34($main::mycall, $to, $cmd));
foreach $dxchan (@dxchan) {
next if $dxchan == $self;
next if $dxchan == $me;
- if ($self->{routefilter} || !$self->{isolate}) {
+ if ($dxchan->{routefilter} || !$self->{isolate}) {
$dxchan->send_route($generate, @_)
} else {
dbg('DXPROT: isolated') if isdbg('chanerr');
projects / spider.git / blobdiff