From fe7780b7eb15406a7e5caac4ecc499c8f3304e18 Mon Sep 17 00:00:00 2001 From: wr3d Date: Sat, 12 Mar 2005 23:33:31 +0000 Subject: [PATCH] fix DXChannel::get Fix pinging (a bit) --- cmd/connect.pl | 2 +- cmd/dbshow.pl | 2 +- cmd/delete/user.pl | 2 +- cmd/demonstrate.pl | 2 +- cmd/disconnect.pl | 4 ++-- cmd/forward/latlong.pl | 2 +- cmd/init.pl | 2 +- cmd/pc.pl | 2 +- cmd/rinit.pl | 2 +- cmd/set/announce.pl | 2 +- cmd/set/anntalk.pl | 2 +- cmd/set/arcluster.pl | 2 +- cmd/set/bbs.pl | 2 +- cmd/set/clx.pl | 2 +- cmd/set/dx.pl | 2 +- cmd/set/dxnet.pl | 2 +- cmd/set/here.pl | 2 +- cmd/set/isolate.pl | 2 +- cmd/set/node.pl | 2 +- cmd/set/obscount.pl | 2 +- cmd/set/pinginterval.pl | 2 +- cmd/set/privilege.pl | 2 +- cmd/set/register.pl | 2 +- cmd/set/spider.pl | 2 +- cmd/set/talk.pl | 2 +- cmd/set/wcy.pl | 2 +- cmd/set/wwv.pl | 2 +- cmd/set/wx.pl | 2 +- cmd/spoof.pl | 2 +- cmd/stat/channel.pl | 2 +- cmd/unset/announce.pl | 2 +- cmd/unset/anntalk.pl | 2 +- cmd/unset/dx.pl | 2 +- cmd/unset/here.pl | 2 +- cmd/unset/isolate.pl | 2 +- cmd/unset/node.pl | 2 +- cmd/unset/register.pl | 2 +- cmd/unset/talk.pl | 2 +- cmd/unset/wcy.pl | 2 +- cmd/unset/wwv.pl | 2 +- cmd/unset/wx.pl | 2 +- 41 files changed, 42 insertions(+), 42 deletions(-) diff --git a/cmd/connect.pl b/cmd/connect.pl index d1c583cb..24002985 100644 --- a/cmd/connect.pl +++ b/cmd/connect.pl @@ -7,7 +7,7 @@ my $lccall = lc $call; return (1, $self->msg('e5')) if $self->priv < 5; return (1, $self->msg('e6')) unless $call gt ' '; -return (1, $self->msg('already', $call)) if DXChannel->get($call); +return (1, $self->msg('already', $call)) if DXChannel::get($call); return (1, $self->msg('outconn', $call)) if grep {$_->{call} eq $call} @main::outstanding_connects; return (1, $self->msg('conscript', $lccall)) unless -e "$main::root/connect/$lccall"; diff --git a/cmd/dbshow.pl b/cmd/dbshow.pl index 309ce8a5..6290dd3a 100644 --- a/cmd/dbshow.pl +++ b/cmd/dbshow.pl @@ -24,7 +24,7 @@ foreach $n (@db) { if ($db->remote) { # remote databases - unless (Route::Node::get($db->remote) || DXChannel->get($db->remote)) { + unless (Route::Node::get($db->remote) || DXChannel::get($db->remote)) { push @out, $self->msg('db4', uc $name, $db->remote); last; } diff --git a/cmd/delete/user.pl b/cmd/delete/user.pl index ac5a8034..5ab03a4f 100644 --- a/cmd/delete/user.pl +++ b/cmd/delete/user.pl @@ -18,7 +18,7 @@ return (1, $self->msg('e5')) if $self->priv < 9; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/demonstrate.pl b/cmd/demonstrate.pl index 7ef0277e..1d2231e8 100644 --- a/cmd/demonstrate.pl +++ b/cmd/demonstrate.pl @@ -11,7 +11,7 @@ my ($self, $line) = @_; my ($call, $newline) = split /\s+/, $line, 2; $call = uc $call; -my $dxchan = DXChannel->get($call); +my $dxchan = DXChannel::get($call); my $mycall = $self->call; return (1, $self->msg('e7', $call)) unless $dxchan; diff --git a/cmd/disconnect.pl b/cmd/disconnect.pl index a023c609..60078704 100644 --- a/cmd/disconnect.pl +++ b/cmd/disconnect.pl @@ -13,7 +13,7 @@ if ($self->priv < 5) { foreach $call (@calls) { $call = uc $call; next if $call eq $main::mycall; - my $dxchan = DXChannel->get($call); + my $dxchan = DXChannel::get($call); if ($dxchan) { if ($dxchan->is_node) { # $dxchan->send_pc39($self->msg('disc1', $self->call)); @@ -28,7 +28,7 @@ foreach $call (@calls) { push @out, $self->msg('disc3', $call); # } elsif (my $ref = DXCluster->get_exact($call)) { # my $dxchancall = $ref->dxchancall; -# if ($dxchancall eq $main::mycall || !DXChannel->get($dxchancall)) { +# if ($dxchancall eq $main::mycall || !DXChannel::get($dxchancall)) { # $ref->del; # push @out, $self->msg('disc4', $call); # } diff --git a/cmd/forward/latlong.pl b/cmd/forward/latlong.pl index 7f6472bd..e1023989 100644 --- a/cmd/forward/latlong.pl +++ b/cmd/forward/latlong.pl @@ -16,7 +16,7 @@ my @out; my $dxchan; for ( map {uc $_ } split /\s+/, $line ) { - if (($dxchan = DXChannel->get($_)) && $dxchan->is_node) { + if (($dxchan = DXChannel::get($_)) && $dxchan->is_node) { push @dxchan, $dxchan; } else { push @out, $self->msg('e10', $_); diff --git a/cmd/init.pl b/cmd/init.pl index ab49b6ee..b508a04a 100644 --- a/cmd/init.pl +++ b/cmd/init.pl @@ -15,7 +15,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@calls) { $call = uc $call; next if $call eq $main::mycall; - my $dxchan = DXChannel->get($call); + my $dxchan = DXChannel::get($call); if ($dxchan) { if ($dxchan->is_node) { # first clear out any nodes on this dxchannel diff --git a/cmd/pc.pl b/cmd/pc.pl index dcc2f668..12ab8fdc 100644 --- a/cmd/pc.pl +++ b/cmd/pc.pl @@ -12,7 +12,7 @@ my @f = split /\s+/, $line; return (1, $self->msg('e5')) if $self->priv < 8 || $self->remotecmd || $self->inscript; my $call = uc shift @f; -my $dxchan = DXChannel->get($call); +my $dxchan = DXChannel::get($call); return (1, $self->msg('e10', $call)) if !$dxchan; return (1, $self->msg('e8')) if @f <= 0; diff --git a/cmd/rinit.pl b/cmd/rinit.pl index 953a30a9..3a7e17c0 100644 --- a/cmd/rinit.pl +++ b/cmd/rinit.pl @@ -15,7 +15,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@calls) { $call = uc $call; next if $call eq $main::mycall; - my $dxchan = DXChannel->get($call); + my $dxchan = DXChannel::get($call); if ($dxchan) { if ($dxchan->is_node) { my $parent = Route::Node::get($call); diff --git a/cmd/set/announce.pl b/cmd/set/announce.pl index 323ff5e0..533d177a 100644 --- a/cmd/set/announce.pl +++ b/cmd/set/announce.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->ann(1); $chan->user->wantann(1); diff --git a/cmd/set/anntalk.pl b/cmd/set/anntalk.pl index eec65400..2d70f846 100644 --- a/cmd/set/anntalk.pl +++ b/cmd/set/anntalk.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->ann_talk(1); $chan->user->wantann_talk(1); diff --git a/cmd/set/arcluster.pl b/cmd/set/arcluster.pl index 4e1dd452..6ad80c6c 100644 --- a/cmd/set/arcluster.pl +++ b/cmd/set/arcluster.pl @@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/set/bbs.pl b/cmd/set/bbs.pl index 0cb6cf39..f92f85de 100644 --- a/cmd/set/bbs.pl +++ b/cmd/set/bbs.pl @@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/set/clx.pl b/cmd/set/clx.pl index f453e41f..dd0ee2fd 100644 --- a/cmd/set/clx.pl +++ b/cmd/set/clx.pl @@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/set/dx.pl b/cmd/set/dx.pl index 8d599d5e..3eb9bbf0 100644 --- a/cmd/set/dx.pl +++ b/cmd/set/dx.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->dx(1); $chan->user->wantdx(1); diff --git a/cmd/set/dxnet.pl b/cmd/set/dxnet.pl index f8e3686f..e8714c53 100644 --- a/cmd/set/dxnet.pl +++ b/cmd/set/dxnet.pl @@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/set/here.pl b/cmd/set/here.pl index 1c4b167c..646997ea 100644 --- a/cmd/set/here.pl +++ b/cmd/set/here.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $dxchan = DXChannel->get($call); + my $dxchan = DXChannel::get($call); if ($dxchan) { $dxchan->here(1); push @out, $self->msg('heres', $call); diff --git a/cmd/set/isolate.pl b/cmd/set/isolate.pl index 89d8257b..b90f0c2b 100644 --- a/cmd/set/isolate.pl +++ b/cmd/set/isolate.pl @@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 9; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/set/node.pl b/cmd/set/node.pl index 4eeae7f1..95b38bb6 100644 --- a/cmd/set/node.pl +++ b/cmd/set/node.pl @@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/set/obscount.pl b/cmd/set/obscount.pl index e37387fe..8a6dc425 100644 --- a/cmd/set/obscount.pl +++ b/cmd/set/obscount.pl @@ -20,7 +20,7 @@ return (1, $self->msg('e12')) unless @args; foreach $call (@args) { $call = uc $call; - my $dxchan = DXChannel->get($call); + my $dxchan = DXChannel::get($call); $user = $dxchan->user if $dxchan; $user = DXUser->get_current($call); if ($user) { diff --git a/cmd/set/pinginterval.pl b/cmd/set/pinginterval.pl index 6511c5b6..1e1da569 100644 --- a/cmd/set/pinginterval.pl +++ b/cmd/set/pinginterval.pl @@ -32,7 +32,7 @@ if ($val =~ /^(\d+)[sS]$/) { foreach $call (@args) { $call = uc $call; - my $dxchan = DXChannel->get($call); + my $dxchan = DXChannel::get($call); $user = $dxchan->user if $dxchan; $user = DXUser->get($call) unless $user; if ($user) { diff --git a/cmd/set/privilege.pl b/cmd/set/privilege.pl index 6d5fd4d2..7f6cbd39 100644 --- a/cmd/set/privilege.pl +++ b/cmd/set/privilege.pl @@ -27,7 +27,7 @@ if ($priv < 0 || $priv > 9) { foreach $call (@args) { $call = uc $call; unless ($self->remotecmd || $self->inscript) { - if ($ref = DXChannel->get($call)) { + if ($ref = DXChannel::get($call)) { $ref->priv($priv); $ref->user->priv($priv); $ref->user->put(); diff --git a/cmd/set/register.pl b/cmd/set/register.pl index 3a7c7db5..509eaff6 100644 --- a/cmd/set/register.pl +++ b/cmd/set/register.pl @@ -32,7 +32,7 @@ foreach $call (@args) { $ref->put(); push @out, $self->msg("regc", $call); } - my $dxchan = DXChannel->get($call); + my $dxchan = DXChannel::get($call); $dxchan->registered(1) if $dxchan; Log('DXCommand', $self->call . " registered $call"); } else { diff --git a/cmd/set/spider.pl b/cmd/set/spider.pl index 7bd3e6a6..9c821826 100644 --- a/cmd/set/spider.pl +++ b/cmd/set/spider.pl @@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/set/talk.pl b/cmd/set/talk.pl index 70bde6e7..0c1e6be7 100644 --- a/cmd/set/talk.pl +++ b/cmd/set/talk.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->talk(1); $chan->user->wanttalk(1); diff --git a/cmd/set/wcy.pl b/cmd/set/wcy.pl index 1aed404c..8efd6299 100644 --- a/cmd/set/wcy.pl +++ b/cmd/set/wcy.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { DXChannel::wcy($chan, 1); $chan->user->wantwcy(1); diff --git a/cmd/set/wwv.pl b/cmd/set/wwv.pl index da06ebc1..33ac7861 100644 --- a/cmd/set/wwv.pl +++ b/cmd/set/wwv.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { DXChannel::wwv($chan, 1); $chan->user->wantwwv(1); diff --git a/cmd/set/wx.pl b/cmd/set/wx.pl index f609df35..ef6a71cc 100644 --- a/cmd/set/wx.pl +++ b/cmd/set/wx.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->wx(1); $chan->user->wantwx(1); diff --git a/cmd/spoof.pl b/cmd/spoof.pl index 5336a324..ad2f9b8c 100644 --- a/cmd/spoof.pl +++ b/cmd/spoof.pl @@ -13,7 +13,7 @@ my $myuser = $self->user; my $mylang = $self->lang; my ($call, $newline) = split /\s+/, $line, 2; -return (1, $self->msg('nodee1', $call)) if DXChannel->get($call); +return (1, $self->msg('nodee1', $call)) if DXChannel::get($call); if ($self->remotecmd || $self->inscript) { Log('DXCommand', "$mycall is trying to spoof $call remotely"); diff --git a/cmd/stat/channel.pl b/cmd/stat/channel.pl index d963eb45..be4e5f93 100644 --- a/cmd/stat/channel.pl +++ b/cmd/stat/channel.pl @@ -13,7 +13,7 @@ my $call; my @out; foreach $call (@list) { $call = uc $call; - my $ref = DXChannel->get($call); + my $ref = DXChannel::get($call); if ($ref) { @out = print_all_fields($self, $ref, "Channel Information $call"); } else { diff --git a/cmd/unset/announce.pl b/cmd/unset/announce.pl index 2c4ebd30..3e7b61dc 100644 --- a/cmd/unset/announce.pl +++ b/cmd/unset/announce.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->ann(0); $chan->user->wantann(0); diff --git a/cmd/unset/anntalk.pl b/cmd/unset/anntalk.pl index 7e8f012f..9b7cc238 100644 --- a/cmd/unset/anntalk.pl +++ b/cmd/unset/anntalk.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->ann_talk(0); $chan->user->wantann_talk(0); diff --git a/cmd/unset/dx.pl b/cmd/unset/dx.pl index dcc177a9..2090b780 100644 --- a/cmd/unset/dx.pl +++ b/cmd/unset/dx.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->dx(0); $chan->user->wantdx(0); diff --git a/cmd/unset/here.pl b/cmd/unset/here.pl index 19db8dbd..d83d59cb 100644 --- a/cmd/unset/here.pl +++ b/cmd/unset/here.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $dxchan = DXChannel->get($call); + my $dxchan = DXChannel::get($call); if ($dxchan) { $dxchan->here(0); push @out, $self->msg('hereu', $call); diff --git a/cmd/unset/isolate.pl b/cmd/unset/isolate.pl index ecf03317..6396caef 100644 --- a/cmd/unset/isolate.pl +++ b/cmd/unset/isolate.pl @@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/unset/node.pl b/cmd/unset/node.pl index 671f1b2d..76350a3f 100644 --- a/cmd/unset/node.pl +++ b/cmd/unset/node.pl @@ -19,7 +19,7 @@ return (1, $self->msg('e5')) if $self->priv < 5; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { push @out, $self->msg('nodee1', $call); } else { diff --git a/cmd/unset/register.pl b/cmd/unset/register.pl index 555fe021..f789d1ed 100644 --- a/cmd/unset/register.pl +++ b/cmd/unset/register.pl @@ -25,7 +25,7 @@ foreach $call (@args) { if ($ref = DXUser->get_current($call)) { $ref->registered(0); $ref->put(); - my $dxchan = DXChannel->get($call); + my $dxchan = DXChannel::get($call); $dxchan->registered(0) if $dxchan; push @out, $self->msg("regun", $call); Log('DXCommand', $self->call . " unregistered $call"); diff --git a/cmd/unset/talk.pl b/cmd/unset/talk.pl index 77deccbc..c693cca5 100644 --- a/cmd/unset/talk.pl +++ b/cmd/unset/talk.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->talk(0); $chan->user->wanttalk(0); diff --git a/cmd/unset/wcy.pl b/cmd/unset/wcy.pl index 42b098a3..8d1cdbeb 100644 --- a/cmd/unset/wcy.pl +++ b/cmd/unset/wcy.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { DXChannel::wcy($chan, 0); $chan->user->wantwcy(0); diff --git a/cmd/unset/wwv.pl b/cmd/unset/wwv.pl index eebf16d7..57b04119 100644 --- a/cmd/unset/wwv.pl +++ b/cmd/unset/wwv.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { DXChannel::wwv($chan, 0); $chan->user->wantwwv(0); diff --git a/cmd/unset/wx.pl b/cmd/unset/wx.pl index 755ed026..21ed1a1c 100644 --- a/cmd/unset/wx.pl +++ b/cmd/unset/wx.pl @@ -15,7 +15,7 @@ my @out; foreach $call (@args) { $call = uc $call; - my $chan = DXChannel->get($call); + my $chan = DXChannel::get($call); if ($chan) { $chan->wx(0); $chan->user->wantwx(0); -- 2.34.1