author | Ron Jordan <ron.jordan@oracle.com> |
Tue, 22 Jan 2013 14:45:57 -0800 | |
branch | s11u1-sru |
changeset 2472 | a1822222111d |
parent 442 | d0e244fcfff1 |
permissions | -rw-r--r-- |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
1 |
diff -u libpcap-1.1.1/gencode.c libpcap-1.1.1.new/gencode.c |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
2 |
--- libpcap-1.1.1/gencode.c Thu Mar 11 17:56:54 2010 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
3 |
+++ libpcap-1.1.1.new/gencode.c Thu Jul 14 08:29:39 2011 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
4 |
@@ -1588,6 +1588,13 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
5 |
off_nl = 0; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
6 |
off_nl_nosnap = -1; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
7 |
return; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
8 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
9 |
+ case DLT_IPOIB: |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
10 |
+ off_linktype = 40; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
11 |
+ off_macpl = 44; /* IPoIB mac_ib prefix length */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
12 |
+ off_nl = 0; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
13 |
+ off_nl_nosnap = -1; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
14 |
+ return; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
15 |
} |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
16 |
bpf_error("unknown data link type %d", linktype); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
17 |
/* NOTREACHED */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
18 |
@@ -2048,6 +2055,16 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
19 |
return gen_false(); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
20 |
} |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
21 |
|
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
22 |
+static struct block * |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
23 |
+gen_ipoib_linktype(proto) |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
24 |
+ register int proto; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
25 |
+{ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
26 |
+ /* |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
27 |
+ * This is an Ethernet type, so compare the length field with it. |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
28 |
+ */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
29 |
+ return gen_cmp(OR_LINK, off_linktype, BPF_H, (bpf_int32)proto); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
30 |
+} |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
31 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
32 |
/* |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
33 |
* Generate code to match a particular packet type. |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
34 |
* |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
35 |
@@ -3474,6 +3491,9 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
36 |
case DLT_IPNET: |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
37 |
return gen_ipnet_linktype(proto); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
38 |
|
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
39 |
+ case DLT_IPOIB: |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
40 |
+ return gen_ipoib_linktype(proto); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
41 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
42 |
case DLT_LINUX_IRDA: |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
43 |
bpf_error("IrDA link-layer type filtering not implemented"); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
44 |
|
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
45 |
diff -u libpcap-1.1.1/pcap-common.c libpcap-1.1.1.new/pcap-common.c |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
46 |
--- libpcap-1.1.1/pcap-common.c Thu Mar 11 17:56:54 2010 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
47 |
+++ libpcap-1.1.1.new/pcap-common.c Thu Jul 14 08:25:56 2011 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
48 |
@@ -278,6 +278,11 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
49 |
#define LINKTYPE_USER15 162 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
50 |
|
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
51 |
/* |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
52 |
+ * IPoIB for Solaris. |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
53 |
+ */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
54 |
+#define LINKTYPE_IPOIB DLT_IPOIB |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
55 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
56 |
+/* |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
57 |
* For future use with 802.11 captures - defined by AbsoluteValue |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
58 |
* Systems to store a number of bits of link-layer information |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
59 |
* including radio information: |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
60 |
@@ -1067,6 +1072,9 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
61 |
/* Solaris IPNET */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
62 |
{ DLT_IPNET, LINKTYPE_IPNET }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
63 |
|
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
64 |
+ /* Solaris IPoIB */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
65 |
+ { DLT_IPOIB, LINKTYPE_IPOIB }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
66 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
67 |
/* CAN frames with SocketCAN headers */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
68 |
{ DLT_CAN_SOCKETCAN, LINKTYPE_CAN_SOCKETCAN }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
69 |
|
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
70 |
diff -u libpcap-1.1.1/pcap.c libpcap-1.1.1.new/pcap.c |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
71 |
--- libpcap-1.1.1/pcap.c Thu Mar 11 17:56:54 2010 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
72 |
+++ libpcap-1.1.1.new/pcap.c Thu Jul 14 08:29:55 2011 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
73 |
@@ -670,6 +670,7 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
74 |
DLT_CHOICE(DLT_FC_2, "Fibre Channel FC-2"), |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
75 |
DLT_CHOICE(DLT_FC_2_WITH_FRAME_DELIMS, "Fibre Channel FC-2 with frame delimiters"), |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
76 |
DLT_CHOICE(DLT_IPNET, "Solaris ipnet"), |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
77 |
+ DLT_CHOICE(DLT_IPOIB, "Solaris IPoIB"), |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
78 |
DLT_CHOICE(DLT_CAN_SOCKETCAN, "CAN-bus with SocketCAN headers"), |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
79 |
DLT_CHOICE(DLT_IPV4, "Raw IPv4"), |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
80 |
DLT_CHOICE(DLT_IPV6, "Raw IPv6"), |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
81 |
--- libpcap-1.1.1/pcap/bpf.h.dist 2010-03-11 17:56:54.000000000 -0800 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
82 |
+++ libpcap-1.1.1/pcap/bpf.h 2011-07-27 03:06:09.410830949 -0700 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
83 |
@@ -502,6 +502,8 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
84 |
#define DLT_USER14 161 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
85 |
#define DLT_USER15 162 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
86 |
|
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
87 |
+#define DLT_IPOIB DLT_USER15 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
88 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
89 |
/* |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
90 |
* For future use with 802.11 captures - defined by AbsoluteValue |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
91 |
* Systems to store a number of bits of link-layer information |