diff options
Diffstat (limited to 'usr.sbin/dhcpd')
| -rw-r--r-- | usr.sbin/dhcpd/dhcpd.h | 6 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/icmp.c | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/usr.sbin/dhcpd/dhcpd.h b/usr.sbin/dhcpd/dhcpd.h index 7432afaff57..380a7bc5f33 100644 --- a/usr.sbin/dhcpd/dhcpd.h +++ b/usr.sbin/dhcpd/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.10 2004/04/21 09:11:58 canacar Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.11 2004/04/22 15:22:48 henning Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998, 1999 @@ -90,10 +90,6 @@ extern int h_errno; #define HAVE_SA_LEN #define HAVE_MKSTEMP -#if defined(__alpha__) || (defined(__sparc64__) && defined(__arch64__)) -#define PTRSIZE_64BIT -#endif - #include "dhcp.h" #include "tree.h" diff --git a/usr.sbin/dhcpd/icmp.c b/usr.sbin/dhcpd/icmp.c index 271dd2ea379..ba39edc5bea 100644 --- a/usr.sbin/dhcpd/icmp.c +++ b/usr.sbin/dhcpd/icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp.c,v 1.7 2004/04/21 22:44:35 henning Exp $ */ +/* $OpenBSD: icmp.c,v 1.8 2004/04/22 15:22:48 henning Exp $ */ /* * Copyright (c) 1997, 1998 The Internet Software Consortium. @@ -95,12 +95,7 @@ icmp_echorequest(struct iaddr *addr) icmp.icmp_code = 0; icmp.icmp_cksum = 0; icmp.icmp_seq = 0; -#ifdef PTRSIZE_64BIT - icmp.icmp_id = (((u_int32_t) (u_int64_t) addr) ^ - (u_int32_t) (((u_int64_t) addr) >> 32)); -#else - icmp.icmp_id = (u_int32_t) addr; -#endif + icmp.icmp_id = getpid() & 0xffff; icmp.icmp_cksum = wrapsum(checksum((unsigned char *)&icmp, sizeof(icmp), 0)); |