PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-20 13:19:01 +00:00
Code Issues Projects Releases Wiki Activity

freebsd fix

Browse Source
This commit is contained in:
fyodor
2005-07-26 23:34:34 +00:00
parent b0946e06fd
commit d027bb7681
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tcpip.cc
View File

@@ -2154,6 +2154,12 @@ struct interface_info *getinterfaces(int *howmany) {
printf("ifr = %X\n",(unsigned)(*(char **)&ifr));
#endif
/* On some platforms (such as FreeBSD), the length of each ifr changes
based on the sockaddr type used, so we get the next length now */
#if HAVE_SOCKADDR_SA_LEN
len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name);
#endif
/* skip any device with no name */
if (!*((char *)ifr))
continue;
@@ -2233,10 +2239,6 @@ struct interface_info *getinterfaces(int *howmany) {
mydevs = (struct interface_info *) realloc(mydevs, sizeof(struct interface_info) * ii_capacity);
assert(mydevs);
}
#if HAVE_SOCKADDR_SA_LEN
/* len = MAX(sizeof(struct sockaddr), ifr->ifr_addr.sa_len);*/
len = ifr->ifr_addr.sa_len + sizeof(ifr->ifr_name);
#endif
mydevs[numifaces].devname[0] = mydevs[numifaces].devfullname[0] = '\0';
}
free(buf);
@@ -2246,7 +2248,7 @@ struct interface_info *getinterfaces(int *howmany) {
return mydevs;
}
#endif
struct dnet_collector_route_nfo {
struct sys_route *routes;