X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=691e29b2d6b3fa928933a878ec07221b579957da;hb=refs%2Fheads%2Fnewpc92timings;hp=30ad8c560fd2b81a9ff1dad5dcc98fd8c0c68784;hpb=8ea73c533440d7f73f96f8110b9f597a26a75241;p=spider.git diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 30ad8c56..691e29b2 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -65,13 +65,14 @@ sub new # 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, Route::here(1)); + DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1]); # ALWAYS output the user my $ref = Route::User::get($call); if ($ref) { $main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref); - $main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref); + $main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref) unless $DXProt::pc92_slug_changes; } return $self; @@ -308,7 +309,7 @@ sub normal if ($self->{state} eq 'talk') { $self->send_talks($_, $self->msg('talkend')); } else { - $self->send_chats($_, $self->msg('chatend', $_)); + $self->local_send('C', $self->msg('chatend', $_)); } } $self->state('prompt'); @@ -329,7 +330,7 @@ sub normal if ($self->{state} eq 'talk') { $self->send_talks($_, $l); } else { - $self->send_chats($_, $l) + send_chats($self, $_, $l) } } } @@ -347,7 +348,7 @@ sub normal if ($self->{state} eq 'talk') { $self->send_talks($_, $rawline); } else { - $self->send_chats($_, $rawline); + send_chats($self, $_, $rawline); } } } @@ -606,12 +607,14 @@ sub disconnect my $uref = Route::User::get($call); my @rout; if ($uref) { - @rout = $main::routeroot->del_user($uref); +# @rout = $main::routeroot->del_user($uref); + @rout = DXProt::_del_thingy($main::routeroot, [$call, 0]); + dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route'); # issue a pc17 to everybody interested $main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref); - $main::me->route_pc92d($main::mycall, undef, $main::routeroot, $uref); + $main::me->route_pc92d($main::mycall, undef, $main::routeroot, $uref) unless $DXProt::pc92_slug_changes; } else { confess "trying to disconnect a non existant user $call"; }