Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import a couple of NetBSD fixes from CGD

Browse Source
This commit is contained in:
mellon 1997-03-31 23:45:45 +00:00
parent 4fdb8210f0
commit a3962d667b
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/dhcp/common/icmp.c
View File

@ -43,7 +43,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: icmp.c,v 1.1.1.1 1997/03/29 21:52:17 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n"; "$Id: icmp.c,v 1.1.1.2 1997/03/31 23:45:45 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@ -79,10 +79,6 @@ void icmp_startup (routep, handler)
if (!icmp_protocol_fd) if (!icmp_protocol_fd)
error ("unable to create icmp socket: %m"); error ("unable to create icmp socket: %m");
if (setsockopt (icmp_protocol_fd, SOL_SOCKET, SO_DONTROUTE,
(char *)&routep, sizeof routep))
error ("Can't set SO_DONTROUTE on ICMP socket: %m");
add_protocol ("icmp", icmp_protocol_fd, icmp_echoreply, handler); add_protocol ("icmp", icmp_protocol_fd, icmp_echoreply, handler);
} }
@ -108,8 +104,8 @@ int icmp_echorequest (addr)
icmp.icmp_cksum = 0; icmp.icmp_cksum = 0;
icmp.icmp_seq = 0; icmp.icmp_seq = 0;
#ifdef PTRSIZE_64BIT #ifdef PTRSIZE_64BIT
icmp.icmp_id = (((u_int32_t)addr) ^ icmp.icmp_id = (((u_int32_t)(u_int64_t)addr) ^
(u_int32_t)(((u_int64_t)addr) >> 32)); (u_int32_t)(((u_int64_t)addr) >> 32));
#else #else
icmp.icmp_id = (u_int32_t)addr; icmp.icmp_id = (u_int32_t)addr;
#endif #endif
@ -121,7 +117,7 @@ int icmp_echorequest (addr)
status = sendto (icmp_protocol_fd, (char *)&icmp, sizeof icmp, 0, status = sendto (icmp_protocol_fd, (char *)&icmp, sizeof icmp, 0,
(struct sockaddr *)&to, sizeof to); (struct sockaddr *)&to, sizeof to);
if (status < 0) if (status < 0)
warn ("icmp_echorequest: %m"); warn ("icmp_echorequest %s: %m", inet_ntoa(to.sin_addr));
if (status != sizeof icmp) if (status != sizeof icmp)
return 0; return 0;

2
usr.sbin/dhcp/includes/cf/alphaosf.h
View File

@ -99,3 +99,5 @@ extern int h_errno;
#if defined (USE_DEFAULT_NETWORK) #if defined (USE_DEFAULT_NETWORK)
# define USE_BPF # define USE_BPF
#endif #endif
#define PTRSIZE_64BIT

4
usr.sbin/dhcp/includes/cf/netbsd.h
View File

@ -89,3 +89,7 @@ extern int h_errno;
#if defined (USE_DEFAULT_NETWORK) #if defined (USE_DEFAULT_NETWORK)
# define USE_BPF # define USE_BPF
#endif #endif
#ifdef __alpha__
#define PTRSIZE_64BIT
#endif