6997071 nmap chokes if allowed to pick interface s11-sru
authorSrinivasa Sarva <srinivasa.sarva@oracle.com>
Fri, 07 Sep 2012 12:05:40 -0700
branchs11-sru
changeset 2339 96ba33152279
parent 2335 e578e0325a89
child 2340 50760580556f
6997071 nmap chokes if allowed to pick interface
components/nmap/patches/91.tcpip.cc.patch
--- a/components/nmap/patches/91.tcpip.cc.patch	Tue Aug 28 15:45:52 2012 -0700
+++ b/components/nmap/patches/91.tcpip.cc.patch	Fri Sep 07 12:05:40 2012 -0700
@@ -1,6 +1,18 @@
---- nmap-5.21/tcpip.cc	2010-01-14 19:55:23.000000000 -0800
-+++ nmap-5.21/tcpip.cc	2010-03-09 20:30:38.315876272 -0800
[email protected]@ -3124,7 +3124,7 @@
+--- nmap-5.21/tcpip.cc.~1~	2010-01-14 19:55:23.000000000 -0800
++++ nmap-5.21/tcpip.cc	2012-07-12 16:11:16.916489138 -0700
[email protected]@ -2296,6 +2296,11 @@
+     offset = 16;
+     break;
+ #endif
++#ifdef DLT_IPNET
++  case DLT_IPNET:
++    offset = 24;
++    break;
++#endif
+   default:
+     p = (char *) pcap_next(pd, &head);
+     if (head.caplen == 0) {
[email protected]@ -3124,7 +3129,7 @@
        devs[count].device_type = devt_ethernet;
  
        /* If the device type is ethernet, get the MAC address. */