X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=6a82cb16dc02d6facf3e7fac7f03e8e836784117;hb=3b52d4a1eb273c6e6eff14223baf69c0a309899c;hp=ff746b5e116667eb1bcd3954eaae913da5182155;hpb=f3b23f65ec3e143910ec6a6c36cfe1ab37f0338c;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index ff746b5e..6a82cb16 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -127,23 +127,29 @@ sub start $self->send_now('E',"0"); # ping neighbour node stuff - $self->pingint($user->pingint || 3*60); - $self->nopings(3); - $self->pingtime([ ]); + my $ping = $user->pingint; + $ping = 5*60 unless defined $ping; + $self->{pingint} = $ping; + $self->{nopings} = $user->nopings || 2; + $self->{pingtime} = [ ]; + $self->{pingave} = 0; # send initialisation string unless ($self->{outbound}) { $self->send(pc38()) if DXNode->get_all(); $self->send(pc18()); - $self->lastping($main::systime); + $self->{lastping} = $main::systime; } else { # remove from outstanding connects queue @main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects; - $self->lastping($main::systime + $self->pingint / 2); + $self->{lastping} = $main::systime + $self->pingint / 2; } $self->state('init'); $self->pc50_t(time); + # send info to all logged in thingies + $self->tell_login('loginn'); + Log('DXProt', "$call connected"); } @@ -185,7 +191,7 @@ sub normal # is it for me or one of mine? my $call = ($field[5] gt ' ') ? $field[5] : $field[2]; - if ($call eq $main::mycall || grep $_ eq $call, get_all_user_calls()) { + if ($call eq $main::mycall || grep $_ eq $call, DXChannel::get_all_user_calls()) { # yes, it is my $text = unpad($field[3]); @@ -651,7 +657,7 @@ sub normal } if ($pcno == 39) { # incoming disconnect - $self->disconnect(); + $self->disconnect(1); return; } @@ -682,7 +688,7 @@ sub normal if ($pcno == 43) { last SWITCH; } - if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47) { + if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 48) { DXDb::process($self, $line); return; } @@ -716,18 +722,18 @@ sub normal my $t = tv_interval($r->{t}, [ gettimeofday ]); if ($dxchan->is_user) { my $s = sprintf "%.2f", $t; - my $ave = sprintf "%.2f", $tochan ? ($tochan->pingave || $t) : $t; + my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t; $dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave)) } elsif ($dxchan->is_ak1a) { if ($tochan) { - $tochan->nopings(3); # pump up the timer - push @{$tochan->pingtime}, $t; - shift @{$tochan->pingtime} if @{$tochan->pingtime} > 6; + $tochan->{nopings} = 2; # pump up the timer + push @{$tochan->{pingtime}}, $t; + shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6; my $st; - for (@{$tochan->pingtime}) { + for (@{$tochan->{pingtime}}) { $st += $_; } - $tochan->{pingave} = $st / @{$tochan->pingtime}; + $tochan->{pingave} = $st / @{$tochan->{pingtime}}; } } } @@ -770,18 +776,18 @@ sub process # send a pc50 out on this channel if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) { - $dxchan->send(pc50()); + $dxchan->send(pc50(scalar DXChannel::get_all_users)); $dxchan->pc50_t($t); } # send a ping out on this channel - if ($t >= $dxchan->pingint + $dxchan->lastping) { - if ($dxchan->nopings <= 0) { + if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) { + if ($dxchan->{nopings} <= 0) { $dxchan->disconnect; } else { addping($main::mycall, $dxchan->call); - $dxchan->nopings($dxchan->nopings - 1); - $dxchan->lastping($t); + $dxchan->{nopings} -= 1; + $dxchan->{lastping} = $t; } } } @@ -813,9 +819,10 @@ sub finish { my $self = shift; my $call = $self->call; + my $nopc39 = shift; my $ref = DXCluster->get_exact($call); - $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op"))); + $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op"))) unless $nopc39; # unbusy and stop and outgoing mail my $mref = DXMsg::get_busy($call); @@ -836,7 +843,13 @@ sub finish # now broadcast to all other ak1a nodes that I have gone broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate}; - + + # I was the last node visited + $self->user->node($main::mycall); + + # send info to all logged in thingies + $self->tell_login('logoutn'); + Log('DXProt', $call . " Disconnected"); $ref->del() if $ref; } @@ -1068,7 +1081,7 @@ sub broadcast_ak1a { my $s = shift; # the line to be rebroadcast my @except = @_; # to all channels EXCEPT these (dxchannel refs) - my @dxchan = get_all_ak1a(); + my @dxchan = DXChannel::get_all_ak1a(); my $dxchan; # send it if it isn't the except list and isn't isolated and still has a hop count @@ -1085,7 +1098,7 @@ sub broadcast_all_ak1a { my $s = shift; # the line to be rebroadcast my @except = @_; # to all channels EXCEPT these (dxchannel refs) - my @dxchan = get_all_ak1a(); + my @dxchan = DXChannel::get_all_ak1a(); my $dxchan; # send it if it isn't the except list and isn't isolated and still has a hop count @@ -1104,7 +1117,7 @@ sub broadcast_users my $sort = shift; # the type of transmission my $fref = shift; # a reference to an object to filter on my @except = @_; # to all channels EXCEPT these (dxchannel refs) - my @dxchan = get_all_users(); + my @dxchan = DXChannel::get_all_users(); my $dxchan; my @out; @@ -1145,43 +1158,6 @@ sub broadcast_list } } -# -# gimme all the ak1a nodes -# -sub get_all_ak1a -{ - my @list = DXChannel->get_all(); - my $ref; - my @out; - foreach $ref (@list) { - push @out, $ref if $ref->is_ak1a; - } - return @out; -} - -# return a list of all users -sub get_all_users -{ - my @list = DXChannel->get_all(); - my $ref; - my @out; - foreach $ref (@list) { - push @out, $ref if $ref->is_user; - } - return @out; -} - -# return a list of all user callsigns -sub get_all_user_calls -{ - my @list = DXChannel->get_all(); - my $ref; - my @out; - foreach $ref (@list) { - push @out, $ref->call if $ref->is_user; - } - return @out; -} # # obtain the hops from the list for this callsign and pc no