equal
deleted
inserted
replaced
1 --- nmap-5.21/libnetutil/netutil.cc.~1~ 2011-01-20 16:04:16.000000000 -0800 |
|
2 +++ nmap-5.21/libnetutil/netutil.cc 2011-11-11 15:53:34.504536073 -0800 |
|
3 @@ -616,7 +616,8 @@ |
|
4 |
|
5 /* Returns whether the system supports pcap_get_selectable_fd() properly */ |
|
6 int pcap_selectable_fd_valid() { |
|
7 -#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) |
|
8 +#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) \ |
|
9 + || (defined(sun) || defined(__sun) || defined(__sun__)) |
|
10 return 0; |
|
11 #else |
|
12 return 1; |
|
13 @@ -630,7 +631,8 @@ |
|
14 results. If you just want to test whether the function is supported, |
|
15 use pcap_selectable_fd_valid() instead. */ |
|
16 int my_pcap_get_selectable_fd(pcap_t *p) { |
|
17 -#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) |
|
18 +#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) \ |
|
19 + || (defined(sun) || defined(__sun) || defined(__sun__)) |
|
20 return -1; |
|
21 #else |
|
22 assert(pcap_selectable_fd_valid()); |
|
23 @@ -1162,7 +1164,7 @@ |
|
24 devs[count].device_type = devt_ethernet; |
|
25 |
|
26 /* If the device type is ethernet, get the MAC address. */ |
|
27 -#ifdef SIOCGIFHWADDR |
|
28 +#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__)) |
|
29 memcpy(&tmpifr.ifr_addr, sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin))); |
|
30 rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr); |
|
31 if (rc < 0 && errno != EADDRNOTAVAIL){ |
|