projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
got routing essentially working
[spider.git]
/
perl
/
DXChannel.pm
diff --git
a/perl/DXChannel.pm
b/perl/DXChannel.pm
index fc0305a7208cc5dc789a60bb9f79f2716b1f78a9..970832d53df28987489e28ad48c25b53578b1f5e 100644
(file)
--- a/
perl/DXChannel.pm
+++ b/
perl/DXChannel.pm
@@
-29,17
+29,20
@@
use Msg;
use DXUtil;
use DXM;
use DXDebug;
use DXUtil;
use DXM;
use DXDebug;
+use Carp;
use strict;
use strict;
+use vars qw(%channels %valid);
-
my
%channels = undef;
+%channels = undef;
-
my
%valid = (
+%valid = (
call => '0,Callsign',
conn => '9,Msg Conn ref',
user => '9,DXUser ref',
startt => '0,Start Time,atime',
t => '9,Time,atime',
call => '0,Callsign',
conn => '9,Msg Conn ref',
user => '9,DXUser ref',
startt => '0,Start Time,atime',
t => '9,Time,atime',
+ pc50_t => '9,Last PC50 Time,atime',
priv => '9,Privilege',
state => '0,Current State',
oldstate => '5,Last State',
priv => '9,Privilege',
state => '0,Current State',
oldstate => '5,Last State',
@@
-53,9
+56,9
@@
my %valid = (
here => '0,Here?,yesno',
confmode => '0,In Conference?,yesno',
dx => '0,DX Spots,yesno',
here => '0,Here?,yesno',
confmode => '0,In Conference?,yesno',
dx => '0,DX Spots,yesno',
+ redirect => '0,Redirect messages to',
);
);
-
# create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
sub alloc
{
# create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
sub alloc
{
@@
-132,8
+135,8
@@
sub send_now
foreach $line (@_) {
chomp $line;
foreach $line (@_) {
chomp $line;
- dbg('chan', "-> $sort $call $line\n");
- $conn->send_now("$sort$call|$line");
+ dbg('chan', "-> $sort $call $line\n")
if $conn
;
+ $conn->send_now("$sort$call|$line")
if $conn
;
}
$self->{t} = time;
}
}
$self->{t} = time;
}
@@
-150,8
+153,8
@@
sub send # this is always later and always data
foreach $line (@_) {
chomp $line;
foreach $line (@_) {
chomp $line;
- dbg('chan', "-> D $call $line\n");
- $conn->send_later("D$call|$line");
+ dbg('chan', "-> D $call $line\n")
if $conn
;
+ $conn->send_later("D$call|$line")
if $conn
;
}
$self->{t} = time;
}
}
$self->{t} = time;
}
@@
-186,6
+189,18
@@
sub state
dbg('state', "$self->{call} channel state $self->{oldstate} -> $self->{state}\n");
}
dbg('state', "$self->{call} channel state $self->{oldstate} -> $self->{state}\n");
}
+# disconnect this channel
+sub disconnect
+{
+ my $self = shift;
+ my $user = $self->{user};
+ my $conn = $self->{conn};
+ $self->finish();
+ $user->close() if defined $user;
+ $conn->disconnect() if defined $conn;
+ $self->del();
+}
+
# various access routines
#
# various access routines
#
@@
-215,7
+230,7
@@
sub AUTOLOAD
return if $name =~ /::DESTROY$/;
$name =~ s/.*:://o;
return if $name =~ /::DESTROY$/;
$name =~ s/.*:://o;
-
die
"Non-existant field '$AUTOLOAD'" if !$valid{$name};
+
confess
"Non-existant field '$AUTOLOAD'" if !$valid{$name};
@_ ? $self->{$name} = shift : $self->{$name} ;
}
@_ ? $self->{$name} = shift : $self->{$name} ;
}