prevent hop counts of -1 being generated.

This commit is contained in:
Dirk Koopman 2007-07-20 15:41:53 +01:00
parent 64d7fcd04e
commit 216faa5519
2 changed files with 7 additions and 4 deletions

View File

@ -1008,7 +1008,7 @@ sub adjust_hops
my $call = $self->{call};
my $hops;
if (($hops) = $s =~ /\^H(\d+)\^?~?$/o) {
if (($hops) = $s =~ /\^H([-\d]+)\^?~?$/o) {
my ($pcno) = $s =~ /^PC(\d\d)/o;
confess "$call called adjust_hops with '$s'" unless $pcno;
my $ref = $nodehops{$call} if %nodehops;
@ -1017,8 +1017,11 @@ sub adjust_hops
return "" if defined $newhops && $newhops == 0;
$newhops = $ref->{default} unless $newhops;
return "" if defined $newhops && $newhops == 0;
$newhops = $hops if !$newhops;
$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
$newhops = $hops unless $newhops;
return "" unless $newhops > 0;
$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops != $hops;
} else {
return "" unless $hops > 0;
}
}
return $s;

View File

@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
$version = '1.54';
$subversion = '0';
$build = '122';
$build = '123';
1;