projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow someone to reject msgs from an interface call
[spider.git]
/
perl
/
DXChannel.pm
diff --git
a/perl/DXChannel.pm
b/perl/DXChannel.pm
index 6b0bb554abebcbf877ad51558df696c4cd3e8f0b..be5feee32b2915308464961f9884c5b4e9dee218 100644
(file)
--- a/
perl/DXChannel.pm
+++ b/
perl/DXChannel.pm
@@
-4,7
+4,7
@@
# This is the base class for all channel operations, which is everything to do
# with input and output really.
#
# This is the base class for all channel operations, which is everything to do
# with input and output really.
#
-# The instance variable in the outside world will be generally be called $dxchan
n
+# The instance variable in the outside world will be generally be called $dxchan
#
# This class is 'inherited' (if that is the goobledegook for what I am doing)
# by various other modules. The point to understand is that the 'instance variable'
#
# This class is 'inherited' (if that is the goobledegook for what I am doing)
# by various other modules. The point to understand is that the 'instance variable'
@@
-31,11
+31,13
@@
use DXUtil;
use DXVars;
use DXDebug;
use Filter;
use DXVars;
use DXDebug;
use Filter;
+use Prefix;
use strict;
use strict;
-use vars qw(%channels %valid);
+use vars qw(%channels %valid
@ISA $count
);
%channels = ();
%channels = ();
+$count = 0;
%valid = (
call => '0,Callsign',
%valid = (
call => '0,Callsign',
@@
-57,7
+59,7
@@
use vars qw(%channels %valid);
talk => '0,Want Talk,yesno',
ann => '0,Want Announce,yesno',
here => '0,Here?,yesno',
talk => '0,Want Talk,yesno',
ann => '0,Want Announce,yesno',
here => '0,Here?,yesno',
- conf
mode
=> '0,In Conference?,yesno',
+ conf => '0,In Conference?,yesno',
dx => '0,DX Spots,yesno',
redirect => '0,Redirect messages to',
lang => '0,Language',
dx => '0,DX Spots,yesno',
redirect => '0,Redirect messages to',
lang => '0,Language',
@@
-76,10
+78,12
@@
use vars qw(%channels %valid);
wwvfilter => '5,WWV Filter',
wcyfilter => '5,WCY Filter',
spotsfilter => '5,Spot Filter',
wwvfilter => '5,WWV Filter',
wcyfilter => '5,WCY Filter',
spotsfilter => '5,Spot Filter',
+ routefilter => '5,route Filter',
inannfilter => '5,Input Ann Filter',
inwwvfilter => '5,Input WWV Filter',
inwcyfilter => '5,Input WCY Filter',
inspotsfilter => '5,Input Spot Filter',
inannfilter => '5,Input Ann Filter',
inwwvfilter => '5,Input WWV Filter',
inwcyfilter => '5,Input WCY Filter',
inspotsfilter => '5,Input Spot Filter',
+ inroutefilter => '5,Input Route Filter',
passwd => '9,Passwd List,parray',
pingint => '5,Ping Interval ',
nopings => '5,Ping Obs Count',
passwd => '9,Passwd List,parray',
pingint => '5,Ping Interval ',
nopings => '5,Ping Obs Count',
@@
-89,26
+93,27
@@
use vars qw(%channels %valid);
logininfo => '9,Login info req,yesno',
talklist => '0,Talk List,parray',
cluster => '5,Cluster data',
logininfo => '9,Login info req,yesno',
talklist => '0,Talk List,parray',
cluster => '5,Cluster data',
+ isbasic => '9,Internal Connection',
+ errors => '9,Errors',
+ route => '9,Route Data',
+ dxcc => '0,Country Code',
+ itu => '0,ITU Zone',
+ cq => '0,CQ Zone',
+ enhanced => '5,Enhanced Client,yesno',
+ senddbg => '8,Sending Debug,yesno',
);
# object destruction
sub DESTROY
{
my $self = shift;
);
# object destruction
sub DESTROY
{
my $self = shift;
- undef $self->{user};
- undef $self->{conn};
- undef $self->{loc};
- undef $self->{pagedata};
- undef $self->{group};
- undef $self->{delayed};
- undef $self->{annfilter};
- undef $self->{wwvfilter};
- undef $self->{spotsfilter};
- undef $self->{inannfilter};
- undef $self->{inwwvfilter};
- undef $self->{inspotsfilter};
- undef $self->{passwd};
- undef $self->{node};
+ for (keys %$self) {
+ if (ref($self->{$_})) {
+ delete $self->{$_};
+ }
+ }
+ dbg("DXChannel $self->{call} destroyed ($count)") if isdbg('chan');
+ $count--;
}
# create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
}
# create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
@@
-134,6
+139,16
@@
sub alloc
$self->{lang} = $main::lang if !$self->{lang};
$self->{func} = "";
$self->{lang} = $main::lang if !$self->{lang};
$self->{func} = "";
+ # add in all the dxcc, itu, zone info
+ my @dxcc = Prefix::extract($call);
+ if (@dxcc > 0) {
+ $self->{dxcc} = $dxcc[1]->dxcc;
+ $self->{itu} = $dxcc[1]->itu;
+ $self->{cq} = $dxcc[1]->cq;
+ }
+
+ $count++;
+ dbg("DXChannel $self->{call} created ($count)") if isdbg('chan');
bless $self, $pkg;
return $channels{$call} = $self;
}
bless $self, $pkg;
return $channels{$call} = $self;
}
@@
-284,7
+299,30
@@
sub send_now
my @lines = split /\n/;
for (@lines) {
$conn->send_now("$sort$call|$_");
my @lines = split /\n/;
for (@lines) {
$conn->send_now("$sort$call|$_");
- dbg('chan', "-> $sort $call $_");
+ dbg("-> $sort $call $_") if isdbg('chan');
+ }
+ }
+ $self->{t} = time;
+}
+
+#
+# send later with letter (more control)
+#
+
+sub send_later
+{
+ my $self = shift;
+ my $conn = $self->{conn};
+ return unless $conn;
+ my $sort = shift;
+ my $call = $self->{call};
+
+ for (@_) {
+# chomp;
+ my @lines = split /\n/;
+ for (@lines) {
+ $conn->send_later("$sort$call|$_");
+ dbg("-> $sort $call $_") if isdbg('chan');
}
}
$self->{t} = time;
}
}
$self->{t} = time;
@@
-305,7
+343,7
@@
sub send # this is always later and always data
my @lines = split /\n/;
for (@lines) {
$conn->send_later("D$call|$_");
my @lines = split /\n/;
for (@lines) {
$conn->send_later("D$call|$_");
- dbg(
'chan', "-> D $call $_"
);
+ dbg(
"-> D $call $_") if isdbg('chan'
);
}
}
$self->{t} = time;
}
}
$self->{t} = time;
@@
-353,7
+391,7
@@
sub state
$self->{oldstate} = $self->{state};
$self->{state} = shift;
$self->{func} = '' unless defined $self->{func};
$self->{oldstate} = $self->{state};
$self->{state} = shift;
$self->{func} = '' unless defined $self->{func};
- dbg(
'state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n"
);
+ dbg(
"$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n") if isdbg('state'
);
# if there is any queued up broadcasts then splurge them out here
if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'talk')) {
# if there is any queued up broadcasts then splurge them out here
if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'talk')) {
@@
-369,12
+407,9
@@
sub disconnect
{
my $self = shift;
my $user = $self->{user};
{
my $self = shift;
my $user = $self->{user};
- my $conn = $self->{conn};
- my $call = $self->{call};
- $self->finish($conn);
$user->close() if defined $user;
$user->close() if defined $user;
- $
conn->disconnect() if $conn
;
+ $
self->{conn}->disconnect
;
$self->del();
}
$self->del();
}
@@
-442,13
+477,13
@@
sub decode_input
# the above regexp must work
unless (defined $sort && defined $call && defined $line) {
# the above regexp must work
unless (defined $sort && defined $call && defined $line) {
-
$data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
- dbg(
'err', "DUFF Line on $chcall: $data"
);
+
#
$data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+ dbg(
"DUFF Line on $chcall: $data") if isdbg('err'
);
return ();
}
if(ref($dxchan) && $call ne $chcall) {
return ();
}
if(ref($dxchan) && $call ne $chcall) {
- dbg(
'err', "DUFF Line come in for $call on wrong channel $chcall"
);
+ dbg(
"DUFF Line come in for $call on wrong channel $chcall") if isdbg('err'
);
return();
}
return();
}