Attachment #227435 for bug #258048

View | Details | Raw Unified | Return to bug 258048
Collapse All | Expand All




#endif

#if defined(INET) && defined(INET6)
#define	OPTSTR PING6OPTS PING4OPTS
#elif defined(INET)
#define	OPTSTR PING4OPTS
#elif defined(INET6)
#define	OPTSTR PING6OPTS
#else
#define OPTSTR ""
#endif

int

		ipv6 = true;
#endif

	while ((ch = getopt(argc, argv, ":" OPTSTR)) != -1) {
		switch(ch) {
#ifdef INET
		case '4':

	    "[-G sweepmaxsize]\n"
	    "	    [-g sweepminsize] [-h sweepincrsize] [-i wait] "
	    "[-l preload]\n"
	    "	    [-M mask | time] [-m ttl] " 
#ifdef IPSEC
	    "[-P policy] "
#endif

	    "            [-z tos] IPv4-mcast-group\n"
#endif /* INET */
#ifdef INET6
            "\tping [-6AaDd"
#if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC)
            "E"
#endif




#ifndef MAIN_H
#define MAIN_H 1

#ifdef IPSEC
#include <netipsec/ipsec.h>
#endif /*IPSEC*/

#if defined(INET) && defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
 #define PING4ADDOPTS "P:"
#else
 #define PING4ADDOPTS
#endif
#define PING4OPTS "4AaC:c:DdfG:g:Hh:I:i:Ll:M:m:nop:QqRrS:s:T:t:vW:z:" PING4ADDOPTS

#if defined(INET6) && defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
 #define PING6ADDOPTS "P:"
#elif defined(INET6) && defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC)
 #define PING6ADDOPTS "ZE"
#else
 #define PING6ADDOPTS
#endif
#define PING6OPTS "6Aab:C:c:Dde:fHI:i:k:l:m:nNoOp:qS:s:t:uvyYW:z:" PING6ADDOPTS

void usage(void) __dead2;

#endif




	alarmtimeout = df = preload = tos = pcp = 0;

	outpack = outpackhdr + sizeof(struct ip);
	while ((ch = getopt(argc, argv, PING4OPTS)) != -1) {
		"4AaC:c:DdfG:g:Hh:I:i:Ll:M:m:nop:QqRrS:s:T:t:vW:z:"
#ifdef IPSEC
#ifdef IPSEC_POLICY_IPSEC
		"P:"
#endif /*IPSEC_POLICY_IPSEC*/
#endif /*IPSEC*/
		)) != -1)
	{
		switch(ch) {
		case '4':
			/* This option is processed in main(). */

Lines 293-299 static void pr_rthdr(void *, size_t); Link Here

(-)b/sbin/ping/ping6.c (-12 / +8 lines)
293	static int pr_bitrange(u_int32_t, int, int);	293	static int pr_bitrange(u_int32_t, int, int);
294	static void pr_retip(struct ip6_hdr , u_char );	294	static void pr_retip(struct ip6_hdr , u_char );
295	static void summary(void);	295	static void summary(void);
		296	#ifdef IPSEC
		297	#ifdef IPSEC_POLICY_IPSEC
296	static int setpolicy(int, char *);	298	static int setpolicy(int, char *);
		299	#endif
		300	#endif
297	static char nigroup(char , int);	301	static char nigroup(char , int);
298		302
299	int	303	int
Lines 345-362 ping6(int argc, char *argv[]) Link Here
345	alarmtimeout = preload = 0;	349	alarmtimeout = preload = 0;
346	datap = &outpack[ICMP6ECHOLEN + ICMP6ECHOTMLEN];	350	datap = &outpack[ICMP6ECHOLEN + ICMP6ECHOTMLEN];
347	capdns = capdns_setup();	351	capdns = capdns_setup();
348	#ifndef IPSEC	352
349	#define ADDOPTS	353	while ((ch = getopt(argc, argv, PING6OPTS)) != -1) {
350	#else
351	#ifdef IPSEC_POLICY_IPSEC
352	#define ADDOPTS "P:"
353	#else
354	#define ADDOPTS "ZE"
355	#endif /IPSEC_POLICY_IPSEC/
356	#endif
357	while ((ch = getopt(argc, argv,
358	"6k:b:C:c:DdfHe:m:I:i:l:unNop:qaAS:s:OvyYW:t:z:" ADDOPTS)) != -1) {
359	#undef ADDOPTS
360	switch (ch) {	354	switch (ch) {
361	case '6':	355	case '6':
362	/* This option is processed in main(). */	356	/* This option is processed in main(). */
Lines 2667-2673 pr_retip(struct ip6_hdr ip6, u_char end) Link Here
2667	nh = ip6->ip6_nxt;	2661	nh = ip6->ip6_nxt;
2668	cp += hlen;	2662	cp += hlen;
2669	while (end - cp >= 8) {	2663	while (end - cp >= 8) {
		2664	#ifdef IPSEC
2670	struct ah ah;	2665	struct ah ah;
		2666	#endif
2671		2667
2672	switch (nh) {	2668	switch (nh) {
2673	case IPPROTO_HOPOPTS:	2669	case IPPROTO_HOPOPTS:

Return to bug 258048

Lines 52-64 __FBSDID("$FreeBSD$"); Link Here

(-)b/sbin/ping/main.c (-8 / +6 lines)
52	#endif	52	#endif
53		53
54	#if defined(INET) && defined(INET6)	54	#if defined(INET) && defined(INET6)
55	#define OPTSTR ":46"	55	#define OPTSTR PING6OPTS PING4OPTS
56	#elif defined(INET)	56	#elif defined(INET)
57	#define OPTSTR ":4"	57	#define OPTSTR PING4OPTS
58	#elif defined(INET6)	58	#elif defined(INET6)
59	#define OPTSTR ":6"	59	#define OPTSTR PING6OPTS
60	#else
61	#define OPTSTR ""
62	#endif	60	#endif
63		61
64	int	62	int
Lines 82-88 main(int argc, char *argv[]) Link Here
82	ipv6 = true;	80	ipv6 = true;
83	#endif	81	#endif
84		82
85	while ((ch = getopt(argc, argv, OPTSTR)) != -1) {	83	while ((ch = getopt(argc, argv, ":" OPTSTR)) != -1) {
86	switch(ch) {	84	switch(ch) {
87	#ifdef INET	85	#ifdef INET
88	case '4':	86	case '4':
Lines 170-176 usage(void) Link Here
170	"[-G sweepmaxsize]\n"	168	"[-G sweepmaxsize]\n"
171	" [-g sweepminsize] [-h sweepincrsize] [-i wait] "	169	" [-g sweepminsize] [-h sweepincrsize] [-i wait] "
172	"[-l preload]\n"	170	"[-l preload]\n"
173	" [-M mask \| time] [-m ttl]"	171	" [-M mask \| time] [-m ttl] "
174	#ifdef IPSEC	172	#ifdef IPSEC
175	"[-P policy] "	173	"[-P policy] "
176	#endif	174	#endif
Lines 188-194 usage(void) Link Here
188	" [-z tos] IPv4-mcast-group\n"	186	" [-z tos] IPv4-mcast-group\n"
189	#endif /* INET */	187	#endif /* INET */
190	#ifdef INET6	188	#ifdef INET6
191	"\tping [-6aADd"	189	"\tping [-6AaDd"
192	#if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC)	190	#if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC)
193	"E"	191	"E"
194	#endif	192	#endif

Lines 31-36 Link Here

(-)b/sbin/ping/main.h (+20 lines)
31	#ifndef MAIN_H	31	#ifndef MAIN_H
32	#define MAIN_H 1	32	#define MAIN_H 1
33		33
		34	#ifdef IPSEC
		35	#include <netipsec/ipsec.h>
		36	#endif /IPSEC/
		37
		38	#if defined(INET) && defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
		39	#define PING4ADDOPTS "P:"
		40	#else
		41	#define PING4ADDOPTS
		42	#endif
		43	#define PING4OPTS "4AaC:c:DdfG:g:Hh:I:i:Ll:M:m:nop:QqRrS:s:T:t:vW:z:" PING4ADDOPTS
		44
		45	#if defined(INET6) && defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
		46	#define PING6ADDOPTS "P:"
		47	#elif defined(INET6) && defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC)
		48	#define PING6ADDOPTS "ZE"
		49	#else
		50	#define PING6ADDOPTS
		51	#endif
		52	#define PING6OPTS "6Aab:C:c:Dde:fHI:i:k:l:m:nNoOp:qS:s:t:uvyYW:z:" PING6ADDOPTS
		53
34	void usage(void) __dead2;	54	void usage(void) __dead2;
35		55
36	#endif	56	#endif

Lines 301-315 ping(int argc, char const argv) Link Here

(-)b/sbin/ping/ping.c (-9 / +1 lines)
301	alarmtimeout = df = preload = tos = pcp = 0;	301	alarmtimeout = df = preload = tos = pcp = 0;
302		302
303	outpack = outpackhdr + sizeof(struct ip);	303	outpack = outpackhdr + sizeof(struct ip);
304	while ((ch = getopt(argc, argv,	304	while ((ch = getopt(argc, argv, PING4OPTS)) != -1) {
305	"4AaC:c:DdfG:g:Hh:I:i:Ll:M:m:nop:QqRrS:s:T:t:vW:z:"
306	#ifdef IPSEC
307	#ifdef IPSEC_POLICY_IPSEC
308	"P:"
309	#endif /IPSEC_POLICY_IPSEC/
310	#endif /IPSEC/
311	)) != -1)
312	{
313	switch(ch) {	305	switch(ch) {
314	case '4':	306	case '4':
315	/* This option is processed in main(). */	307	/* This option is processed in main(). */