diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2015-05-15 10:25:21 +0200 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2015-05-15 10:25:21 +0200 |
| commit | b8c5c3b44362778c099531f7a905c56a0423bcef (patch) | |
| tree | e9ccaff5d19f39e7bc58734e1b5babf4025a3a9c /include | |
| parent | b1b227fa5e00d08af047ab9a012211b66c6b0f13 (diff) | |
ripe-atlas-fw: imported version 46504650
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 2 | ||||
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 12 |
3 files changed, 10 insertions, 6 deletions
diff --git a/include/applets.h b/include/applets.h index 128d8d9..829ba14 100644 --- a/include/applets.h +++ b/include/applets.h @@ -320,7 +320,7 @@ USE_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_NEVER, USE_ROUTE(APPLET(route, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_RPTRA6(APPLET(rptra6, _BB_DIR_BIN, _BB_SUID_NEVER)) -USE_RPTADDR6(APPLET(rptaddr6, _BB_DIR_BIN, _BB_SUID_NEVER)) +USE_RPTADDRS(APPLET(rptaddrs, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_NEVER, run_parts)) diff --git a/include/libbb.h b/include/libbb.h index d5c3178..598e74e 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -314,6 +314,8 @@ extern char *bb_get_last_path_component_nostrip(const char *path) FAST_FUNC; extern int validate_filename(const char *path, const char *prefix); extern int validate_atlas_id(const char *atlas_id); extern int get_probe_id(void); +extern int get_timesync(void); +extern int bind_interface(int socket, int af, char *name); int ndelay_on(int fd) FAST_FUNC; int ndelay_off(int fd) FAST_FUNC; diff --git a/include/usage.h b/include/usage.h index ea3b78b..c4953bc 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1062,8 +1062,8 @@ #define evtraceroute_trivial_usage \ "-[46FIrTU] [-a <paris mod>] [-c <count>] [-f <hop>]" \ -"\n [-g <gap>] [-m <hop>] [-p <port>] [-w <ms>] [-z <ms>] [-A <string>] [-O <file>]" \ -"\n [-S <size>]" +"\n [-g <gap>] [-m <hop>] [-p <port>] [-w <ms>] [-z <ms>] [-A <string>]" \ +"\n [-O <file>] [-S <size>] [-H <hbh size>] [-D <dest. opt. size>]" #define evtraceroute_full_usage "\n" \ "\n -4 Use IPv4 (default)" \ @@ -1082,6 +1082,8 @@ "\n -w <timeout> No reply timeout (ms)" \ "\n -z <timeout> Dup timeout (ms)" \ "\n -A <string> Atlas measurement ID" \ + "\n -D <size> Add IPv6 Destination Option this size" \ + "\n -H <size> Add IPv6 Hop-by-hop Option this size" \ "\n -O <file> Name of output file" \ "\n -S <size> Size of packet" \ @@ -3569,11 +3571,11 @@ #define rpm2cpio_full_usage "\n\n" \ "Output a cpio archive of the rpm file" -#define rptra6_trivial_usage \ +#define rptaddrs_trivial_usage \ -#define rptaddr6_full_usage "\n\n" \ +#define rptaddrs_full_usage "\n\n" \ -#define rptaddr6_trivial_usage \ +#define rptra6_trivial_usage \ #define rptra6_full_usage "\n\n" \ |