use Internet;
use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $suppress_ann_to_talk);
%Cache = (); # cache of dynamically loaded routine's mod times
%cmd_cache = (); # cache of short names
%aliases = (); # aliases for (parts of) commands
$scriptbase = "$main::root/scripts"; # the place where all users start scripts go
$maxerrors = 20; # the maximum number of concurrent errors allowed before disconnection
+$suppress_ann_to_talk = 1; # don't announce 'to <call> ' or '<call> ' type announcements
+
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
#
# obtain a new connection this is derived from dxchannel
my $call = $self->{call};
my $name = $user->{name};
+ # log it
+ my $host = $self->{conn}->{peerhost} || "unknown";
+ Log('DXCommand', "$call connected from $host");
+
$self->{name} = $name ? $name : $call;
$self->send($self->msg('l2',$self->{name}));
$self->send_file($main::motd) if (-e $main::motd);
$self->{lang} = $user->lang || $main::lang || 'en';
$self->{pagelth} = $user->pagelth || 20;
$self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
+ ($self->{width}) = $line =~ /width=(\d+)/;
+ $self->{width} = 80 unless $self->{width} && $self->{width} > 80;
$self->{consort} = $line; # save the connection type
# set some necessary flags on the user if they are connecting
$user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long);
}
- Log('DXCommand', "$call connected");
-
# send prompts and things
my $info = Route::cluster();
$self->send("Cluster:$info");
# do we need to send a forward/opernam?
my $lastoper = $user->lastoper || 0;
my $homenode = $user->homenode || "";
- if ($homenode eq $main::mycall && $lastoper < $main::systime + $DXUser::lastoperinterval) {
+ if ($homenode eq $main::mycall && $lastoper + $DXUser::lastoperinterval < $main::systime) {
run_cmd($DXProt::me, "forward/opernam $call");
$user->lastoper($main::systime);
}
{
my $self = shift;
my $call = $self->call;
+
+ return if $self->{disconnecting}++;
+
delete $self->{senddbg};
- my @rout = $main::routeroot->del_user($call);
- dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
+ my $uref = Route::User::get($call);
+ my @rout;
+ if ($uref) {
+ @rout = $main::routeroot->del_user($uref);
+ dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
+ } else {
+ confess "trying to disconnect a non existant user $call";
+ }
# issue a pc17 to everybody interested
DXProt::route_pc17($DXProt::me, $main::routeroot, @rout) if @rout;
my $text = shift;
my ($filter, $hops);
+ if ($suppress_ann_to_talk && $to ne $self->{call}) {
+ my $call = AnnTalk::is_talk_candidate($_[0], $text);
+ return if $call && Route::get($call);
+ }
+
if ($self->{annfilter}) {
($filter, $hops) = $self->{annfilter}->it(@_ );
return unless $filter;