From 1c32e49bdf74dfe47cae108d06702996ead052f0 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 28 Sep 2016 18:39:06 +0200 Subject: traceroute: cleanup and fixes for packet size calculations Remove FEATURE_TRACEROUTE_SOURCE_ROUTE: it's off by default, and source routing is not used in real world. Tested that "traceroute -n ::1 100" and "traceroute -n 127.0.0.1 100" both send 100 byte IP packets (this matches what traceroute on Fedora Rawhide is doing). function old new delta common_traceroute_main 3731 3738 +7 Signed-off-by: Denys Vlasenko --- configs/TEST_nommu_defconfig | 1 - configs/TEST_noprintf_defconfig | 1 - configs/TEST_rh9_defconfig | 1 - configs/android2_defconfig | 1 - configs/android_502_defconfig | 1 - configs/android_defconfig | 1 - configs/android_ndk_defconfig | 1 - configs/cygwin_defconfig | 1 - configs/freebsd_defconfig | 1 - 9 files changed, 9 deletions(-) (limited to 'configs') diff --git a/configs/TEST_nommu_defconfig b/configs/TEST_nommu_defconfig index 5f822e5..20c2e15 100644 --- a/configs/TEST_nommu_defconfig +++ b/configs/TEST_nommu_defconfig @@ -760,7 +760,6 @@ CONFIG_TFTP_DEBUG=y CONFIG_TRACEROUTE=y CONFIG_TRACEROUTE6=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y CONFIG_UDHCPD=y CONFIG_DHCPRELAY=y diff --git a/configs/TEST_noprintf_defconfig b/configs/TEST_noprintf_defconfig index c56781e..845032e 100644 --- a/configs/TEST_noprintf_defconfig +++ b/configs/TEST_noprintf_defconfig @@ -762,7 +762,6 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_TRACEROUTE is not set # CONFIG_TRACEROUTE6 is not set # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set diff --git a/configs/TEST_rh9_defconfig b/configs/TEST_rh9_defconfig index 28daa62..d8c5af4 100644 --- a/configs/TEST_rh9_defconfig +++ b/configs/TEST_rh9_defconfig @@ -778,7 +778,6 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y CONFIG_TRACEROUTE=y CONFIG_TRACEROUTE6=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y diff --git a/configs/android2_defconfig b/configs/android2_defconfig index fbc0da0..857f9f5 100644 --- a/configs/android2_defconfig +++ b/configs/android2_defconfig @@ -814,7 +814,6 @@ CONFIG_TCPSVD=y # CONFIG_TRACEROUTE is not set # CONFIG_TRACEROUTE6 is not set # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y diff --git a/configs/android_502_defconfig b/configs/android_502_defconfig index 7ef1585..cd06aff 100644 --- a/configs/android_502_defconfig +++ b/configs/android_502_defconfig @@ -959,7 +959,6 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y CONFIG_TRACEROUTE=y CONFIG_TRACEROUTE6=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y diff --git a/configs/android_defconfig b/configs/android_defconfig index 4e02242..f1ddc45 100644 --- a/configs/android_defconfig +++ b/configs/android_defconfig @@ -843,7 +843,6 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y CONFIG_TRACEROUTE=y # CONFIG_TRACEROUTE6 is not set CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig index d657d33..18651fd 100644 --- a/configs/android_ndk_defconfig +++ b/configs/android_ndk_defconfig @@ -869,7 +869,6 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y CONFIG_TRACEROUTE=y # CONFIG_TRACEROUTE6 is not set CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig index 38d580a..dd7c21e 100644 --- a/configs/cygwin_defconfig +++ b/configs/cygwin_defconfig @@ -814,7 +814,6 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y # CONFIG_TRACEROUTE is not set # CONFIG_TRACEROUTE6 is not set # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set diff --git a/configs/freebsd_defconfig b/configs/freebsd_defconfig index ae62f13..265ab13 100644 --- a/configs/freebsd_defconfig +++ b/configs/freebsd_defconfig @@ -795,7 +795,6 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y # CONFIG_TRACEROUTE is not set # CONFIG_TRACEROUTE6 is not set # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set -- cgit v1.1