#ifndef CONFIG_FEATURE_FANCY_PING6
static struct hostent *h;
-void noresp(int ign)
+static void noresp(int ign)
{
printf("No response from %s\n", h->h_name);
exit(EXIT_FAILURE);
c = sendto(pingsock, packet, DEFDATALEN + sizeof (struct icmp6_hdr), 0,
(struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in6));
- if (c < 0 || c != sizeof(packet))
+ if (c < 0 || c != sizeof(packet)) {
+ if (ENABLE_FEATURE_CLEAN_UP) close(pingsock);
bb_perror_msg_and_die("sendto");
+ }
signal(SIGALRM, noresp);
alarm(5); /* give the host 5000ms to respond */
break;
}
}
+ if (ENABLE_FEATURE_CLEAN_UP) close(pingsock);
printf("%s is alive!\n", h->h_name);
return;
}
/* full(er) version */
static struct sockaddr_in6 pingaddr;
static int pingsock = -1;
-static int datalen; /* intentionally uninitialized to work around gcc bug */
-static char* ifname;
+static unsigned datalen; /* intentionally uninitialized to work around gcc bug */
+static int if_index;
-static long ntransmitted, nreceived, nrepeats, pingcount;
+static unsigned long ntransmitted, nreceived, nrepeats, pingcount;
static int myid, options;
static unsigned long tmin = ULONG_MAX, tmax, tsum;
static char rcvd_tbl[MAX_DUP_CHK / 8];
-# ifdef CONFIG_FEATURE_FANCY_PING
-extern
-# endif
- struct hostent *hostent;
+static struct hostent *hostent;
static void sendping(int);
static void pingstats(int);
signal(SIGINT, SIG_IGN);
printf("\n--- %s ping statistics ---\n", hostent->h_name);
- printf("%ld packets transmitted, ", ntransmitted);
- printf("%ld packets received, ", nreceived);
+ printf("%lu packets transmitted, ", ntransmitted);
+ printf("%lu packets received, ", nreceived);
if (nrepeats)
- printf("%ld duplicates, ", nrepeats);
+ printf("%lu duplicates, ", nrepeats);
if (ntransmitted)
- printf("%ld%% packet loss\n",
+ printf("%lu%% packet loss\n",
(ntransmitted - nreceived) * 100 / ntransmitted);
if (nreceived)
printf("round-trip min/avg/max = %lu.%lu/%lu.%lu/%lu.%lu ms\n",
pkt->icmp6_type = ICMP6_ECHO_REQUEST;
pkt->icmp6_code = 0;
pkt->icmp6_cksum = 0;
- pkt->icmp6_seq = SWAP_BE16(ntransmitted++);
+ pkt->icmp6_seq = htons(ntransmitted++);
pkt->icmp6_id = myid;
CLR(pkt->icmp6_seq % MAX_DUP_CHK);
#ifndef MLD_LISTENER_REDUCTION
# define MLD_LISTENER_REDUCTION ICMP6_MEMBERSHIP_REDUCTION
#endif
-static char *icmp6_type_name (int id)
+static char *icmp6_type_name(int id)
{
switch (id) {
case ICMP6_DST_UNREACH: return "Destination Unreachable";
return;
icmppkt = (struct icmp6_hdr *) packet;
-
if (icmppkt->icmp6_id != myid)
- return; /* not our ping */
+ return; /* not our ping */
if (icmppkt->icmp6_type == ICMP6_ECHO_REPLY) {
- ++nreceived;
+ ++nreceived;
tp = (struct timeval *) &icmppkt->icmp6_data8[4];
if ((tv.tv_usec -= tp->tv_usec) < 0) {
triptime / 10, triptime % 10);
if (dupflag)
printf(" (DUP!)");
- printf("\n");
+ puts("");
} else
if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST)
- bb_error_msg("Warning: Got ICMP %d (%s)",
- icmppkt->icmp6_type, icmp6_type_name (icmppkt->icmp6_type));
+ bb_error_msg("warning: got ICMP %d (%s)",
+ icmppkt->icmp6_type, icmp6_type_name(icmppkt->icmp6_type));
}
static void ping(const char *host)
pingaddr.sin6_family = AF_INET6;
hostent = xgethostbyname2(host, AF_INET6);
if (hostent->h_addrtype != AF_INET6)
- bb_error_msg_and_die("unknown address type; only AF_INET6 is currently supported.");
+ bb_error_msg_and_die("unknown address type; only AF_INET6 is currently supported");
memcpy(&pingaddr.sin6_addr, hostent->h_addr, sizeof(pingaddr.sin6_addr));
struct icmp6_filter filt;
if (!(options & O_VERBOSE)) {
ICMP6_FILTER_SETBLOCKALL(&filt);
- ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filt);
+ ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filt);
} else {
ICMP6_FILTER_SETPASSALL(&filt);
}
setsockopt(pingsock, SOL_IPV6, IPV6_HOPLIMIT, (char *) &sockopt,
sizeof(sockopt));
- if (ifname) {
- if ((pingaddr.sin6_scope_id = if_nametoindex(ifname)) == 0)
- bb_error_msg_and_die("%s: invalid interface name", ifname);
- }
+ if (if_index)
+ pingaddr.sin6_scope_id = if_index;
printf("PING %s (%s): %d data bytes\n",
- hostent->h_name,
- inet_ntop(AF_INET6, &pingaddr.sin6_addr,
- buf, sizeof(buf)),
+ hostent->h_name,
+ inet_ntop(AF_INET6, &pingaddr.sin6_addr,
+ buf, sizeof(buf)),
datalen);
signal(SIGINT, pingstats);
sendping(0);
/* listen for replies */
- msg.msg_name=&from;
- msg.msg_namelen=sizeof(from);
- msg.msg_iov=&iov;
- msg.msg_iovlen=1;
- msg.msg_control=control_buf;
- iov.iov_base=packet;
- iov.iov_len=sizeof(packet);
+ msg.msg_name = &from;
+ msg.msg_namelen = sizeof(from);
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+ msg.msg_control = control_buf;
+ iov.iov_base = packet;
+ iov.iov_len = sizeof(packet);
while (1) {
int c;
struct cmsghdr *cmsgptr = NULL;
- int hoplimit=-1;
- msg.msg_controllen=sizeof(control_buf);
+ int hoplimit = -1;
+ msg.msg_controllen = sizeof(control_buf);
if ((c = recvmsg(pingsock, &msg, 0)) < 0) {
if (errno == EINTR)
cmsgptr = CMSG_NXTHDR(&msg, cmsgptr)) {
if (cmsgptr->cmsg_level == SOL_IPV6 &&
cmsgptr->cmsg_type == IPV6_HOPLIMIT ) {
- hoplimit=*(int*)CMSG_DATA(cmsgptr);
+ hoplimit = *(int*)CMSG_DATA(cmsgptr);
}
}
unpack(packet, c, &from, hoplimit);
argc--;
argv++;
- options = 0;
/* Parse any options */
while (argc >= 1 && **argv == '-') {
thisarg = *argv;
break;
case 'c':
if (--argc <= 0)
- bb_show_usage();
+ bb_show_usage();
argv++;
- pingcount = atoi(*argv);
+ pingcount = xatoul(*argv);
break;
case 's':
if (--argc <= 0)
- bb_show_usage();
+ bb_show_usage();
argv++;
- datalen = atoi(*argv);
+ datalen = xatou16(*argv);
break;
case 'I':
if (--argc <= 0)
- bb_show_usage();
+ bb_show_usage();
argv++;
- ifname = *argv;
+ if_index = if_nametoindex(*argv);
+ if (!if_index)
+ bb_error_msg_and_die(
+ "%s: invalid interface name", *argv);
break;
default:
bb_show_usage();
if (argc < 1)
bb_show_usage();
- myid = getpid() & 0xFFFF;
+ myid = (int16_t) getpid();
ping(*argv);
return EXIT_SUCCESS;
}
projects / oweals / busybox.git / blobdiff