author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Mon, 11 Mar 2013 10:38:09 -0700 | |
branch | s11-update |
changeset 2520 | ceec631e74d1 |
parent 2413 | 8ca25f425497 |
child 1632 | fd2ec3291103 |
permissions | -rw-r--r-- |
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
1 |
diff -uN tcpdump-4.3.0/Makefile.in tcpdump-4.3.0.new/Makefile.in |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
2 |
--- tcpdump-4.3.0/Makefile.in 2010-04-05 18:18:35.000000000 -0700 |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
3 |
+++ tcpdump-4.3.0.new/Makefile.in 2011-07-14 08:43:36.561637014 -0700 |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
4 |
@@ -78,6 +78,7 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
5 |
print-esp.c print-ether.c print-fddi.c print-fr.c \ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
6 |
print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
7 |
print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
8 |
+ print-ipoib.c \ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
9 |
print-ipx.c print-isoclns.c print-juniper.c print-krb.c \ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
10 |
print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
11 |
print-lmp.c print-lspping.c print-lwapp.c \ |
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
12 |
diff -uN tcpdump-4.3.0/interface.h tcpdump-4.3.0.new/interface.h |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
13 |
--- tcpdump-4.3.0/interface.h 2010-03-11 17:56:44.000000000 -0800 |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
14 |
+++ tcpdump-4.3.0.new/interface.h 2011-07-14 08:44:55.908614708 -0700 |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
15 |
@@ -185,6 +185,7 @@ |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
16 |
extern u_int pflog_if_print(const struct pcap_pkthdr *, const u_char *); |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
17 |
extern u_int arcnet_if_print(const struct pcap_pkthdr *, const u_char *); |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
18 |
extern u_int arcnet_linux_if_print(const struct pcap_pkthdr *, const u_char *); |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
19 |
+extern u_int ipoib_if_print(const struct pcap_pkthdr *, const u_char *); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
20 |
extern u_int token_print(const u_char *, u_int, u_int); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
21 |
extern u_int token_if_print(const struct pcap_pkthdr *, const u_char *); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
22 |
extern void fddi_print(const u_char *, u_int, u_int); |
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
23 |
Common subdirectories: tcpdump-4.3.0/lbl and tcpdump-4.3.0.new/lbl |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
24 |
Common subdirectories: tcpdump-4.3.0/missing and tcpdump-4.3.0.new/missing |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
25 |
diff -uN tcpdump-4.3.0/netdissect.h tcpdump-4.3.0.new/netdissect.h |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
26 |
--- tcpdump-4.3.0/netdissect.h 2010-03-11 17:56:44.000000000 -0800 |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
27 |
+++ tcpdump-4.3.0.new/netdissect.h 2011-07-14 08:44:35.643598462 -0700 |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
28 |
@@ -300,6 +300,7 @@ |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
29 |
|
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
30 |
extern u_int ether_if_print(netdissect_options *, |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
31 |
const struct pcap_pkthdr *,const u_char *); |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
32 |
+extern u_int ipoib_if_print(const struct pcap_pkthdr *, const u_char *); |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
33 |
extern u_int netanalyzer_if_print(netdissect_options *, |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
34 |
const struct pcap_pkthdr *,const u_char *); |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
35 |
extern u_int netanalyzer_transparent_if_print(netdissect_options *, |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
36 |
|
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
37 |
diff -uN tcpdump-4.3.0/print-arp.c tcpdump-4.3.0.new/print-arp.c |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
38 |
--- tcpdump-4.3.0/print-arp.c 2010-03-11 17:56:44.000000000 -0800 |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
39 |
+++ tcpdump-4.3.0.new/print-arp.c 2011-07-14 09:01:08.965396346 -0700 |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
40 |
@@ -62,6 +62,7 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
41 |
u_char ar_hln; /* length of hardware address */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
42 |
u_char ar_pln; /* length of protocol address */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
43 |
u_short ar_op; /* one of: */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
44 |
+#define ARPHRD_INFINIBAND 32 /* Infiniband RFC 4391 */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
45 |
#define ARPOP_REQUEST 1 /* request to resolve address */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
46 |
#define ARPOP_REPLY 2 /* response to previous request */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
47 |
#define ARPOP_REVREQUEST 3 /* request protocol address given hardware */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
48 |
@@ -118,6 +119,7 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
49 |
{ ARPHRD_STRIP, "Strip" }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
50 |
{ ARPHRD_IEEE1394, "IEEE 1394" }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
51 |
{ ARPHRD_ATM2225, "ATM" }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
52 |
+ { ARPHRD_INFINIBAND, "Infiniband" }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
53 |
{ 0, NULL } |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
54 |
}; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
55 |
|
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
56 |
diff -uN tcpdump-4.3.0/print-ipoib.c tcpdump-4.3.0.new/print-ipoib.c |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
57 |
--- tcpdump-4.3.0/print-ipoib.c 1969-12-31 16:00:00.000000000 -0800 |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
58 |
+++ tcpdump-4.3.0.new/print-ipoib.c 2011-07-14 08:46:52.029342720 -0700 |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
59 |
@@ -0,0 +1,131 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
60 |
+/* |
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
61 |
+ * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
62 |
+ * 1997, 2000, 2011, 2012 |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
63 |
+ * The Regents of the University of California. All rights reserved. |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
64 |
+ * |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
65 |
+ * Redistribution and use in source and binary forms, with or without |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
66 |
+ * modification, are permitted provided that: (1) source code distributions |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
67 |
+ * retain the above copyright notice and this paragraph in its entirety, (2) |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
68 |
+ * distributions including binary code include the above copyright notice and |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
69 |
+ * this paragraph in its entirety in the documentation or other materials |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
70 |
+ * provided with the distribution, and (3) all advertising materials mentioning |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
71 |
+ * features or use of this software display the following acknowledgement: |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
72 |
+ * ``This product includes software developed by the University of California, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
73 |
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
74 |
+ * the University nor the names of its contributors may be used to endorse |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
75 |
+ * or promote products derived from this software without specific prior |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
76 |
+ * written permission. |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
77 |
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
78 |
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
79 |
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
80 |
+ */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
81 |
+/* |
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
82 |
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
83 |
+ */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
84 |
+#ifndef lint |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
85 |
+static const char rcsid[] _U_ = |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
86 |
+ "@(#) $Header$"; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
87 |
+#endif |
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 |
+#ifdef HAVE_CONFIG_H |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
90 |
+#include "config.h" |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
91 |
+#endif |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
92 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
93 |
+#include <tcpdump-stdinc.h> |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
94 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
95 |
+#include <stdio.h> |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
96 |
+#include <pcap.h> |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
97 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
98 |
+#include "interface.h" |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
99 |
+#include "extract.h" |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
100 |
+#include "addrtoname.h" |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
101 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
102 |
+extern const struct tok ethertype_values[]; |
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
103 |
+extern int ethertype_print(netdissect_options *, u_short, const u_char *, u_int, u_int ); |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
104 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
105 |
+#define IPOIB_HDRLEN 44 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
106 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
107 |
+static inline void |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
108 |
+ipoib_hdr_print(register const u_char *bp, u_int length) |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
109 |
+{ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
110 |
+ u_int16_t ether_type; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
111 |
+ char abuf[40]; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
112 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
113 |
+ ether_type = EXTRACT_16BITS(&bp[40]); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
114 |
+ if (!qflag) { |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
115 |
+ (void)printf(", ethertype %s (0x%04x)", |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
116 |
+ tok2str(ethertype_values,"Unknown", ether_type), |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
117 |
+ ether_type); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
118 |
+ } else { |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
119 |
+ (void)printf(", ethertype %s", |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
120 |
+ tok2str(ethertype_values,"Unknown", ether_type)); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
121 |
+ } |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
122 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
123 |
+ (void)printf(", length %u: ", length); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
124 |
+} |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
125 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
126 |
+/* |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
127 |
+ * Print an Infiniband frame. |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
128 |
+ * This might be encapsulated within another frame; we might be passed |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
129 |
+ * a pointer to a function that can print header information for that |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
130 |
+ * frame's protocol, and an argument to pass to that function. |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
131 |
+ */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
132 |
+static void |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
133 |
+ipoib_print(const u_char *p, u_int length, u_int caplen, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
134 |
+ void (*print_encap_header)(const u_char *), const u_char *encap_header_arg) |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
135 |
+{ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
136 |
+ const u_char *orig_hdr = p; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
137 |
+ u_int orig_length; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
138 |
+ u_short ether_type; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
139 |
+ u_short extracted_ether_type; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
140 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
141 |
+ if (caplen < IPOIB_HDRLEN || length < IPOIB_HDRLEN) { |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
142 |
+ printf("[|ipoib]"); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
143 |
+ return; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
144 |
+ } |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
145 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
146 |
+ if (eflag) { |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
147 |
+ if (print_encap_header != NULL) |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
148 |
+ (*print_encap_header)(encap_header_arg); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
149 |
+ ipoib_hdr_print(p, length); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
150 |
+ } |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
151 |
+ orig_length = length; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
152 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
153 |
+ length -= IPOIB_HDRLEN; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
154 |
+ caplen -= IPOIB_HDRLEN; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
155 |
+ ether_type = EXTRACT_16BITS(&p[40]); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
156 |
+ p += IPOIB_HDRLEN; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
157 |
+ |
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
158 |
+ if (ethertype_print(gndo, ether_type, p, length, caplen) == 0) { |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
159 |
+ /* ether_type not known, print raw packet */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
160 |
+ if (!eflag) { |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
161 |
+ if (print_encap_header != NULL) |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
162 |
+ (*print_encap_header)(encap_header_arg); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
163 |
+ ipoib_hdr_print(orig_hdr , orig_length); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
164 |
+ } |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
165 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
166 |
+ if (!suppress_default_print) |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
167 |
+ default_print(p, caplen); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
168 |
+ } |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
169 |
+} |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
170 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
171 |
+/* |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
172 |
+ * This is the top level routine of the printer. 'p' points |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
173 |
+ * to the ether header of the packet, 'h->ts' is the timestamp, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
174 |
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen' |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
175 |
+ * is the number of bytes actually captured. |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
176 |
+ */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
177 |
+u_int |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
178 |
+ipoib_if_print(const struct pcap_pkthdr *h, const u_char *p) |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
179 |
+{ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
180 |
+ ipoib_print(p, h->len, h->caplen, NULL, NULL); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
181 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
182 |
+ return (IPOIB_HDRLEN); |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
183 |
+} |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
184 |
+ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
185 |
+/* |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
186 |
+ * Local Variables: |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
187 |
+ * c-style: whitesmith |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
188 |
+ * c-basic-offset: 8 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
189 |
+ * End: |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
190 |
+ */ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
191 |
+ |
2413
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
192 |
diff -uN tcpdump-4.3.0/tcpdump.c tcpdump-4.3.0.new/tcpdump.c |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
193 |
--- tcpdump-4.3.0/tcpdump.c 2010-03-11 17:56:44.000000000 -0800 |
8ca25f425497
7196707 update tcpdump to 4.3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
442
diff
changeset
|
194 |
+++ tcpdump-4.3.0.new/tcpdump.c 2011-07-14 08:44:25.329300635 -0700 |
442
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
195 |
@@ -299,6 +299,9 @@ |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
196 |
#ifdef DLT_IPV6 |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
197 |
{ raw_if_print, DLT_IPV6 }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
198 |
#endif |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
199 |
+#ifdef DLT_IPOIB |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
200 |
+ { ipoib_if_print, DLT_IPOIB }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
201 |
+#endif |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
202 |
{ NULL, 0 }, |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
203 |
}; |
d0e244fcfff1
7003338 infiniband adapters do not work with tcpdump
Darren Reed <Darren.Reed@Oracle.COM>
parents:
diff
changeset
|
204 |