equal
deleted
inserted
replaced
1 --- nmap-5.21/tcpip.cc 2010-01-14 19:55:23.000000000 -0800 |
1 --- nmap-5.21/tcpip.cc.~1~ 2010-01-14 19:55:23.000000000 -0800 |
2 +++ nmap-5.21/tcpip.cc 2010-03-09 20:30:38.315876272 -0800 |
2 +++ nmap-5.21/tcpip.cc 2012-07-12 16:11:16.916489138 -0700 |
3 @@ -3124,7 +3124,7 @@ |
3 @@ -2296,6 +2296,11 @@ |
|
4 offset = 16; |
|
5 break; |
|
6 #endif |
|
7 +#ifdef DLT_IPNET |
|
8 + case DLT_IPNET: |
|
9 + offset = 24; |
|
10 + break; |
|
11 +#endif |
|
12 default: |
|
13 p = (char *) pcap_next(pd, &head); |
|
14 if (head.caplen == 0) { |
|
15 @@ -3124,7 +3129,7 @@ |
4 devs[count].device_type = devt_ethernet; |
16 devs[count].device_type = devt_ethernet; |
5 |
17 |
6 /* If the device type is ethernet, get the MAC address. */ |
18 /* If the device type is ethernet, get the MAC address. */ |
7 -#ifdef SIOCGIFHWADDR |
19 -#ifdef SIOCGIFHWADDR |
8 +#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__)) |
20 +#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__)) |