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/tcpip.cc.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 10 Jan 2013 14:00:15 -0800
branchs11-update
changeset 2460 041818da4769
parent 916 fb0329e47bf5
permissions -rw-r--r--
16098091 Backport 16010595 to 11.2 (Userland half: libxml2)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
916
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     1
 
--- nmap-5.51/tcpip.cc.orig	2012-07-12 12:01:16.192754248 -0700
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     2
 
+++ nmap-5.51/tcpip.cc	2012-07-12 12:02:28.509427779 -0700
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     3
 
@@ -1319,6 +1319,11 @@
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     4
 
     offset = 16;
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     5
 
     break;
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     6
 
 #endif
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     7
 
+#ifdef DLT_IPNET
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     8
 
+  case DLT_IPNET:
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     9
 
+    offset = 24;
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    10
 
+    break;
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    11
 
+#endif
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    12
 
   default:
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    13
 
     p = (char *) pcap_next(pd, &head);
fb0329e47bf5 7181574 nmap fails with "bogus caplen from libpcap"
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    14
 
     if (head.caplen == 0) {
upstream/oracle/userland-gate