6be63eabb9
discover DHCP and BootP servers on a network PR: 197162 Submitted by: khung@nullaxiom.com (maintainer)
38 lines
1.2 KiB
C
38 lines
1.2 KiB
C
--- src/get_myeaddr.c.orig 2015-01-03 11:44:45.000000000 -0500
|
|
+++ src/get_myeaddr.c 2015-01-03 11:45:40.000000000 -0500
|
|
@@ -55,7 +55,7 @@
|
|
|
|
|
|
int
|
|
-get_myeaddr(int sockfd, struct in_addr *my_ipaddr, struct ether_addr *my_eaddr, const char *ifname)
|
|
+get_myeaddr(int sockfd, struct in_addr *my_ipaddr, struct libnet_ether_addr *my_eaddr, const char *ifname)
|
|
{
|
|
/* If SIOCGIFHWADDR is defined,
|
|
We use the SIOCGIFHWADDR ioctl to do our work as follows:
|
|
@@ -92,7 +92,7 @@
|
|
return(-1);
|
|
}
|
|
|
|
- bcopy(ifr.ifr_hwaddr.sa_data, my_eaddr, sizeof (struct ether_addr));
|
|
+ bcopy(ifr.ifr_hwaddr.sa_data, my_eaddr, sizeof (struct libnet_ether_addr));
|
|
|
|
#elif defined SIOCGARP /* not SIOCGIFHWADDR */
|
|
|
|
@@ -154,7 +154,7 @@
|
|
return(-1);
|
|
}
|
|
|
|
- bcopy(arpreq.arp_ha.sa_data, my_eaddr, sizeof (struct ether_addr));
|
|
+ bcopy(arpreq.arp_ha.sa_data, my_eaddr, sizeof (struct libnet_ether_addr));
|
|
|
|
#elif defined HAVE_GETIFADDRS /* not SIOCGARP */
|
|
|
|
@@ -180,7 +180,7 @@
|
|
found = 1;
|
|
/* copy the result to my_eaddr */
|
|
sdl = (struct sockaddr_dl *) ifp->ifa_addr;
|
|
- bcopy((const void *)LLADDR(sdl), my_eaddr, sizeof (struct ether_addr));
|
|
+ bcopy((const void *)LLADDR(sdl), my_eaddr, sizeof (struct libnet_ether_addr));
|
|
|
|
}
|
|
}
|