Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/nmap/patches/91.tcpip.cc.patch
author Sharath M Srinivasan <sharath.srinivasan@oracle.com>
Fri, 14 Sep 2012 13:39:12 -0700
branchs11-sru
changeset 2342 467b2933c70d
parent 2339 96ba33152279
permissions -rw-r--r--
7192860 OFED tools need to be delivered in an NGZ
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2339
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     1
 
--- nmap-5.21/tcpip.cc.~1~	2010-01-14 19:55:23.000000000 -0800
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     2
 
+++ nmap-5.21/tcpip.cc	2012-07-12 16:11:16.916489138 -0700
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     3
 
@@ -2296,6 +2296,11 @@
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     4
 
     offset = 16;
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     5
 
     break;
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     6
 
 #endif
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     7
 
+#ifdef DLT_IPNET
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     8
 
+  case DLT_IPNET:
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     9
 
+    offset = 24;
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    10
 
+    break;
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    11
 
+#endif
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    12
 
   default:
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    13
 
     p = (char *) pcap_next(pd, &head);
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    14
 
     if (head.caplen == 0) {
96ba33152279 6997071 nmap chokes if allowed to pick interface
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    15
 
@@ -3124,7 +3129,7 @@
146
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    16
 
       devs[count].device_type = devt_ethernet;
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    17
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    18
 
       /* If the device type is ethernet, get the MAC address. */
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    19
 
-#ifdef SIOCGIFHWADDR
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    20
 
+#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__))
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    21
 
       memcpy(&tmpifr.ifr_addr, sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin)));
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    22
 
       rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr);
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    23
 
       if (rc < 0 && errno != EADDRNOTAVAIL)
upstream/oracle/userland-gate