projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8c23f70
)
more mods to get it to work better
author
minima
<minima>
Fri, 9 Jul 2004 08:17:42 +0000
(08:17 +0000)
committer
minima
<minima>
Fri, 9 Jul 2004 08:17:42 +0000
(08:17 +0000)
perl/DXProt.pm
patch
|
blob
|
history
perl/DXProtout.pm
patch
|
blob
|
history
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index df72691eff6d65e7c04db022a6c0ea220562e894..24435bfb691938e6ca4294c8fccec763caecf3c7 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-526,9
+526,9
@@
sub process_pc59
}
}
push @addnode, $node if $self->{state} =~ /^init/;
}
}
push @addnode, $node if $self->{state} =~ /^init/;
- push @delnode, $enode->remove_
link
($_, $self) for @dn;
+ push @delnode, $enode->remove_
route
($_, $self) for @dn;
push @deluser, $enode->del_user($_) for @du;
push @deluser, $enode->del_user($_) for @du;
- push @addnode, $enode->add_
link
($_, $self) for @an;
+ push @addnode, $enode->add_
route
($_, $self) for @an;
push @adduser, $enode->add_user($_) for @au;
}
push @adduser, $enode->add_user($_) for @au;
}
@@
-537,8
+537,8
@@
sub process_pc59
$self->route_pc17($origin, $line, $enode, @deluser) if @deluser;
$self->route_pc16($origin, $line, $enode, @adduser) if @adduser;
$self->route_pc17($origin, $line, $enode, @deluser) if @deluser;
$self->route_pc16($origin, $line, $enode, @adduser) if @adduser;
- unshift @_, $enode if $n
ode->call ne $enode->call
;
- $self->route_pc59($
sort, $hexstamp, $ncall
, @_) if @_;
+ unshift @_, $enode if $n
call ne $origin
;
+ $self->route_pc59($
origin, $line, $sort, $hexstamp, $origin
, @_) if @_;
$_->delete for @deluser;
$_->delete for @delnode;
$_->delete for @deluser;
$_->delete for @delnode;
@@
-1118,7
+1118,7
@@
sub disconnect
# broadcast to all other nodes that all the nodes connected to via me are gone
unless ($pc39flag && $pc39flag == 2) {
$self->route_pc21($main::mycall, undef, @rout) if @rout;
# broadcast to all other nodes that all the nodes connected to via me are gone
unless ($pc39flag && $pc39flag == 2) {
$self->route_pc21($main::mycall, undef, @rout) if @rout;
- $self->route_pc59('D', hexstamp(), $main::mycall, $node);
+ $self->route_pc59(
$main::mycall, "",
'D', hexstamp(), $main::mycall, $node);
}
# delete all the unwanted nodes
}
# delete all the unwanted nodes
@@
-1220,7
+1220,8
@@
sub broadcast_route
next unless $dxchan->isa('DXProt');
next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
if ($dxchan->{newroute}) {
next unless $dxchan->isa('DXProt');
next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
if ($dxchan->{newroute}) {
- next if ($generate == \&pc19 || $generate==\&pc21);
+ next if ($generate == \&pc19 || $generate==\&pc21 ||
+ $generate == \&pc16 || $generate==\&pc17);
} else {
next if ($generate == \&pc19 || $generate==\&pc21) && !$dxchan->user->wantroutepc19;
next if ($generate == \&pc59);
} else {
next if ($generate == \&pc19 || $generate==\&pc21) && !$dxchan->user->wantroutepc19;
next if ($generate == \&pc59);
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index 5962665c482b942122fe307b3a89eabf8715778d..4194d6c42089a4590311928125cefb367af8202f 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-361,14
+361,14
@@
sub pc51
}
my $hexlasttime = 0;
}
my $hexlasttime = 0;
-my $hexlastlet = '
A
';
+my $hexlastlet = '
!
';
sub hexstamp
{
my $t = shift || $main::systime;
sub hexstamp
{
my $t = shift || $main::systime;
- if ($t ne $hexlasttime) {
+ if ($
hexlastlet gt '>' || $
t ne $hexlasttime) {
$hexlasttime = $t;
$hexlasttime = $t;
- $hexlastlet = '
A
';
+ $hexlastlet = '
!
';
} else {
do {
$hexlastlet = chr(ord($hexlastlet) + 1);
} else {
do {
$hexlastlet = chr(ord($hexlastlet) + 1);
@@
-402,7
+402,7
@@
sub pc59
my $ref = $_;
my $call = $ref->call;
my $here = $ref->here;
my $ref = $_;
my $call = $ref->call;
my $here = $ref->here;
- $s .= $ref->
isa('Route::Node') ? "^N$here$call" : "^U$here$call"
;
+ $s .= $ref->
enc_pc59
;
}
push @out, sprintf "$s^%s^", get_hops(59);
return @out;
}
push @out, sprintf "$s^%s^", get_hops(59);
return @out;