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 Srinivasa Sarva <srinivasa.sarva@oracle.com>
Wed, 23 Mar 2011 12:42:35 -0700
changeset 146 8e22ba234817
child 2339 96ba33152279
permissions -rw-r--r--
7027466 Move nmap to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
146
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     1
 
--- nmap-5.21/tcpip.cc	2010-01-14 19:55:23.000000000 -0800
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     2
 
+++ nmap-5.21/tcpip.cc	2010-03-09 20:30:38.315876272 -0800
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     3
 
@@ -3124,7 +3124,7 @@
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     4
 
       devs[count].device_type = devt_ethernet;
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     5
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     6
 
       /* 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 
     7
 
-#ifdef SIOCGIFHWADDR
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     8
 
+#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__))
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     9
 
       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 
    10
 
       rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr);
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    11
 
       if (rc < 0 && errno != EADDRNOTAVAIL)
upstream/oracle/userland-gate