X-Git-Url: https://git.saurik.com/apple/network_cmds.git/blobdiff_plain/7af5ce03cf81eb8cf0c6e1bfd903b52fcc7c224a..e0b07f2d5ba2222268f5d1293221b413eb7c2655:/ping.tproj/ping.c diff --git a/ping.tproj/ping.c b/ping.tproj/ping.c index 8290b7a..58e7f80 100644 --- a/ping.tproj/ping.c +++ b/ping.tproj/ping.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2011 Apple Inc. All rights reserved. + * Copyright (c) 1999-2016 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -57,22 +57,14 @@ * SUCH DAMAGE. */ -#if 0 +#include + #ifndef lint -static const char copyright[] = +__unused static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint -static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; -#endif /* not lint */ -#endif -#include -#ifndef __APPLE__ -__FBSDID("$FreeBSD: src/sbin/ping/ping.c,v 1.112 2007/07/01 12:08:06 gnn Exp $"); -#endif - /* * P I N G . C * @@ -115,12 +107,14 @@ __FBSDID("$FreeBSD: src/sbin/ping/ping.c,v 1.112 2007/07/01 12:08:06 gnn Exp $") #include #include #include +#include #include #include #include #include #include #include +#include #define INADDR_LEN ((int)sizeof(in_addr_t)) #define TIMEVAL_LEN ((int)sizeof(struct tv32)) @@ -175,6 +169,8 @@ int options; #define F_TIME 0x100000 #define F_SWEEP 0x200000 #define F_WAITTIME 0x400000 +#define F_CONNECT 0x800000 +#define F_PRTIME 0x1000000 /* * MAX_DUP_CHK is the number of bits in received table, i.e. the maximum @@ -203,12 +199,11 @@ int phdr_len = 0; int send_len; char *boundif; unsigned int ifscope; -#if defined(IP_FORCE_OUT_IFP) && TARGET_OS_EMBEDDED -char boundifname[IFNAMSIZ]; -#endif /* IP_FORCE_OUT_IFP */ int nocell; -int how_traffic_class = 0; +int use_sendmsg = 0; +int use_recvmsg = 0; int traffic_class = SO_TC_CTL; /* use control class, by default */ +int net_service_type = -1; int no_dup = 0; /* counters */ @@ -226,6 +221,7 @@ int sweepincr = 1; /* payload increment in sweep */ int interval = 1000; /* interval between packets, ms */ int waittime = MAXWAIT; /* timeout for each packet */ long nrcvtimeout = 0; /* # of packets we got back after waittime */ +int icmp_len = 0; /* length of the ICMP header */ /* timing */ int timing; /* flag to do timing */ @@ -250,13 +246,29 @@ static void pr_pack(char *, int, struct sockaddr_in *, struct timeval *, int); static void pr_retip(struct ip *); static void status(int); static void stopit(int); -static void tvsub(struct timeval *, struct timeval *); +static void tvsub(struct timeval *, const struct timeval *); +static int str2sotc(const char *, bool *); +static int str2netservicetype(const char *, bool *); +static u_int8_t str2tos(const char *, bool *); static void usage(void) __dead2; +int32_t thiszone; /* seconds offset from gmt to local time */ +extern int32_t gmt2local(time_t); +static void pr_currenttime(void); + +static int longopt_flag = 0; + +#define LOF_CONNECT 0x01 +#define LOF_PRTIME 0x02 + +static const struct option longopts[] = { + { "apple-connect", no_argument, &longopt_flag, LOF_CONNECT }, + { "apple-time", no_argument, &longopt_flag, LOF_PRTIME }, + { NULL, 0, NULL, 0 } +}; + int -main(argc, argv) - int argc; - char *const *argv; +main(int argc, char *const *argv) { struct sockaddr_in from, sock_in; struct in_addr ifaddr; @@ -266,7 +278,7 @@ main(argc, argv) struct msghdr msg; struct sigaction si_sa; size_t sz; - u_char *datap, packet[IP_MAXPACKET]; + u_char *datap, packet[IP_MAXPACKET] __attribute__((aligned(4))); char *ep, *source, *target, *payload; struct hostent *hp; #ifdef IPSEC_POLICY_IPSEC @@ -275,7 +287,7 @@ main(argc, argv) struct sockaddr_in *to; double t; u_long alarmtimeout, ultmp; - int almost_done, ch, df, hold, i, icmp_len, mib[4], preload, sockerrno, + int almost_done, ch, df, hold, i, mib[4], preload, sockerrno, tos, ttl; char ctrl[CMSG_SPACE(sizeof(struct timeval)) + CMSG_SPACE(sizeof(int))]; char hnamebuf[MAXHOSTNAMELEN], snamebuf[MAXHOSTNAMELEN]; @@ -288,6 +300,7 @@ main(argc, argv) #ifdef IPSEC_POLICY_IPSEC policy_in = policy_out = NULL; #endif + bool valid; /* * Do the stuff that we need root priv's for *first*, and @@ -300,23 +313,16 @@ main(argc, argv) s = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); sockerrno = errno; - setuid(getuid()); + if (setuid(getuid()) != 0) + err(EX_NOPERM, "setuid() failed"); uid = getuid(); alarmtimeout = df = preload = tos = 0; outpack = outpackhdr + sizeof(struct ip); - while ((ch = getopt(argc, argv, - "Aab:Cc:DdfG:g:h:I:i:k:Ll:M:m:nop:QqRrS:s:T:t:vW:z:" -#ifdef IPSEC -#ifdef IPSEC_POLICY_IPSEC - "P:" -#endif /*IPSEC_POLICY_IPSEC*/ -#endif /*IPSEC*/ -#if defined(IP_FORCE_OUT_IFP) && TARGET_OS_EMBEDDED - "B:" -#endif /* IP_FORCE_OUT_IFP */ - )) != -1) + while ((ch = getopt_long(argc, argv, + "AaB:b:Cc:DdfG:g:h:I:i:k:K:Ll:M:m:noP:p:QqRrS:s:T:t:vW:z:", + longopts, NULL)) != -1) { switch(ch) { case 'A': @@ -325,12 +331,7 @@ main(argc, argv) case 'a': options |= F_AUDIBLE; break; -#if defined(IP_FORCE_OUT_IFP) && TARGET_OS_EMBEDDED case 'B': - (void) snprintf(boundifname, sizeof (boundifname), - "%s", optarg); - break; -#endif /* IP_FORCE_OUT_IFP */ case 'b': boundif = optarg; break; @@ -422,14 +423,36 @@ main(argc, argv) optarg); options |= F_INTERVAL; interval = (int)t; - if (uid && interval < 1000) { + if (uid && interval < 100) { errno = EPERM; err(EX_NOPERM, "-i interval too short"); } break; case 'k': - how_traffic_class++; - traffic_class = atoi(optarg); + if (strcasecmp(optarg, "sendmsg") == 0) { + use_sendmsg++; + break; + } + if (strcasecmp(optarg, "recvmsg") == 0) { + use_recvmsg++; + break; + } + traffic_class = str2sotc(optarg, &valid); + if (valid == false) + errx(EX_USAGE, "bad traffic class: `%s'", + optarg); + break; + case 'K': + if (strcasecmp(optarg, "sendmsg") == 0) { + use_sendmsg++; + break; + } + net_service_type = str2netservicetype(optarg, &valid); + if (valid == false) + errx(EX_USAGE, "bad network service type: `%s'", + optarg); + /* suppress default traffic class (-k can still be specified after -K) */ + traffic_class = -1; break; case 'L': options |= F_NOLOOP; @@ -474,9 +497,9 @@ main(argc, argv) case 'o': options |= F_ONCE; break; + case 'P': #ifdef IPSEC #ifdef IPSEC_POLICY_IPSEC - case 'P': options |= F_POLICY; if (!strncmp("in", optarg, 2)) policy_in = strdup(optarg); @@ -484,9 +507,9 @@ main(argc, argv) policy_out = strdup(optarg); else errx(1, "invalid security policy"); - break; #endif /*IPSEC_POLICY_IPSEC*/ #endif /*IPSEC*/ + break; case 'p': /* fill buffer with user pattern */ options |= F_PINGFILLED; payload = optarg; @@ -552,10 +575,23 @@ main(argc, argv) break; case 'z': options |= F_HDRINCL; - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg || ultmp > MAXTOS) + tos = str2tos(optarg, &valid); + if (valid == false) errx(EX_USAGE, "invalid TOS: `%s'", optarg); - tos = ultmp; + break; + case 0: + switch (longopt_flag) { + case LOF_CONNECT: + options |= F_CONNECT; + break; + case LOF_PRTIME: + options |= F_PRTIME; + thiszone = gmt2local(0); + break; + default: + break; + } + longopt_flag = 0; break; default: usage(); @@ -618,13 +654,16 @@ main(argc, argv) errx(1, "gethostbyname2: illegal address"); memcpy(&sock_in.sin_addr, hp->h_addr_list[0], sizeof(sock_in.sin_addr)); - (void)strncpy(snamebuf, hp->h_name, - sizeof(snamebuf) - 1); - snamebuf[sizeof(snamebuf) - 1] = '\0'; + (void)strlcpy(snamebuf, hp->h_name, + sizeof(snamebuf)); shostname = snamebuf; } if (bind(s, (struct sockaddr *)&sock_in, sizeof sock_in) == -1) +#if (DEBUG || DEVELOPMENT) + options |= F_HDRINCL; +#else err(1, "bind"); +#endif /* DEBUG || DEVELOPMENT */ } bzero(&whereto, sizeof(whereto)); @@ -642,8 +681,7 @@ main(argc, argv) if ((unsigned)hp->h_length > sizeof(to->sin_addr)) errx(1, "gethostbyname2 returned an illegal address"); memcpy(&to->sin_addr, hp->h_addr_list[0], sizeof to->sin_addr); - (void)strncpy(hnamebuf, hp->h_name, sizeof(hnamebuf) - 1); - hnamebuf[sizeof(hnamebuf) - 1] = '\0'; + (void)strlcpy(hnamebuf, hp->h_name, sizeof(hnamebuf)); hostname = hnamebuf; } @@ -682,11 +720,8 @@ main(argc, argv) errx(EX_USAGE, "-I, -L, -T flags cannot be used with unicast destination"); - if (datalen >= TIMEVAL_LEN) /* can we time transfer */ - timing = 1; - if (!(options & F_PINGFILLED)) - for (i = TIMEVAL_LEN; i < datalen; ++i) + for (i = TIMEVAL_LEN; i < MAX(datalen, sweepmax); ++i) *datap++ = i; ident = getpid() & 0xFFFF; @@ -696,18 +731,13 @@ main(argc, argv) err(EX_OSERR, "socket"); } hold = 1; + (void) setsockopt(s, SOL_SOCKET, SO_RECV_ANYIF, (char *)&hold, + sizeof(hold)); if (ifscope != 0) { if (setsockopt(s, IPPROTO_IP, IP_BOUND_IF, (char *)&ifscope, sizeof (ifscope)) != 0) err(EX_OSERR, "setsockopt(IP_BOUND_IF)"); } -#if defined(IP_FORCE_OUT_IFP) && TARGET_OS_EMBEDDED - else if (boundifname[0] != 0) { - if (setsockopt(s, IPPROTO_IP, IP_FORCE_OUT_IFP, boundifname, - sizeof (boundifname)) != 0) - err(EX_OSERR, "setsockopt(IP_FORCE_OUT_IFP)"); - } -#endif /* IP_FORCE_OUT_IFP */ if (nocell) { if (setsockopt(s, IPPROTO_IP, IP_NO_IFT_CELLULAR, (char *)&nocell, sizeof (nocell)) != 0) @@ -719,11 +749,19 @@ main(argc, argv) if (options & F_SO_DONTROUTE) (void)setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)&hold, sizeof(hold)); - if (how_traffic_class < 2 && traffic_class >= 0) { - (void) setsockopt(s, SOL_SOCKET, SO_TRAFFIC_CLASS, - (void *)&traffic_class, sizeof (traffic_class)); + if (use_sendmsg == 0) { + if (net_service_type != -1) + if (setsockopt(s, SOL_SOCKET, SO_NET_SERVICE_TYPE, + (void *)&net_service_type, sizeof (net_service_type)) != 0) + warn("setsockopt(SO_NET_SERVICE_TYPE"); + if (traffic_class != -1) { + if (setsockopt(s, SOL_SOCKET, SO_TRAFFIC_CLASS, + (void *)&traffic_class, sizeof (traffic_class)) != 0) + warn("setsockopt(SO_TRAFFIC_CLASS"); + + } } - if (how_traffic_class > 0) { + if (use_recvmsg > 0) { int on = 1; (void) setsockopt(s, SOL_SOCKET, SO_RECV_TRAFFIC_CLASS, (void *)&on, sizeof (on)); @@ -826,6 +864,12 @@ main(argc, argv) err(EX_OSERR, "setsockopt SO_TIMESTAMP"); } #endif + + if ((options & F_CONNECT)) { + if (connect(s, (struct sockaddr *)&whereto, sizeof whereto) == -1) + err(EX_OSERR, "connect"); + } + if (sweepmax) { if (sweepmin >= sweepmax) errx(EX_USAGE, "Maximum packet size must be greater than the minimum packet size"); @@ -882,6 +926,16 @@ main(argc, argv) (void)printf("PING %s: %d data bytes\n", hostname, datalen); } + /* + * rdar://25829310 + * + * Clear blocked signals inherited from the parent + */ + sigset_t newset; + sigemptyset(&newset); + if (sigprocmask(SIG_SETMASK, &newset, NULL) != 0) + err(EX_OSERR, "sigprocmask(newset)"); + /* * Use sigaction() instead of signal() to get unambiguous semantics, * in particular with SA_RESTART not set. @@ -894,17 +948,21 @@ main(argc, argv) if (sigaction(SIGINT, &si_sa, 0) == -1) { err(EX_OSERR, "sigaction SIGINT"); } - + si_sa.sa_handler = stopit; + if (sigaction(SIGQUIT, &si_sa, 0) == -1) { + err(EX_OSERR, "sigaction SIGQUIT"); + } + si_sa.sa_handler = status; if (sigaction(SIGINFO, &si_sa, 0) == -1) { - err(EX_OSERR, "sigaction"); + err(EX_OSERR, "sigaction SIGINFO"); } - if (alarmtimeout > 0) { + if (alarmtimeout > 0) { si_sa.sa_handler = stopit; if (sigaction(SIGALRM, &si_sa, 0) == -1) err(EX_OSERR, "sigaction SIGALRM"); - } + } bzero(&msg, sizeof(msg)); msg.msg_name = (caddr_t)&from; @@ -965,7 +1023,7 @@ main(argc, argv) if (n == 1) { struct timeval *tv = NULL; #ifdef SO_TIMESTAMP - struct cmsghdr *cmsg = (struct cmsghdr *)&ctrl; + struct cmsghdr *cmsg; msg.msg_controllen = sizeof(ctrl); #endif @@ -977,7 +1035,7 @@ main(argc, argv) continue; } for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { - #ifdef SO_TIMESTAMP +#ifdef SO_TIMESTAMP if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_TIMESTAMP && cmsg->cmsg_len == CMSG_LEN(sizeof *tv)) { @@ -985,7 +1043,7 @@ main(argc, argv) memcpy(&now, CMSG_DATA(cmsg), sizeof(now)); tv = &now; } - #endif +#endif if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TRAFFIC_CLASS && cmsg->cmsg_len == CMSG_LEN(sizeof(int))) { @@ -1004,8 +1062,6 @@ main(argc, argv) } if (n == 0 || options & F_FLOOD) { if (sweepmax && sntransmitted == snpackets) { - for (i = 0; i < sweepincr ; ++i) - *datap++ = i; datalen += sweepincr; if (datalen > sweepmax) break; @@ -1033,8 +1089,12 @@ main(argc, argv) nmissedmax = ntransmitted - nreceived - 1; if (options & F_MISSED) (void)write(STDOUT_FILENO, &BBELL, 1); - if (!(options & F_QUIET)) - printf("Request timeout for icmp_seq %ld\n", ntransmitted - 2); + if (!(options & F_QUIET)) { + printf("Request timeout for icmp_seq %u\n", + (uint16_t)(ntransmitted - 2)); + if (!(options & F_FLOOD)) + (void)fflush(stdout); + } } } } @@ -1050,8 +1110,7 @@ main(argc, argv) * to be called from a signal handler. */ void -stopit(sig) - int sig __unused; +stopit(int sig __unused) { /* @@ -1091,6 +1150,11 @@ pinger(void) CLR(ntransmitted % mx_dup_ck); + if (datalen >= TIMEVAL_LEN) /* can we time transfer */ + timing = 1; + else + timing = 0; + if ((options & F_TIME) || timing) { (void)gettimeofday(&now, NULL); @@ -1117,34 +1181,55 @@ pinger(void) ip->ip_sum = in_cksum((u_short *)outpackhdr, cc); packet = outpackhdr; } - if (how_traffic_class > 1 && traffic_class >= 0) { + if (use_sendmsg > 0) { struct msghdr msg; struct iovec iov; - char *cmbuf[CMSG_SPACE(sizeof(int))]; + char cmbuf[2 * CMSG_SPACE(sizeof(int))]; struct cmsghdr *cm = (struct cmsghdr *)cmbuf; + if ((options & F_CONNECT)) { + msg.msg_name = NULL; + msg.msg_namelen = 0; + } else { msg.msg_name = &whereto; msg.msg_namelen = sizeof(whereto); - + } iov.iov_base = packet; iov.iov_len = cc; msg.msg_iov = &iov; msg.msg_iovlen = 1; - cm->cmsg_len = CMSG_LEN(sizeof(int)); - cm->cmsg_level = SOL_SOCKET; - cm->cmsg_type = SO_TRAFFIC_CLASS; - *(int *)CMSG_DATA(cm) = traffic_class; - msg.msg_control = cm; - msg.msg_controllen = CMSG_SPACE(sizeof(int)); + msg.msg_controllen = 0; + msg.msg_control = NULL; + + if (traffic_class >= 0) { + cm->cmsg_len = CMSG_LEN(sizeof(int)); + cm->cmsg_level = SOL_SOCKET; + cm->cmsg_type = SO_TRAFFIC_CLASS; + *(int *)CMSG_DATA(cm) = traffic_class; + msg.msg_controllen += CMSG_SPACE(sizeof(int)); + cm = (struct cmsghdr *)(((char *)cm) + CMSG_SPACE(sizeof(int))); + } + if (net_service_type >= 0) { + cm->cmsg_len = CMSG_LEN(sizeof(int)); + cm->cmsg_level = SOL_SOCKET; + cm->cmsg_type = SO_NET_SERVICE_TYPE; + msg.msg_controllen += CMSG_SPACE(sizeof(int)); + *(int *)CMSG_DATA(cm) = net_service_type; + } + msg.msg_control = cmbuf; msg.msg_flags = 0; i = sendmsg(s, &msg, 0); } else { + if ((options & F_CONNECT)) { + i = send(s, (char *)packet, cc, 0); + } else { i = sendto(s, (char *)packet, cc, 0, (struct sockaddr *)&whereto, sizeof(whereto)); } + } if (i < 0 || i != cc) { if (i < 0) { if (options & F_FLOOD && errno == ENOBUFS) { @@ -1171,12 +1256,8 @@ pinger(void) * program to be run without having intermingled output (or statistics!). */ static void -pr_pack(buf, cc, from, tv, tc) - char *buf; - int cc; - struct sockaddr_in *from; - struct timeval *tv; - int tc; +pr_pack(char *buf, int cc, struct sockaddr_in *from, struct timeval *tv, + int tc) { struct in_addr ina; u_char *cp, *dp; @@ -1257,6 +1338,19 @@ pr_pack(buf, cc, from, tv, tc) if (options & F_FLOOD) (void)write(STDOUT_FILENO, &BSPACE, 1); else { + int seq_sent_len = send_len; + int seq_datalen = datalen; + + if (sweepmax != 0) { + /* + * When sweeping take in account the length of that + * was sent based on the sequence number + */ + seq_datalen = sweepmin + (seq / snpackets) * sweepincr; + seq_sent_len = icmp_len + seq_datalen; + } + if (options & F_PRTIME) + pr_currenttime(); (void)printf("%d bytes from %s: icmp_seq=%u", cc, inet_ntoa(*(struct in_addr *)&from->sin_addr.s_addr), seq); @@ -1281,10 +1375,10 @@ pr_pack(buf, cc, from, tv, tc) (void)printf(" tsr=%s", pr_ntime(icp->icmp_rtime)); (void)printf(" tst=%s", pr_ntime(icp->icmp_ttime)); } - if (recv_len != send_len) { + if (recv_len != seq_sent_len) { (void)printf( "\nwrong total length %d instead of %d", - recv_len, send_len); + recv_len, seq_sent_len); } /* check the data */ cp = (u_char*)&icp->icmp_data[phdr_len]; @@ -1297,21 +1391,21 @@ pr_pack(buf, cc, from, tv, tc) cc -= TIMEVAL_LEN; i += TIMEVAL_LEN; } - for (; i < datalen && cc > 0; ++i, ++cp, ++dp, --cc) { + for (; i < seq_datalen && cc > 0; ++i, ++cp, ++dp, --cc) { if (*cp != *dp) { (void)printf("\nwrong data byte #%d should be 0x%x but was 0x%x", i, *dp, *cp); (void)printf("\ncp:"); cp = (u_char*)&icp->icmp_data[0]; - for (i = 0; i < datalen; ++i, ++cp) { - if ((i % 16) == 8) + for (i = 0; i < seq_datalen; ++i, ++cp) { + if ((i % 16) == 0) (void)printf("\n\t"); (void)printf("%2x ", *cp); } (void)printf("\ndp:"); cp = &outpack[ICMP_MINLEN]; - for (i = 0; i < datalen; ++i, ++cp) { - if ((i % 16) == 8) + for (i = 0; i < seq_datalen; ++i, ++cp) { + if ((i % 16) == 0) (void)printf("\n\t"); (void)printf("%2x ", *cp); } @@ -1343,6 +1437,8 @@ pr_pack(buf, cc, from, tv, tc) (oip->ip_p == IPPROTO_ICMP) && (oicmp->icmp_type == ICMP_ECHO) && (oicmp->icmp_id == ident))) { + if (options & F_PRTIME) + pr_currenttime(); (void)printf("%d bytes from %s: ", cc, pr_addr(from->sin_addr)); pr_icmph(icp); @@ -1444,9 +1540,7 @@ pr_pack(buf, cc, from, tv, tc) * Checksum routine for Internet Protocol family headers (C Version) */ u_short -in_cksum(addr, len) - u_short *addr; - int len; +in_cksum(u_short *addr, int len) { int nleft, sum; u_short *w; @@ -1490,8 +1584,7 @@ in_cksum(addr, len) * be >= in. */ static void -tvsub(out, in) - struct timeval *out, *in; +tvsub(struct timeval *out, const struct timeval *in) { if ((out->tv_usec -= in->tv_usec) < 0) { @@ -1507,15 +1600,14 @@ tvsub(out, in) */ static void -status(sig) - int sig __unused; +status(int sig __unused) { siginfo_p = 1; } static void -check_status() +check_status(void) { if (siginfo_p) { @@ -1535,7 +1627,7 @@ check_status() * Print out statistics, and give up. */ static void -finish() +finish(void) { (void)signal(SIGINT, SIG_IGN); @@ -1594,8 +1686,7 @@ static char *ttab[] = { * Print a descriptive string about an ICMP header. */ static void -pr_icmph(icp) - struct icmp *icp; +pr_icmph(struct icmp *icp) { switch(icp->icmp_type) { @@ -1742,8 +1833,7 @@ pr_icmph(icp) * Print an IP header with options. */ static void -pr_iph(ip) - struct ip *ip; +pr_iph(struct ip *ip) { u_char *cp; int hlen; @@ -1775,8 +1865,7 @@ pr_iph(ip) * a hostname. */ static char * -pr_addr(ina) - struct in_addr ina; +pr_addr(struct in_addr ina) { struct hostent *hp; static char buf[16 + 3 + MAXHOSTNAMELEN]; @@ -1795,8 +1884,7 @@ pr_addr(ina) * Dump some info on a returned (via ICMP) IP packet. */ static void -pr_retip(ip) - struct ip *ip; +pr_retip(struct ip *ip) { u_char *cp; int hlen; @@ -1814,7 +1902,7 @@ pr_retip(ip) } static char * -pr_ntime (n_time timestamp) +pr_ntime(n_time timestamp) { static char buf[10]; int hour, min, sec; @@ -1830,8 +1918,7 @@ pr_ntime (n_time timestamp) } static void -fill(bp, patp) - char *bp, *patp; +fill(char *bp, char *patp) { char *cp; int pat[16]; @@ -1861,23 +1948,187 @@ fill(bp, patp) } } +int +str2sotc(const char *str, bool *valid) +{ + int sotc = -1; + char *endptr; + + *valid = true; + + if (str == NULL || *str == '\0') + *valid = false; + else if (strcasecmp(str, "BK_SYS") == 0) + return SO_TC_BK_SYS; + else if (strcasecmp(str, "BK") == 0) + return SO_TC_BK; + else if (strcasecmp(str, "BE") == 0) + return SO_TC_BE; + else if (strcasecmp(str, "RD") == 0) + return SO_TC_RD; + else if (strcasecmp(str, "OAM") == 0) + return SO_TC_OAM; + else if (strcasecmp(str, "AV") == 0) + return SO_TC_AV; + else if (strcasecmp(str, "RV") == 0) + return SO_TC_RV; + else if (strcasecmp(str, "VI") == 0) + return SO_TC_VI; + else if (strcasecmp(str, "VO") == 0) + return SO_TC_VO; + else if (strcasecmp(str, "CTL") == 0) + return SO_TC_CTL; + else { + sotc = (int)strtol(str, &endptr, 0); + if (*endptr != '\0') + *valid = false; + } + return (sotc); +} + +int +str2netservicetype(const char *str, bool *valid) +{ + int svc = -1; + char *endptr; + + *valid = true; + + if (str == NULL || *str == '\0') + *valid = false; + else if (strcasecmp(str, "BK") == 0) + return NET_SERVICE_TYPE_BK; + else if (strcasecmp(str, "BE") == 0) + return NET_SERVICE_TYPE_BE; + else if (strcasecmp(str, "VI") == 0) + return NET_SERVICE_TYPE_VI; + else if (strcasecmp(str, "SIG") == 0) + return NET_SERVICE_TYPE_SIG; + else if (strcasecmp(str, "VO") == 0) + return NET_SERVICE_TYPE_VO; + else if (strcasecmp(str, "RV") == 0) + return NET_SERVICE_TYPE_RV; + else if (strcasecmp(str, "AV") == 0) + return NET_SERVICE_TYPE_AV; + else if (strcasecmp(str, "OAM") == 0) + return NET_SERVICE_TYPE_OAM; + else if (strcasecmp(str, "RD") == 0) + return NET_SERVICE_TYPE_RD; + else { + svc = (int)strtol(str, &endptr, 0); + if (*endptr != '\0') + *valid = false; + } + return (svc); +} + +u_int8_t +str2tos(const char *str, bool *valid) +{ + u_int8_t dscp = -1; + char *endptr; + + *valid = true; + + if (str == NULL || *str == '\0') + *valid = false; + else if (strcasecmp(str, "DF") == 0) + dscp = _DSCP_DF; + else if (strcasecmp(str, "EF") == 0) + dscp = _DSCP_EF; + else if (strcasecmp(str, "VA") == 0) + dscp = _DSCP_VA; + + else if (strcasecmp(str, "CS0") == 0) + dscp = _DSCP_CS0; + else if (strcasecmp(str, "CS1") == 0) + dscp = _DSCP_CS1; + else if (strcasecmp(str, "CS2") == 0) + dscp = _DSCP_CS2; + else if (strcasecmp(str, "CS3") == 0) + dscp = _DSCP_CS3; + else if (strcasecmp(str, "CS4") == 0) + dscp = _DSCP_CS4; + else if (strcasecmp(str, "CS5") == 0) + dscp = _DSCP_CS5; + else if (strcasecmp(str, "CS6") == 0) + dscp = _DSCP_CS6; + else if (strcasecmp(str, "CS7") == 0) + dscp = _DSCP_CS7; + + else if (strcasecmp(str, "AF11") == 0) + dscp = _DSCP_AF11; + else if (strcasecmp(str, "AF12") == 0) + dscp = _DSCP_AF12; + else if (strcasecmp(str, "AF13") == 0) + dscp = _DSCP_AF13; + else if (strcasecmp(str, "AF21") == 0) + dscp = _DSCP_AF21; + else if (strcasecmp(str, "AF22") == 0) + dscp = _DSCP_AF22; + else if (strcasecmp(str, "AF23") == 0) + dscp = _DSCP_AF23; + else if (strcasecmp(str, "AF31") == 0) + dscp = _DSCP_AF31; + else if (strcasecmp(str, "AF32") == 0) + dscp = _DSCP_AF32; + else if (strcasecmp(str, "AF33") == 0) + dscp = _DSCP_AF33; + else if (strcasecmp(str, "AF41") == 0) + dscp = _DSCP_AF41; + else if (strcasecmp(str, "AF42") == 0) + dscp = _DSCP_AF42; + else if (strcasecmp(str, "AF43") == 0) + dscp = _DSCP_AF43; + + else { + unsigned long val = strtoul(str, &endptr, 0); + if (*endptr != '\0' || val > 255) + *valid = false; + else + return ((u_int8_t)val); + } + /* DSCP occupies the 6 upper bits of the TOS field */ + return (dscp << 2); +} + +void +pr_currenttime(void) +{ + int s; + struct timeval tv; + + gettimeofday(&tv, NULL); + + s = (tv.tv_sec + thiszone) % 86400; + printf("%02d:%02d:%02d.%06u ", s / 3600, (s % 3600) / 60, s % 60, + (u_int32_t)tv.tv_usec); +} + #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) #define SECOPT " [-P policy]" #else #define SECOPT "" #endif static void -usage() +usage(void) { - (void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", -"usage: ping [-AaDdfnoQqRrv] [-b boundif] [-c count] [-G sweepmaxsize] [-g sweepminsize]", -" [-h sweepincrsize] [-i wait] [-l preload] [-M mask | time] [-m ttl]", -" " SECOPT " [-p pattern] [-S src_addr] [-s packetsize] [-t timeout]", -" [-W waittime] [-z tos] host", -" ping [-AaDdfLnoQqRrv] [-c count] [-I iface] [-i wait] [-l preload]", -" [-M mask | time] [-m ttl]" SECOPT " [-p pattern] [-S src_addr]", + (void)fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", +"usage: ping [-AaDdfnoQqRrv] [-c count] [-G sweepmaxsize]", +" [-g sweepminsize] [-h sweepincrsize] [-i wait]", +" [-l preload] [-M mask | time] [-m ttl]" SECOPT " [-p pattern]", +" [-S src_addr] [-s packetsize] [-t timeout][-W waittime]", +" [-z tos] host", +" ping [-AaDdfLnoQqRrv] [-c count] [-I iface] [-i wait]", +" [-l preload] [-M mask | time] [-m ttl]" SECOPT " [-p pattern] [-S src_addr]", " [-s packetsize] [-T ttl] [-t timeout] [-W waittime]", " [-z tos] mcast-group"); + (void)fprintf(stderr, "Apple specific options (to be specified before mcast-group or host like all options)\n"); + (void)fprintf(stderr, " -b boundif # bind the socket to the interface\n"); + (void)fprintf(stderr, " -k traffic_class # set traffic class socket option\n"); + (void)fprintf(stderr, " -K net_service_type # set traffic class socket options\n"); + (void)fprintf(stderr, " -apple-connect # call connect(2) in the socket\n"); + (void)fprintf(stderr, " -apple-time # display current time\n"); exit(EX_USAGE); }