projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix callsigns in group field
[spider.git]
/
perl
/
DXCommandmode.pm
diff --git
a/perl/DXCommandmode.pm
b/perl/DXCommandmode.pm
index f451a434d0ebe239ba388d568fe2cf478af71fe7..9b3b09e3f4e24572f5ee5e45462c09eff0d41346 100644
(file)
--- a/
perl/DXCommandmode.pm
+++ b/
perl/DXCommandmode.pm
@@
-68,11
+68,8
@@
sub new
# routing, this must go out here to prevent race condx
my $pkg = shift;
my $call = shift;
# routing, this must go out here to prevent race condx
my $pkg = shift;
my $call = shift;
- my @rout = $main::routeroot->add_user($call,
Route::here(1)
);
+ my @rout = $main::routeroot->add_user($call,
1
);
- # ALWAYS output the user
- my $thing = Thingy::Hello->new(user => $self->{call});
- $thing->broadcast($self);
my $ref = Route::User::get($call);
$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
my $ref = Route::User::get($call);
$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
@@
-178,6
+175,11
@@
sub start
$user->lastoper($main::systime + ((int rand(10)) * 86400));
}
$user->lastoper($main::systime + ((int rand(10)) * 86400));
}
+ # ALWAYS output the user
+ my $thing = Thingy::Hello->new(user => $call, h => $self->{here});
+ $thing->broadcast($self);
+ $self->lasthello($main::systime);
+
# run a script send the output to the punter
my $script = new Script(lc $call) || new Script('user_default');
$script->run($self) if $script;
# run a script send the output to the punter
my $script = new Script(lc $call) || new Script('user_default');
$script->run($self) if $script;
@@
-498,7
+500,7
@@
sub run_cmd
sub process
{
my $t = time;
sub process
{
my $t = time;
- my @dxchan = DXChannel
->
get_all();
+ my @dxchan = DXChannel
::
get_all();
my $dxchan;
foreach $dxchan (@dxchan) {
my $dxchan;
foreach $dxchan (@dxchan) {
@@
-557,6
+559,9
@@
sub disconnect
# send info to all logged in thingies
$self->tell_login('logoutu');
# send info to all logged in thingies
$self->tell_login('logoutu');
+ # remove any outstanding pings I have sent
+ Thingy::Ping::forget($call);
+
Log('DXCommand', "$call disconnected");
$self->SUPER::disconnect;
Log('DXCommand', "$call disconnected");
$self->SUPER::disconnect;
@@
-589,7
+594,7
@@
sub broadcast
my $pkg = shift; # ignored
my $s = shift; # the line to be rebroadcast
my $pkg = shift; # ignored
my $s = shift; # the line to be rebroadcast
- foreach my $dxchan (DXChannel
->
get_all()) {
+ foreach my $dxchan (DXChannel
::
get_all()) {
next unless $dxchan->{sort} eq 'U'; # only interested in user channels
next if grep $dxchan == $_, @_;
$dxchan->send($s); # send it
next unless $dxchan->{sort} eq 'U'; # only interested in user channels
next if grep $dxchan == $_, @_;
$dxchan->send($s); # send it
@@
-599,7
+604,7
@@
sub broadcast
# gimme all the users
sub get_all
{
# gimme all the users
sub get_all
{
- return grep {$_->{sort} eq 'U'} DXChannel
->
get_all();
+ return grep {$_->{sort} eq 'U'} DXChannel
::
get_all();
}
# run a script for this user
}
# run a script for this user
@@
-895,7
+900,7
@@
sub broadcast_debug
{
my $s = shift; # the line to be rebroadcast
{
my $s = shift; # the line to be rebroadcast
- foreach my $dxchan (DXChannel
->
get_all) {
+ foreach my $dxchan (DXChannel
::
get_all) {
next unless $dxchan->{enhanced} && $dxchan->{senddbg};
$dxchan->send_later('L', $s);
}
next unless $dxchan->{enhanced} && $dxchan->{senddbg};
$dxchan->send_later('L', $s);
}