projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops. Since dirent.h depends on BB_FEATURE_SH_TAB_COMPLETION, put it
[oweals/busybox.git]
/
ping.c
diff --git
a/ping.c
b/ping.c
index a4363098e6e341fede7a4b8727667fe6944f1edd..50c7ce6e64f98344996b7369adaee3eab9afe725 100644
(file)
--- a/
ping.c
+++ b/
ping.c
@@
-1,6
+1,6
@@
/* vi: set sw=4 ts=4: */
/*
/* vi: set sw=4 ts=4: */
/*
- * $Id: ping.c,v 1.
26 2000/11/14 23:29:24
andersen Exp $
+ * $Id: ping.c,v 1.
38 2001/02/20 06:14:08
andersen Exp $
* Mini ping implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
* Mini ping implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@
-31,7
+31,6
@@
* Original copyright notice is retained at the end of this file.
*/
* Original copyright notice is retained at the end of this file.
*/
-#include "busybox.h"
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/file.h>
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/file.h>
@@
-47,6
+46,10
@@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include "busybox.h"
/* It turns out that libc5 doesn't have proper icmp support
/* It turns out that libc5 doesn't have proper icmp support
@@
-54,7
+57,7
@@
#if ! defined __GLIBC__ && ! defined __UCLIBC__
typedef unsigned int socklen_t;
#if ! defined __GLIBC__ && ! defined __UCLIBC__
typedef unsigned int socklen_t;
-
#define ICMP_MINLEN 8
/* abs minimum */
+
static const int ICMP_MINLEN = 8;
/* abs minimum */
struct icmp_ra_addr
{
struct icmp_ra_addr
{
@@
-130,13
+133,13
@@
struct icmp
};
#endif
};
#endif
-#define DEFDATALEN 56
-#define MAXIPLEN 60
-#define MAXICMPLEN 76
-#define MAXPACKET 65468
+static const int DEFDATALEN = 56;
+static const int MAXIPLEN = 60;
+static const int MAXICMPLEN = 76;
+static const int MAXPACKET = 65468;
#define MAX_DUP_CHK (8 * 128)
#define MAX_DUP_CHK (8 * 128)
-#define MAXWAIT 10
-
#define PINGINTERVAL 1
/* second */
+static const int MAXWAIT = 10;
+
static const int PINGINTERVAL = 1;
/* second */
#define O_QUIET (1 << 0)
#define O_QUIET (1 << 0)
@@
-190,10
+193,8
@@
static void ping(const char *host)
int pingsock, c;
char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
int pingsock, c;
char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
- if ((pingsock = socket(AF_INET, SOCK_RAW, 1)) < 0) { /* 1 == ICMP */
- perror("ping: creating a raw socket");
- exit(1);
- }
+ if ((pingsock = socket(AF_INET, SOCK_RAW, 1)) < 0) /* 1 == ICMP */
+ perror_msg_and_die("creating a raw socket");
/* drop root privs if running setuid */
setuid(getuid());
/* drop root privs if running setuid */
setuid(getuid());
@@
-202,7
+203,7
@@
static void ping(const char *host)
pingaddr.sin_family = AF_INET;
if (!(h = gethostbyname(host))) {
pingaddr.sin_family = AF_INET;
if (!(h = gethostbyname(host))) {
- error
Msg("unknown host %s\n
", host);
+ error
_msg("unknown host %s
", host);
exit(1);
}
memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr));
exit(1);
}
memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr));
@@
-216,12
+217,8
@@
static void ping(const char *host)
c = sendto(pingsock, packet, sizeof(packet), 0,
(struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in));
c = sendto(pingsock, packet, sizeof(packet), 0,
(struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in));
- if (c < 0 || c != sizeof(packet)) {
- if (c < 0)
- perror("ping: sendto");
- errorMsg("write incomplete\n");
- exit(1);
- }
+ if (c < 0 || c != sizeof(packet))
+ perror_msg_and_die("sendto");
signal(SIGALRM, noresp);
alarm(5); /* give the host 5000ms to respond */
signal(SIGALRM, noresp);
alarm(5); /* give the host 5000ms to respond */
@@
-234,7
+231,7
@@
static void ping(const char *host)
(struct sockaddr *) &from, &fromlen)) < 0) {
if (errno == EINTR)
continue;
(struct sockaddr *) &from, &fromlen)) < 0) {
if (errno == EINTR)
continue;
- perror
("ping:
recvfrom");
+ perror
_msg("
recvfrom");
continue;
}
if (c >= 76) { /* ip + icmp */
continue;
}
if (c >= 76) { /* ip + icmp */
@@
-254,9
+251,9
@@
extern int ping_main(int argc, char **argv)
argc--;
argv++;
if (argc < 1)
argc--;
argv++;
if (argc < 1)
-
usage(ping_usage
);
+
show_usage(
);
ping(*argv);
ping(*argv);
-
exit(TRUE)
;
+
return EXIT_SUCCESS
;
}
#else /* ! BB_FEATURE_SIMPLE_PING */
}
#else /* ! BB_FEATURE_SIMPLE_PING */
@@
-264,7
+261,7
@@
extern int ping_main(int argc, char **argv)
static char *hostname = NULL;
static struct sockaddr_in pingaddr;
static int pingsock = -1;
static char *hostname = NULL;
static struct sockaddr_in pingaddr;
static int pingsock = -1;
-static int datalen
= DEFDATALEN;
+static int datalen
; /* intentionally uninitialized to work around gcc bug */
static long ntransmitted = 0, nreceived = 0, nrepeats = 0, pingcount = 0;
static int myid = 0, options = 0;
static long ntransmitted = 0, nreceived = 0, nrepeats = 0, pingcount = 0;
static int myid = 0, options = 0;
@@
-325,9
+322,9
@@
static void sendping(int junk)
(struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in));
if (i < 0)
(struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in));
if (i < 0)
-
fatalError("sendto: %s\n", strerror(errno)
);
+
perror_msg_and_die("sendto"
);
else if ((size_t)i != sizeof(packet))
else if ((size_t)i != sizeof(packet))
-
fatalError("ping wrote %d chars; %d expected\n
", i,
+
error_msg_and_die("ping wrote %d chars; %d expected
", i,
(int)sizeof(packet));
signal(SIGALRM, sendping);
(int)sizeof(packet));
signal(SIGALRM, sendping);
@@
-422,7
+419,7
@@
static void unpack(char *buf, int sz, struct sockaddr_in *from)
printf("\n");
} else
if (icmppkt->icmp_type != ICMP_ECHO)
printf("\n");
} else
if (icmppkt->icmp_type != ICMP_ECHO)
- error
Msg("Warning: Got ICMP %d (%s)\n
",
+ error
_msg("Warning: Got ICMP %d (%s)
",
icmppkt->icmp_type, icmp_type_name (icmppkt->icmp_type));
}
icmppkt->icmp_type, icmp_type_name (icmppkt->icmp_type));
}
@@
-439,12
+436,10
@@
static void ping(const char *host)
* proto->p_proto to have the correct value for "icmp" */
if ((pingsock = socket(AF_INET, SOCK_RAW,
(proto ? proto->p_proto : 1))) < 0) { /* 1 == ICMP */
* proto->p_proto to have the correct value for "icmp" */
if ((pingsock = socket(AF_INET, SOCK_RAW,
(proto ? proto->p_proto : 1))) < 0) { /* 1 == ICMP */
- if (errno == EPERM) {
- errorMsg("permission denied. (are you root?)\n");
- } else {
- perror("ping: creating a raw socket");
- }
- exit(1);
+ if (errno == EPERM)
+ error_msg_and_die("permission denied. (are you root?)");
+ else
+ perror_msg_and_die("creating a raw socket");
}
/* drop root privs if running setuid */
}
/* drop root privs if running setuid */
@@
-454,12
+449,12
@@
static void ping(const char *host)
pingaddr.sin_family = AF_INET;
if (!(h = gethostbyname(host))) {
pingaddr.sin_family = AF_INET;
if (!(h = gethostbyname(host))) {
- error
Msg("unknown host %s\n
", host);
+ error
_msg("unknown host %s
", host);
exit(1);
}
if (h->h_addrtype != AF_INET) {
exit(1);
}
if (h->h_addrtype != AF_INET) {
- error
Msg("unknown address type; only AF_INET is currently supported.\n
");
+ error
_msg("unknown address type; only AF_INET is currently supported.
");
exit(1);
}
exit(1);
}
@@
-498,7
+493,7
@@
static void ping(const char *host)
(struct sockaddr *) &from, &fromlen)) < 0) {
if (errno == EINTR)
continue;
(struct sockaddr *) &from, &fromlen)) < 0) {
if (errno == EINTR)
continue;
- perror
("ping:
recvfrom");
+ perror
_msg("
recvfrom");
continue;
}
unpack(packet, c, &from);
continue;
}
unpack(packet, c, &from);
@@
-512,6
+507,8
@@
extern int ping_main(int argc, char **argv)
{
char *thisarg;
{
char *thisarg;
+ datalen = DEFDATALEN; /* initialized here rather than in global scope to work around gcc bug */
+
argc--;
argv++;
options = 0;
argc--;
argv++;
options = 0;
@@
-525,28
+522,28
@@
extern int ping_main(int argc, char **argv)
break;
case 'c':
if (--argc <= 0)
break;
case 'c':
if (--argc <= 0)
-
usage(ping_usage
);
+
show_usage(
);
argv++;
pingcount = atoi(*argv);
break;
case 's':
if (--argc <= 0)
argv++;
pingcount = atoi(*argv);
break;
case 's':
if (--argc <= 0)
-
usage(ping_usage
);
+
show_usage(
);
argv++;
datalen = atoi(*argv);
break;
default:
argv++;
datalen = atoi(*argv);
break;
default:
-
usage(ping_usage
);
+
show_usage(
);
}
argc--;
argv++;
}
if (argc < 1)
}
argc--;
argv++;
}
if (argc < 1)
-
usage(ping_usage
);
+
show_usage(
);
myid = getpid() & 0xFFFF;
ping(*argv);
myid = getpid() & 0xFFFF;
ping(*argv);
- return
(TRUE)
;
+ return
EXIT_SUCCESS
;
}
#endif /* ! BB_FEATURE_SIMPLE_PING */
}
#endif /* ! BB_FEATURE_SIMPLE_PING */