X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=7d835171d5d88ff9edc2e2db94a913f82698ba83;hb=7432cb12ce865030c8b0315a30764e0088a59102;hp=fc0305a7208cc5dc789a60bb9f79f2716b1f78a9;hpb=1cf4bd14be226274d5deb05da8480ab91a5dac52;p=spider.git diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index fc0305a7..7d835171 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -29,17 +29,20 @@ use Msg; use DXUtil; use DXM; use DXDebug; +use Carp; 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', + pc50_t => '9,Last PC50 Time,atime', 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', + redirect => '0,Redirect messages to', ); - # 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; - 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; } @@ -150,8 +153,8 @@ sub send # this is always later and always data 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; } @@ -215,7 +218,7 @@ sub AUTOLOAD 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} ; }