81867ee817
a received ICMP packet. This fixes a segfault on amd64 Obtained from: ping.c 1.28 #include signal.h instead of sys/signal.h Obtained from: NetBSD Fix a few Warnings while I'm here.
88 lines
2.2 KiB
Text
88 lines
2.2 KiB
Text
$OpenBSD: patch-bing_c,v 1.1 2002/09/17 09:06:23 pvalchev Exp $
|
|
--- bing.c.orig Fri Jan 19 19:28:53 2001
|
|
+++ bing.c Sun Aug 15 18:51:05 2004
|
|
@@ -158,7 +158,7 @@
|
|
#include <sys/socket.h>
|
|
#include <sys/file.h>
|
|
#include <sys/time.h>
|
|
-#include <sys/signal.h>
|
|
+#include <signal.h>
|
|
|
|
#include <netinet/in_systm.h>
|
|
#include <netinet/in.h>
|
|
@@ -167,6 +167,7 @@
|
|
#ifndef linux
|
|
#include <netinet/ip_var.h>
|
|
#endif /* linux */
|
|
+#include <arpa/inet.h>
|
|
#include <netdb.h>
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
@@ -174,6 +175,8 @@
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <limits.h>
|
|
+#include <stdlib.h>
|
|
+#include <err.h>
|
|
|
|
#include "sysdep.h"
|
|
|
|
@@ -647,7 +650,7 @@
|
|
#ifdef linux
|
|
(void)printf("(New addr: 0x%08lx)\n", icp->icmp_gwaddr);
|
|
#else
|
|
- (void)printf("(New addr: 0x%08lx)\n", icp->icmp_gwaddr.s_addr);
|
|
+ (void)printf("(New addr: %s)\n", inet_ntoa(icp->icmp_gwaddr));
|
|
#endif /* linux */
|
|
pr_retip((struct ip *)ICMP_TO_DATA(icp));
|
|
break;
|
|
@@ -1231,17 +1234,30 @@
|
|
struct hoststats *hs1, *hs2;
|
|
int ntrans, nloops, bits;
|
|
int i;
|
|
- int ch, hold, recv_packlen, preload;
|
|
+ int ch, hold = 1, recv_packlen, preload;
|
|
u_char *datap, *recv_packet;
|
|
- char *target1, *target2, *malloc();
|
|
+ char *target1, *target2;
|
|
u_char ttl, loop;
|
|
#ifdef IP_OPTIONS
|
|
char rspace[3 + 4 * NROUTES + 1]; /* record route space */
|
|
#endif
|
|
-
|
|
hs1 = &hoststats1;
|
|
hs2 = &hoststats2;
|
|
|
|
+ if (!(proto = getprotobyname("icmp"))) {
|
|
+ (void)fprintf(stderr, "bing: unknown protocol icmp.\n");
|
|
+ exit(1);
|
|
+ }
|
|
+ if ((s = socket(AF_INET, SOCK_RAW, proto->p_proto)) < 0) {
|
|
+ perror("bing: socket");
|
|
+ exit(1);
|
|
+ }
|
|
+ /* Revoke privileges */
|
|
+ if (seteuid(getuid()) == -1 || setuid(getuid()) == -1) {
|
|
+ err(1, "unable to drop permissions");
|
|
+ exit(1);
|
|
+ }
|
|
+
|
|
preload = 0;
|
|
datap = &outpack[8 + sizeof(struct timeval)];
|
|
while ((ch = getopt(argc, argv, "I:LRc:dDe:fh:i:l:nPp:rS:s:t:vVwz")) != EOF)
|
|
@@ -1398,15 +1414,6 @@
|
|
|
|
ident = getpid() & 0xFFFF;
|
|
|
|
- if (!(proto = getprotobyname("icmp"))) {
|
|
- (void)fprintf(stderr, "bing: unknown protocol icmp.\n");
|
|
- exit(1);
|
|
- }
|
|
- if ((s = socket(AF_INET, SOCK_RAW, proto->p_proto)) < 0) {
|
|
- perror("bing: socket");
|
|
- exit(1);
|
|
- }
|
|
- hold = 1;
|
|
if (options & F_SO_DEBUG)
|
|
(void)setsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&hold,
|
|
sizeof(hold));
|