projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ntpd: make -w less cumbersome to use
[oweals/busybox.git]
/
networking
/
traceroute.c
diff --git
a/networking/traceroute.c
b/networking/traceroute.c
index e9f3cc6c95a9947fbb2d10344e56cd77afe445a7..a30decf10edfac5e1c1d6222c69a44be031e58ee 100644
(file)
--- a/
networking/traceroute.c
+++ b/
networking/traceroute.c
@@
-703,9
+703,10
@@
packet_ok(int read_len, len_and_sockaddr *from_lsa,
}
#else /* !ENABLE_TRACEROUTE6 */
static ALWAYS_INLINE int
}
#else /* !ENABLE_TRACEROUTE6 */
static ALWAYS_INLINE int
-packet_ok(int read_len, len_and_sockaddr *from_lsa,
- struct sockaddr *to UNUSED_PARAM,
- int seq)
+packet_ok(int read_len,
+ len_and_sockaddr *from_lsa IF_NOT_FEATURE_TRACEROUTE_VERBOSE(UNUSED_PARAM),
+ struct sockaddr *to UNUSED_PARAM,
+ int seq)
{
return packet4_ok(read_len, &from_lsa->u.sin, seq);
}
{
return packet4_ok(read_len, &from_lsa->u.sin, seq);
}
@@
-835,7
+836,7
@@
common_traceroute_main(int op, char **argv)
* probe (e.g., on a multi-homed host).
*/
if (getuid() != 0)
* probe (e.g., on a multi-homed host).
*/
if (getuid() != 0)
- bb_error_msg_and_die(
"you must be root to use -s"
);
+ bb_error_msg_and_die(
bb_msg_you_must_be_root
);
}
if (op & OPT_WAITTIME)
waittime = xatou_range(waittime_str, 1, 24 * 60 * 60);
}
if (op & OPT_WAITTIME)
waittime = xatou_range(waittime_str, 1, 24 * 60 * 60);