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/libnetutil.netutil.cc.patch
author Srinivasa Sarva <srinivasa.sarva@oracle.com>
Thu, 01 Dec 2011 15:42:32 -0800
changeset 605 8dca74ad1a27
permissions -rw-r--r--
7113185 upgrade nmap to 5.51 6767323 nmapfe has unlocalized nmapfe.desktop 6964664 nmap's ip-spoofing capability is broken 6997071 nmap chokes if allowed to pick interface
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
605
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     1
 
--- nmap-5.21/libnetutil/netutil.cc.~1~	2011-01-20 16:04:16.000000000 -0800
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     2
 
+++ nmap-5.21/libnetutil/netutil.cc	2011-11-11 15:53:34.504536073 -0800
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     3
 
@@ -616,7 +616,8 @@
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     4
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     5
 
 /* Returns whether the system supports pcap_get_selectable_fd() properly */
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     6
 
 int pcap_selectable_fd_valid() {
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     7
 
-#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     8
 
+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) \
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     9
 
+    || (defined(sun) || defined(__sun) || defined(__sun__))
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    10
 
   return 0;
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    11
 
 #else
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    12
 
   return 1;
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    13
 
@@ -630,7 +631,8 @@
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    14
 
    results.  If you just want to test whether the function is supported,
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    15
 
    use pcap_selectable_fd_valid() instead. */
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    16
 
 int my_pcap_get_selectable_fd(pcap_t *p) {
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    17
 
-#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    18
 
+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) \
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    19
 
+    || (defined(sun) || defined(__sun) || defined(__sun__))
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    20
 
   return -1;
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    21
 
 #else
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    22
 
   assert(pcap_selectable_fd_valid());
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    23
 
@@ -1162,7 +1164,7 @@
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    24
 
       devs[count].device_type = devt_ethernet;
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    25
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    26
 
       /* If the device type is ethernet, get the MAC address. */
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    27
 
-#ifdef SIOCGIFHWADDR
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    28
 
+#if defined(SIOCGIFHWADDR) && (!defined(sun) && !defined(__sun) && !defined(__sun__))
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    29
 
       memcpy(&tmpifr.ifr_addr, sin, MIN(sizeof(tmpifr.ifr_addr), sizeof(*sin)));
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    30
 
       rc = ioctl(sd, SIOCGIFHWADDR, &tmpifr);
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    31
 
       if (rc < 0 && errno != EADDRNOTAVAIL){
upstream/oracle/userland-gate