diff options
| author | David Heidelberg <david@ixit.cz> | 2017-07-17 15:28:47 +0200 |
|---|---|---|
| committer | David Heidelberg <david@ixit.cz> | 2017-07-18 21:29:23 +0200 |
| commit | 944a4cf9dc5ee137d6a0c10f8c93adf4c3a33bb0 (patch) | |
| tree | e277ffb50896944aa6cdab6bdaedf0116e8575e8 | |
| parent | cf14897a061e696423d79bc622a503f1b617d66c (diff) | |
| download | iputils-tos_fix.tar.gz | |
ping: fix conflicting definestos_fix
After ping and ping6 merge, defining F_FLOWINFO caused ipv4 ping starts
priting F_TIMESTAMP. This weird behaviour has been caused by defines overlap.
This behaviour couldn't happend when ping and ping6 has been standalone
binary, because separate codepaths.
Signed-off-by: David Heidelberg <david@ixit.cz>
| -rw-r--r-- | ping.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -81,9 +81,7 @@ extern int options; #define F_SO_DONTROUTE 0x080 #define F_VERBOSE 0x100 #define F_TIMESTAMP 0x200 -#define F_FLOWINFO 0x200 #define F_SOURCEROUTE 0x400 -#define F_TCLASS 0x400 #define F_FLOOD_POLL 0x800 #define F_LATENCY 0x1000 #define F_AUDIBLE 0x2000 @@ -94,6 +92,8 @@ extern int options; #define F_MARK 0x40000 #define F_PTIMEOFDAY 0x80000 #define F_OUTSTANDING 0x100000 +#define F_FLOWINFO 0x200000 +#define F_TCLASS 0x400000 /* * MAX_DUP_CHK is the number of bits in received table, i.e. the maximum |