X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=99e2bfe5fe55692b5d70adc418f6e1b235ff7719;hb=bca5cd40374f12da5e0d46980e54bffc61fdc9c9;hp=ca6c053e7d03cae21ba4376aff4b0eb102e5ef82;hpb=88c2b296ba903fdd356e351b83fcb844e2d6eacd;p=spider.git diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index ca6c053e..99e2bfe5 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -27,6 +27,7 @@ use Filter; use Carp; use Minimuf; use DXDb; +use Sun; use strict; use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase); @@ -70,8 +71,14 @@ sub start $self->{consort} = $line; # save the connection type # set some necessary flags on the user if they are connecting - $self->{beep} = $self->{wwv} = $self->{wx} = $self->{talk} = $self->{ann} = $self->{here} = $self->{dx} = 1; - # $self->prompt() if $self->{state} =~ /^prompt/o; + $self->{beep} = $user->wantbeep; + $self->{ann} = $user->wantann; + $self->{wwv} = $user->wantwwv; + $self->{talk} = $user->wanttalk; + $self->{wx} = $user->wantwx; + $self->{dx} = $user->wantdx; + $self->{logininfo} = $user->wantlogininfo; + $self->{here} = 1; # add yourself to the database my $node = DXNode->get($main::mycall) or die "$main::mycall not allocated in DXNode database"; @@ -85,7 +92,7 @@ sub start DXProt::broadcast_all_ak1a($_); } Log('DXCommand', "$call connected"); - + # send prompts and things my $info = DXCluster::cluster(); $self->send("Cluster:$info"); @@ -94,9 +101,10 @@ sub start $self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long); $self->send($self->msg('hnodee1')) if !$user->qth; $self->send($self->msg('m9')) if DXMsg::for_me($call); - - $self->send($self->msg('pr', $call)); + + $self->tell_login('loginu'); + } # @@ -235,14 +243,14 @@ sub run_cmd if ($package) { dbg('command', "package: $package"); my $c; - unless (exists $Cache{$package}->{sub}) { - $c = eval $Cache{$package}->{eval}; + unless (exists $Cache{$package}->{'sub'}) { + $c = eval $Cache{$package}->{'eval'}; if ($@) { return ("Syserr: Syntax error in $package", $@); } - $Cache{$package}->{sub} = $c; + $Cache{$package}->{'sub'} = $c; } - $c = $Cache{$package}->{sub}; + $c = $Cache{$package}->{'sub'}; eval { @ans = &{$c}($self, $args); }; @@ -302,14 +310,17 @@ sub finish my $node = DXNode->get($main::mycall); $node->{dxchan} = 0; } - my $ref = DXCluster->get_exact($call); # issue a pc17 to everybody interested my $nchan = DXChannel->get($main::mycall); my $pc17 = $nchan->pc17($self); DXProt::broadcast_all_ak1a($pc17); - + + # send info to all logged in thingies + $self->tell_login('logoutu'); + Log('DXCommand', "$call disconnected"); + my $ref = DXCluster->get_exact($call); $ref->del() if $ref; } @@ -519,7 +530,7 @@ sub find_cmd_name { } } - $Cache{$package} = {mtime => $mtime, eval => $eval }; + $Cache{$package} = {mtime => $mtime, 'eval' => $eval }; } return $package;