From: Dirk Koopman Date: Sat, 22 Jan 2022 00:54:26 +0000 (+0000) Subject: remove console warning, dupe fields X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2b7e736fb36d7edc64930ce9a8acffb86257e3ed;p=spider.git remove console warning, dupe fields --- diff --git a/cmd/dx.pl b/cmd/dx.pl index a5d3b425..e8e56dc1 100644 --- a/cmd/dx.pl +++ b/cmd/dx.pl @@ -95,7 +95,7 @@ my $callnoid = basecall($self->{call}); if ($DXProt::baddx->in($spotted)) { $localonly++; } -if ($DXProt::badspotter->in($spotternoid)) { +if ($DXProt::badspotter->in($spotternoid) || $self->badip) { LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline) from $addr"); $localonly++; } diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index 2b23e0d4..dd13781f 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -45,7 +45,6 @@ $count = 0; ann => '0,Want Announce,yesno', ann_talk => '0,Suppress Talk Anns,yesno', annfilter => '5,Ann Filt-out', - annfilter => '5,Ann Filt-out', badcount => '1,Bad Word Count', badip => '9,BAD IP address', beep => '0,Want Beeps,yesno', @@ -57,10 +56,8 @@ $count = 0; consort => '5,Connection Type', cq => '0,CQ Zone', delayed => '5,Delayed messages,parray', - delayed => '5,Delayed messages,parray', disconnecting => '9,Disconnecting,yesno', do_pc9x => '9,Handles PC9x,yesno', - do_pc9x => '9,Handles PC9x,yesno', dx => '0,DX Spots,yesno', dxcc => '0,Country Code', edit => '7,Edit Function', @@ -74,28 +71,17 @@ $count = 0; inannfilter => '5,Ann Filt-inp', inpc92filter => '5,PC92 Route Filt-inp', inqueue => '9,Input Queue,parray', - inqueue => '9,Input Queue,parray', - inrbnfilter => '5,RBN Filt-inp', inrbnfilter => '5,RBN Filt-inp', inroutefilter => '5,Route Filt-inp', - inroutefilter => '5,Route Filt-inp', - inscript => '9,In a script,yesno', inscript => '9,In a script,yesno', inspotsfilter => '5,Spot Filt-inp', - inspotsfilter => '5,Spot Filt-inp', inwcyfilter => '5,WCY Filt-inp', - inwcyfilter => '5,WCY Filt-inp', - inwwvfilter => '5,WWV Filt-inp', inwwvfilter => '5,WWV Filt-inp', - isbasic => '9,Internal Connection', isolate => '5,Isolate network,yesno', - isolate => '5,Isolate network,yesno', - isslugged => '9,Still Slugged,yesno', isslugged => '9,Still Slugged,yesno', itu => '0,ITU Zone', lang => '0,Language', lastmsgpoll => '0,Last Msg Poll,atime', - lastmsgpoll => '0,Last Msg Poll,atime', lastping => '5,Ping last sent,atime', lastread => '5,Last Msg Read', list => '9,Dep Chan List', @@ -105,8 +91,6 @@ $count = 0; name => '0,User Name', newroute => '1,New Style Routing,yesno', next_pc92_keepalive => '9,Next PC92 KeepAlive,atime', - next_pc92_keepalive => '9,Next PC92 KeepAlive,atime', - next_pc92_update => '9,Next PC92 Update,atime', next_pc92_update => '9,Next PC92 Update,atime', nopings => '5,Ping Obs Count', oldstate => '5,Last State', @@ -116,24 +100,19 @@ $count = 0; passwd => '9,Passwd List,yesno', pc50_t => '5,Last PC50 Time,atime', pc92filter => '5,PC92 Route Filt-out', - pc92filter => '5,PC92 Route Filt-out', pingave => '0,Ping ave time', pingint => '5,Ping Interval ', pingtime => '5,Ping totaltime,parray', priv => '9,Privilege', prompt => '0,Required Prompt', rbnfilter => '5,RBN Filt-out', - rbnfilter => '5,RBN Filt-out', redirect => '0,Redirect messages to', registered => '9,Registered?,yesno', remotecmd => '9,doing rcmd,yesno', route => '9,Route Data', routefilter => '5,Route Filt-out', - routefilter => '5,Route Filt-out', senddbg => '8,Sending Debug,yesno', sluggedpcs => '9,Slugged PCxx Queue,parray', - sluggedpcs => '9,Slugged PCxx Queue,parray', - spotsfilter => '5,Spot Filt-out', spotsfilter => '5,Spot Filt-out', startt => '0,Start Time,atime', state => '0,Current State', diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index b9e6c678..1960a890 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -208,7 +208,7 @@ sub start # is this a bad ip address? if (is_ipaddr($self->{hostname})) { - $self->{badip} = DXCIDR->find($self->{hostname}); + $self->{badip} = DXCIDR::find($self->{hostname}); } # do we need to send a forward/opernam? diff --git a/perl/console.pl b/perl/console.pl index c47b5076..3258af44 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -76,7 +76,6 @@ our @kh = (); our @sh = (); our $kpos = 0; our $inbuf = ""; -our $lastmin = 0; our $idle = 0; our $inscroll = 0; @@ -503,6 +502,7 @@ sub rec_socket $lasttime = time; } +my $lastmin = 0; sub idle_loop { @@ -589,9 +589,6 @@ doresize(); $SIG{__DIE__} = \&sig_term; -my $lastmin = 0; - - $conn = IntMsg->connect($clusteraddr, $clusterport, rproc => \&rec_socket); $conn->{on_connect} = \&on_connect; $conn->{on_disconnect} = \&on_disconnect;