X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=b6140082f6a741b59ab5ece9541823213e2eafaa;hb=412fb1b9e4070d7791f4e986b55bbc0c06f612ea;hp=8dcb9b6cf9b0b07451199d825fddee6ce451205c;hpb=53899d74634af9db8d0b842d68b099972dd849b6;p=spider.git diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 8dcb9b6c..b6140082 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -41,6 +41,12 @@ $errstr = (); # error string from eval $scriptbase = "$main::root/scripts"; # the place where all users start scripts go $maxerrors = 20; # the maximum number of concurrent errors allowed before disconnection +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 # @@ -77,6 +83,8 @@ sub start $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 @@ -128,7 +136,7 @@ sub start # 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); } @@ -419,8 +427,14 @@ sub disconnect my $call = $self->call; 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;