mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-29 13:28:14 +00:00
Code Issues Releases Wiki Activity

Linux fixups for haddr/htype->hbuf

Browse Source
This commit is contained in:
Ted Lemon 2000-01-25 01:04:21 +00:00
parent 34731eed0e
commit ec73b5458c
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
common/discover.c
View File

@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: discover.c,v 1.18 2000/01/05 18:00:34 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: discover.c,v 1.19 2000/01/25 01:04:21 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@ -368,50 +368,50 @@ void discover_interfaces (state)
#endif #endif
case ARPHRD_ETHER: case ARPHRD_ETHER:
tmp -> hw_address.hlen = 6; tmp -> hw_address.hlen = 7;
tmp -> hw_address.htype = ARPHRD_ETHER; tmp -> hw_address.hbuf [0] = ARPHRD_ETHER;
memcpy (tmp -> hw_address.haddr, sa.sa_data, 6); memcpy (&tmp -> hw_address.hbuf [1], sa.sa_data, 6);
break; break;
#ifndef HAVE_ARPHRD_IEEE802 #ifndef HAVE_ARPHRD_IEEE802
# define ARPHRD_IEEE802 HTYPE_IEEE802 # define ARPHRD_IEEE802 HTYPE_IEEE802
#endif #endif
case ARPHRD_IEEE802: case ARPHRD_IEEE802:
tmp -> hw_address.hlen = 6; tmp -> hw_address.hlen = 7;
tmp -> hw_address.htype = ARPHRD_IEEE802; tmp -> hw_address.hbuf [0] = ARPHRD_IEEE802;
memcpy (tmp -> hw_address.haddr, sa.sa_data, 6); memcpy (&tmp -> hw_address.hbuf [1], sa.sa_data, 6);
break; break;
#ifndef HAVE_ARPHRD_FDDI #ifndef HAVE_ARPHRD_FDDI
# define ARPHRD_FDDI HTYPE_FDDI # define ARPHRD_FDDI HTYPE_FDDI
#endif #endif
case ARPHRD_FDDI: case ARPHRD_FDDI:
tmp -> hw_address.hlen = 16; tmp -> hw_address.hlen = 17;
tmp -> hw_address.htype = HTYPE_FDDI; /* XXX */ tmp -> hw_address.hbuf [0] = HTYPE_FDDI; /* XXX */
memcpy (tmp -> hw_address.haddr, sa.sa_data, 16); memcpy (&tmp -> hw_address.hbuf [1], sa.sa_data, 16);
break; break;
#ifdef HAVE_ARPHRD_METRICOM #ifdef HAVE_ARPHRD_METRICOM
case ARPHRD_METRICOM: case ARPHRD_METRICOM:
tmp -> hw_address.hlen = 6; tmp -> hw_address.hlen = 7;
tmp -> hw_address.htype = ARPHRD_METRICOM; tmp -> hw_address.hbuf [0] = ARPHRD_METRICOM;
memcpy (tmp -> hw_address.haddr, sa.sa_data, 6); memcpy (&tmp -> hw_address.hbuf [0], sa.sa_data, 6);
break; break;
#endif #endif
#ifdef HAVE_ARPHRD_AX25 #ifdef HAVE_ARPHRD_AX25
case ARPHRD_AX25: case ARPHRD_AX25:
tmp -> hw_address.hlen = 6; tmp -> hw_address.hlen = 7;
tmp -> hw_address.htype = ARPHRD_AX25; tmp -> hw_address.hbuf [0] = ARPHRD_AX25;
memcpy (tmp -> hw_address.haddr, sa.sa_data, 6); memcpy (&tmp -> hw_address.hbuf [1], sa.sa_data, 6);
break; break;
#endif #endif
#ifdef HAVE_ARPHRD_NETROM #ifdef HAVE_ARPHRD_NETROM
case ARPHRD_NETROM: case ARPHRD_NETROM:
tmp -> hw_address.hlen = 6; tmp -> hw_address.hlen = 7;
tmp -> hw_address.htype = ARPHRD_NETROM; tmp -> hw_address.hbuf [0] = ARPHRD_NETROM;
memcpy (tmp -> hw_address.haddr, sa.sa_data, 6); memcpy (&tmp -> hw_address.hbuf [1], sa.sa_data, 6);
break; break;
#endif #endif