diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2016-09-08 13:59:34 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2016-09-08 13:59:34 +0000 |
| commit | 295ac07191c73fbf7f1e736ed588ad420d343a37 (patch) | |
| tree | 893eabb7cce40f7857acbc80ba82c7c332305334 | |
| parent | 2ac1498565ec79af8dca1fa7c8ebeca739df4b9b (diff) | |
normalize option defines; reduces diff between ping(8) and ping6(8)
| -rw-r--r-- | sbin/ping/ping.c | 3 | ||||
| -rw-r--r-- | sbin/ping6/ping6.c | 18 |
2 files changed, 14 insertions, 7 deletions
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index bdac12df1d8..48e089195b4 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.153 2016/09/08 13:58:15 florian Exp $ */ +/* $OpenBSD: ping.c,v 1.154 2016/09/08 13:59:33 florian Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -115,6 +115,7 @@ int options; /* 0x0200 */ #define F_HDRINCL 0x0400 #define F_TTL 0x0800 +/* 0x1000 */ #define F_AUD_RECV 0x2000 #define F_AUD_MISS 0x4000 diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 0aef2689d21..f5111cdfc47 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping6.c,v 1.157 2016/09/07 17:56:00 florian Exp $ */ +/* $OpenBSD: ping6.c,v 1.158 2016/09/08 13:59:33 florian Exp $ */ /* $KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $ */ /* @@ -132,17 +132,23 @@ struct payload { #define CLR(bit) (A(bit) &= (~B(bit))) #define TST(bit) (A(bit) & B(bit)) +/* various options */ +int options; #define F_FLOOD 0x0001 #define F_INTERVAL 0x0002 +#define F_HOSTNAME 0x0004 #define F_PINGFILLED 0x0008 #define F_QUIET 0x0010 +/* 0x0020 */ #define F_SO_DEBUG 0x0040 +/* 0x0080 */ #define F_VERBOSE 0x0100 -/* 0x4000 */ -#define F_HOSTNAME 0x10000 -#define F_AUD_RECV 0x200000 -#define F_AUD_MISS 0x400000 -u_int options; +/* 0x0200 */ +/* 0x0400 */ +/* 0x0800 */ +/* 0x1000 */ +#define F_AUD_RECV 0x2000 +#define F_AUD_MISS 0x4000 /* multicast options */ int moptions; |