Fix asymm messages.
Subsystems (2)
PATCH 1/2 Fix asymm messages.
We should only print the asymm messages in tracepath/6 when you receive a TTL expired message, because this is the only time when we'd expect the same number of hops back as our TTL was set to for a symmetric path.
--- tracepath.c | 25 ++++++++++++------------- tracepath6.c | 25 ++++++++++++------------- 2 files changed, 24 insertions(+), 26 deletions(-)
tracepath.c +12 -13
@@ -163,19 +163,6 @@ restart: } } -if (rethops>=0 ) { -if (rethops<=64 ) - rethops =65 -rethops; -else if (rethops<=128 ) - rethops =129 -rethops; -else - rethops =256 -rethops; -if (sndhops>=0 && rethops != sndhops) -printf ("asymm %2d " , rethops); -else if (sndhops<0 && rethops != ttl) -printf ("asymm %2d " , rethops); - } -if (rettv) {int diff = (tv.tv_sec-rettv->tv_sec)*1000000 +(tv.tv_usec-rettv->tv_usec);printf ("%3d.%03dms " , diff/1000 , diff%1000 );
@@ -204,6 +191,18 @@ restart:if (e->ee_origin ==SO_EE_ORIGIN_ICMP && e->ee_type ==11 && e->ee_code ==0 ) { +if (rethops>=0 ) { +if (rethops<=64 ) + rethops =65 -rethops; +else if (rethops<=128 ) + rethops =129 -rethops; +else + rethops =256 -rethops; +if (sndhops>=0 && rethops != sndhops) +printf ("asymm %2d " , rethops); +else if (sndhops<0 && rethops != ttl) +printf ("asymm %2d " , rethops); + }printf ("\n" );break ; }
tracepath6.c +12 -13
@@ -176,19 +176,6 @@ restart: } } -if (rethops>=0 ) { -if (rethops<=64 ) - rethops =65 -rethops; -else if (rethops<=128 ) - rethops =129 -rethops; -else - rethops =256 -rethops; -if (sndhops>=0 && rethops != sndhops) -printf ("asymm %2d " , rethops); -else if (sndhops<0 && rethops != ttl) -printf ("asymm %2d " , rethops); - } -if (rettv) {int diff = (tv.tv_sec-rettv->tv_sec)*1000000 +(tv.tv_usec-rettv->tv_usec);printf ("%3d.%03dms " , diff/1000 , diff%1000 );
@@ -220,6 +207,18 @@ restart: (e->ee_origin == SO_EE_ORIGIN_ICMP6 && e->ee_type == 3 && e->ee_code == 0)) { +if (rethops>=0 ) { +if (rethops<=64 ) + rethops =65 -rethops; +else if (rethops<=128 ) + rethops =129 -rethops; +else + rethops =256 -rethops; +if (sndhops>=0 && rethops != sndhops) +printf ("asymm %2d " , rethops); +else if (sndhops<0 && rethops != ttl) +printf ("asymm %2d " , rethops); + }printf ("\n" );break ; }
Signature · 1 line
1.5.0.2.gc260-dirty
PATCH 2/2 Re-probe at same TTL after MTU reduction.
This fixes a bug that would miss a hop after an ICMP packet too big message, since it would continue increase the TTL without probing again.
--- tracepath.c | 6 ++++++ tracepath6.c | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
tracepath.c +6 -0
@@ -352,8 +352,14 @@ main(int argc, char **argv)exit (1 ); } +restart:for (i=0 ; i<3 ; i++) { +int old_mtu; + + old_mtu = mtu; res =probe_ttl (fd, ttl); +if (mtu != old_mtu) + goto restart;if (res ==0 ) goto done;if (res >0 )
tracepath6.c +6 -0
@@ -422,8 +422,14 @@ int main(int argc, char **argv)exit (1 ); } +restart:for (i=0 ; i<3 ; i++) { +int old_mtu; + + old_mtu = mtu; res =probe_ttl (fd, ttl); +if (mtu != old_mtu) + goto restart;if (res ==0 ) goto done;if (res >0 )
Signature · 1 line
1.5.0.2.gc260-dirty
YOSHIFUJI Hideaki / 吉藤英明
AppliedIn article <[email protected]> (at Tue, 3 Apr 2007 14:20:34 -0400), John Heffner <[email protected]> says:
Quoted 3 lines
We should only print the asymm messages in tracepath/6 when you receive a TTL expired message, because this is the only time when we'd expect the same number of hops back as our TTL was set to for a symmetric path.
applied. thanks.
--yoshfuji
YOSHIFUJI Hideaki / 吉藤英明
AppliedRe: [PATCH 2/2] [iputils] Re-probe at same TTL after MTU reduction.
In reply to John HeffnerIn article <[email protected]> (at Tue, 3 Apr 2007 14:20:35 -0400), John Heffner <[email protected]> says:
Quoted 2 lines
This fixes a bug that would miss a hop after an ICMP packet too big message, since it would continue increase the TTL without probing again.
Applied, thanks.
--yoshfuji