projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix build numbering
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 2bf621e1a1883d61776c0b689bb2c3b5961e917b..35f91fefb301a56d9334dc59b0f2cd4024550757 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-441,8
+441,8
@@
sub handle_10
# RouteDB::update($to, $_[6]);
# it is here and logged on
# RouteDB::update($to, $_[6]);
# it is here and logged on
- $dxchan = DXChannel
->
get($main::myalias) if $to eq $main::mycall;
- $dxchan = DXChannel
->
get($to) unless $dxchan;
+ $dxchan = DXChannel
::
get($main::myalias) if $to eq $main::mycall;
+ $dxchan = DXChannel
::
get($to) unless $dxchan;
if ($dxchan && $dxchan->is_user) {
$_[3] =~ s/\%5E/^/g;
$dxchan->talk($from, $to, $via, $_[3]);
if ($dxchan && $dxchan->is_user) {
$_[3] =~ s/\%5E/^/g;
$dxchan->talk($from, $to, $via, $_[3]);
@@
-640,7
+640,7
@@
sub handle_12
my $dxchan;
my $dxchan;
- if ((($dxchan = DXChannel
->
get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
+ if ((($dxchan = DXChannel
::
get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
$self->send_chat($line, @_[1..6]);
} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
$self->send_chat($line, @_[1..6]);
} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
@@
-756,7
+756,7
@@
sub handle_16
}
}
$user->wantroutepc19(1) unless defined $wantpc19; # for now we work on the basis that pc16 = real route
}
}
$user->wantroutepc19(1) unless defined $wantpc19; # for now we work on the basis that pc16 = real route
- $user->lastin($main::systime) unless DXChannel
->
get($ncall);
+ $user->lastin($main::systime) unless DXChannel
::
get($ncall);
$user->put;
# route the pc19 - this will cause 'stuttering PC19s' for a while
$user->put;
# route the pc19 - this will cause 'stuttering PC19s' for a while
@@
-827,7
+827,7
@@
sub handle_16
$user = DXUser->new($call) if !$user;
$user->homenode($parent->call) if !$user->homenode;
$user->node($parent->call);
$user = DXUser->new($call) if !$user;
$user->homenode($parent->call) if !$user->homenode;
$user->node($parent->call);
- $user->lastin($main::systime) unless DXChannel
->
get($call);
+ $user->lastin($main::systime) unless DXChannel
::
get($call);
$user->put;
}
$self->route_pc16($origin, $line, $parent, @rout) if @rout;
$user->put;
}
$self->route_pc16($origin, $line, $parent, @rout) if @rout;
@@
-993,7
+993,7
@@
sub handle_19
next if $call eq $main::mycall;
# check that this PC19 isn't trying to alter the wrong dxchan
next if $call eq $main::mycall;
# check that this PC19 isn't trying to alter the wrong dxchan
- my $dxchan = DXChannel
->
get($call);
+ 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');
next;
if ($dxchan && $dxchan != $self) {
dbg("PCPROT: PC19 from $origin trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
next;
@@
-1075,7
+1075,7
@@
sub handle_19
my $mref = DXMsg::get_busy($call);
$mref->stop_msg($call) if $mref;
my $mref = DXMsg::get_busy($call);
$mref->stop_msg($call) if $mref;
- $user->lastin($main::systime) unless DXChannel
->
get($call);
+ $user->lastin($main::systime) unless DXChannel
::
get($call);
$user->put;
}
$user->put;
}
@@
-1144,7
+1144,7
@@
sub handle_21
my $node = Route::Node::get($call);
if ($node) {
my $node = Route::Node::get($call);
if ($node) {
- my $dxchan = DXChannel
->
get($call);
+ my $dxchan = DXChannel
::
get($call);
if ($dxchan && $dxchan != $self) {
dbg("PCPROT: PC21 from $origin trying to alter locally connected $call, ignored!") if isdbg('chanerr');
return;
if ($dxchan && $dxchan != $self) {
dbg("PCPROT: PC21 from $origin trying to alter locally connected $call, ignored!") if isdbg('chanerr');
return;
@@
-1526,10
+1526,10
@@
sub handle_51
# it's a reply, look in the ping list for this one
my $ref = $pings{$from};
if ($ref) {
# it's a reply, look in the ping list for this one
my $ref = $pings{$from};
if ($ref) {
- my $tochan = DXChannel
->
get($from);
+ my $tochan = DXChannel
::
get($from);
while (@$ref) {
my $r = shift @$ref;
while (@$ref) {
my $r = shift @$ref;
- my $dxchan = DXChannel
->
get($r->{call});
+ my $dxchan = DXChannel
::
get($r->{call});
next unless $dxchan;
my $t = tv_interval($r->{t}, [ gettimeofday ]);
if ($dxchan->is_user) {
next unless $dxchan;
my $t = tv_interval($r->{t}, [ gettimeofday ]);
if ($dxchan->is_user) {
@@
-1677,7
+1677,7
@@
sub handle_default
sub process
{
my $t = time;
sub process
{
my $t = time;
- my @dxchan = DXChannel
->
get_all();
+ my @dxchan = DXChannel
::
get_all();
my $dxchan;
my $pc50s;
my $dxchan;
my $pc50s;
@@
-1759,7
+1759,7
@@
sub send_wwv_spot
{
my $self = shift;
my $line = shift;
{
my $self = shift;
my $line = shift;
- my @dxchan = DXChannel
->
get_all();
+ my @dxchan = DXChannel
::
get_all();
my $dxchan;
my @dxcc = ((Prefix::cty_data($_[6]))[0..2], (Prefix::cty_data($_[7]))[0..2]);
my $dxchan;
my @dxcc = ((Prefix::cty_data($_[6]))[0..2], (Prefix::cty_data($_[7]))[0..2]);
@@
-1793,7
+1793,7
@@
sub send_wcy_spot
{
my $self = shift;
my $line = shift;
{
my $self = shift;
my $line = shift;
- my @dxchan = DXChannel
->
get_all();
+ my @dxchan = DXChannel
::
get_all();
my $dxchan;
my @dxcc = ((Prefix::cty_data($_[10]))[0..2], (Prefix::cty_data($_[11]))[0..2]);
my $dxchan;
my @dxcc = ((Prefix::cty_data($_[10]))[0..2], (Prefix::cty_data($_[11]))[0..2]);
@@
-1826,7
+1826,7
@@
sub send_announce
{
my $self = shift;
my $line = shift;
{
my $self = shift;
my $line = shift;
- my @dxchan = DXChannel
->
get_all();
+ my @dxchan = DXChannel
::
get_all();
my $dxchan;
my $target;
my $to = 'To ';
my $dxchan;
my $target;
my $to = 'To ';
@@
-1891,7
+1891,7
@@
sub send_chat
{
my $self = shift;
my $line = shift;
{
my $self = shift;
my $line = shift;
- my @dxchan = DXChannel
->
get_all();
+ my @dxchan = DXChannel
::
get_all();
my $dxchan;
my $target = $_[3];
my $text = unpad($_[2]);
my $dxchan;
my $target = $_[3];
my $text = unpad($_[2]);
@@
-1987,7
+1987,7
@@
sub send_local_config
# don't appear outside of this node
# send locally connected nodes
# don't appear outside of this node
# send locally connected nodes
- my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate}
} DXChannel::get_all_nodes
();
+ my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate}
&& ($_->is_node || $_->is_aranea) } DXChannel::get_all
();
@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);
@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);
@@
-2032,7
+2032,7
@@
sub route
}
# always send it down the local interface if available
}
# always send it down the local interface if available
- my $dxchan = DXChannel
->
get($call);
+ my $dxchan = DXChannel
::
get($call);
if ($dxchan) {
dbg("route: $call -> $dxchan->{call} direct" ) if isdbg('route');
} else {
if ($dxchan) {
dbg("route: $call -> $dxchan->{call} direct" ) if isdbg('route');
} else {
@@
-2055,7
+2055,7
@@
sub route
dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
return;
}
dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
return;
}
- $dxchan = DXChannel
->
get($rcall);
+ $dxchan = DXChannel
::
get($rcall);
dbg("route: $call -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
}
}
dbg("route: $call -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
}
}
@@
-2136,7
+2136,7
@@
sub addping
my $r = {};
$r->{call} = $from;
$r->{t} = [ gettimeofday ];
my $r = {};
$r->{call} = $from;
$r->{t} = [ gettimeofday ];
- if ($via && (my $dxchan = DXChannel
->
get($via))) {
+ if ($via && (my $dxchan = DXChannel
::
get($via))) {
$dxchan->send(pc51($to, $main::mycall, 1));
} else {
route(undef, $to, pc51($to, $main::mycall, 1));
$dxchan->send(pc51($to, $main::mycall, 1));
} else {
route(undef, $to, pc51($to, $main::mycall, 1));
@@
-2188,13
+2188,13
@@
sub process_rcmd_reply
if ($tonode eq $main::mycall) {
my $s = $rcmds{$fromnode};
if ($s) {
if ($tonode eq $main::mycall) {
my $s = $rcmds{$fromnode};
if ($s) {
- my $dxchan = DXChannel
->
get($s->{call});
- my $ref = $user eq $tonode ? $dxchan : (DXChannel
->
get($user) || $dxchan);
+ my $dxchan = DXChannel
::
get($s->{call});
+ my $ref = $user eq $tonode ? $dxchan : (DXChannel
::
get($user) || $dxchan);
$ref->send($line) if $ref;
delete $rcmds{$fromnode} if !$dxchan;
} else {
# send unsolicited ones to the sysop
$ref->send($line) if $ref;
delete $rcmds{$fromnode} if !$dxchan;
} else {
# send unsolicited ones to the sysop
- my $dxchan = DXChannel
->
get($main::myalias);
+ my $dxchan = DXChannel
::
get($main::myalias);
$dxchan->send($line) if $dxchan;
}
} else {
$dxchan->send($line) if $dxchan;
}
} else {