1 diff -uN tcpdump-4.1.1/Makefile.in tcpdump-4.1.1.new/Makefile.in |
1 # |
2 --- tcpdump-4.1.1/Makefile.in 2010-04-05 18:18:35.000000000 -0700 |
2 # InfiniBand support |
3 +++ tcpdump-4.1.1.new/Makefile.in 2011-07-14 08:43:36.561637014 -0700 |
3 # |
4 @@ -78,6 +78,7 @@ |
4 diff -N -u -r tcpdump-4.5.1.orig/interface.h tcpdump-4.5.1/interface.h |
5 print-esp.c print-ether.c print-fddi.c print-fr.c \ |
5 --- tcpdump-4.5.1.orig/interface.h 2013-03-24 16:49:18.000000000 -0500 |
|
6 +++ tcpdump-4.5.1/interface.h 2013-12-02 11:48:13.394398375 -0600 |
|
7 @@ -205,6 +205,7 @@ |
|
8 extern u_int pflog_if_print(const struct pcap_pkthdr *, const u_char *); |
|
9 extern u_int arcnet_if_print(const struct pcap_pkthdr *, const u_char *); |
|
10 extern u_int arcnet_linux_if_print(const struct pcap_pkthdr *, const u_char *); |
|
11 +extern u_int ipoib_if_print(const struct pcap_pkthdr *, const u_char *); |
|
12 extern u_int token_print(const u_char *, u_int, u_int); |
|
13 extern u_int token_if_print(const struct pcap_pkthdr *, const u_char *); |
|
14 extern void fddi_print(const u_char *, u_int, u_int); |
|
15 diff -N -u -r tcpdump-4.5.1.orig/Makefile.in tcpdump-4.5.1/Makefile.in |
|
16 --- tcpdump-4.5.1.orig/Makefile.in 2013-03-24 16:49:18.000000000 -0500 |
|
17 +++ tcpdump-4.5.1/Makefile.in 2013-12-02 11:47:25.102106791 -0600 |
|
18 @@ -83,6 +83,7 @@ |
|
19 print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c \ |
6 print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ |
20 print-gre.c print-hsrp.c print-icmp.c print-igmp.c \ |
7 print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \ |
21 print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \ |
8 + print-ipoib.c \ |
22 + print-ipoib.c \ |
9 print-ipx.c print-isoclns.c print-juniper.c print-krb.c \ |
23 print-ipx.c print-isoclns.c print-juniper.c print-krb.c \ |
10 print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \ |
24 print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \ |
11 print-lmp.c print-lspping.c print-lwapp.c \ |
25 print-lmp.c print-lspping.c print-lwapp.c \ |
12 diff -uN tcpdump-4.1.1/interface.h tcpdump-4.1.1.new/interface.h |
26 diff -N -u -r tcpdump-4.5.1.orig/netdissect.h tcpdump-4.5.1/netdissect.h |
13 --- tcpdump-4.1.1/interface.h 2010-03-11 17:56:44.000000000 -0800 |
27 --- tcpdump-4.5.1.orig/netdissect.h 2013-03-24 16:49:18.000000000 -0500 |
14 +++ tcpdump-4.1.1.new/interface.h 2011-07-14 08:44:55.908614708 -0700 |
28 +++ tcpdump-4.5.1/netdissect.h 2013-12-02 11:48:46.057536548 -0600 |
15 @@ -192,6 +192,7 @@ |
29 @@ -319,6 +319,7 @@ |
16 extern void ether_print(const u_char *, u_int, u_int, |
30 |
17 void (*)(const u_char *), const u_char *); |
31 extern u_int ether_if_print(netdissect_options *, |
18 extern u_int ether_if_print(const struct pcap_pkthdr *, const u_char *); |
32 const struct pcap_pkthdr *,const u_char *); |
19 +extern u_int ipoib_if_print(const struct pcap_pkthdr *, const u_char *); |
33 +extern u_int ipoib_if_print(const struct pcap_pkthdr *, const u_char *); |
20 extern u_int token_print(const u_char *, u_int, u_int); |
34 extern u_int netanalyzer_if_print(netdissect_options *, |
21 extern u_int token_if_print(const struct pcap_pkthdr *, const u_char *); |
35 const struct pcap_pkthdr *,const u_char *); |
22 extern void fddi_print(const u_char *, u_int, u_int); |
36 extern u_int netanalyzer_transparent_if_print(netdissect_options *, |
23 Common subdirectories: tcpdump-4.1.1/lbl and tcpdump-4.1.1.new/lbl |
37 diff -N -u -r tcpdump-4.5.1.orig/print-arp.c tcpdump-4.5.1/print-arp.c |
24 Common subdirectories: tcpdump-4.1.1/missing and tcpdump-4.1.1.new/missing |
38 --- tcpdump-4.5.1.orig/print-arp.c 2013-02-20 21:54:34.000000000 -0600 |
25 diff -uN tcpdump-4.1.1/netdissect.h tcpdump-4.1.1.new/netdissect.h |
39 +++ tcpdump-4.5.1/print-arp.c 2013-12-02 11:51:40.229231503 -0600 |
26 --- tcpdump-4.1.1/netdissect.h 2010-03-11 17:56:44.000000000 -0800 |
40 @@ -58,6 +58,7 @@ |
27 +++ tcpdump-4.1.1.new/netdissect.h 2011-07-14 08:44:35.643598462 -0700 |
41 #define ARPHRD_ATM2225 19 /* ATM (RFC 2225) */ |
28 @@ -320,6 +320,7 @@ |
42 #define ARPHRD_STRIP 23 /* Ricochet Starmode Radio hardware format */ |
29 |
43 #define ARPHRD_IEEE1394 24 /* IEEE 1394 (FireWire) hardware format */ |
30 extern void arcnet_if_print(u_char*,const struct pcap_pkthdr *,const u_char *); |
44 +#define ARPHRD_INFINIBAND 32 /* InfiniBand RFC 4391 */ |
31 extern void ether_if_print(u_char *,const struct pcap_pkthdr *,const u_char *); |
45 u_short ar_pro; /* format of protocol address */ |
32 +extern void ipoib_if_print(u_char *,const struct pcap_pkthdr *,const u_char *); |
|
33 extern void token_if_print(u_char *,const struct pcap_pkthdr *,const u_char *); |
|
34 extern void fddi_if_print(u_char *,const struct pcap_pkthdr *, const u_char *); |
|
35 |
|
36 diff -uN tcpdump-4.1.1/print-arp.c tcpdump-4.1.1.new/print-arp.c |
|
37 --- tcpdump-4.1.1/print-arp.c 2010-03-11 17:56:44.000000000 -0800 |
|
38 +++ tcpdump-4.1.1.new/print-arp.c 2011-07-14 09:01:08.965396346 -0700 |
|
39 @@ -62,6 +62,7 @@ |
|
40 u_char ar_hln; /* length of hardware address */ |
46 u_char ar_hln; /* length of hardware address */ |
41 u_char ar_pln; /* length of protocol address */ |
47 u_char ar_pln; /* length of protocol address */ |
42 u_short ar_op; /* one of: */ |
|
43 +#define ARPHRD_INFINIBAND 32 /* Infiniband RFC 4391 */ |
|
44 #define ARPOP_REQUEST 1 /* request to resolve address */ |
|
45 #define ARPOP_REPLY 2 /* response to previous request */ |
|
46 #define ARPOP_REVREQUEST 3 /* request protocol address given hardware */ |
|
47 @@ -118,6 +119,7 @@ |
48 @@ -118,6 +119,7 @@ |
48 { ARPHRD_STRIP, "Strip" }, |
49 { ARPHRD_STRIP, "Strip" }, |
49 { ARPHRD_IEEE1394, "IEEE 1394" }, |
50 { ARPHRD_IEEE1394, "IEEE 1394" }, |
50 { ARPHRD_ATM2225, "ATM" }, |
51 { ARPHRD_ATM2225, "ATM" }, |
51 + { ARPHRD_INFINIBAND, "Infiniband" }, |
52 + { ARPHRD_INFINIBAND, "InfiniBand" }, |
52 { 0, NULL } |
53 { 0, NULL } |
53 }; |
54 }; |
54 |
55 |
55 diff -uN tcpdump-4.1.1/print-ipoib.c tcpdump-4.1.1.new/print-ipoib.c |
56 diff -N -u -r tcpdump-4.5.1.orig/print-ipoib.c tcpdump-4.5.1/print-ipoib.c |
56 --- tcpdump-4.1.1/print-ipoib.c 1969-12-31 16:00:00.000000000 -0800 |
57 --- tcpdump-4.5.1.orig/print-ipoib.c 1969-12-31 18:00:00.000000000 -0600 |
57 +++ tcpdump-4.1.1.new/print-ipoib.c 2011-07-14 08:46:52.029342720 -0700 |
58 +++ tcpdump-4.5.1/print-ipoib.c 2013-12-02 11:53:24.664773530 -0600 |
58 @@ -0,0 +1,131 @@ |
59 @@ -0,0 +1,131 @@ |
59 +/* |
60 +/* |
60 + * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000 |
61 + * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, |
|
62 + * 1997, 2000, 2011, 2012 |
61 + * The Regents of the University of California. All rights reserved. |
63 + * The Regents of the University of California. All rights reserved. |
62 + * |
64 + * |
63 + * Redistribution and use in source and binary forms, with or without |
65 + * Redistribution and use in source and binary forms, with or without |
64 + * modification, are permitted provided that: (1) source code distributions |
66 + * modification, are permitted provided that: (1) source code distributions |
65 + * retain the above copyright notice and this paragraph in its entirety, (2) |
67 + * retain the above copyright notice and this paragraph in its entirety, (2) |