Skip to content

Commit fb1b6d8

Browse files
committed
Fix up a bunch of comments - the on-the-wire length field in a
pcap_pkthdr is "len", not "length".
1 parent 94592bf commit fb1b6d8

14 files changed

+29
-29
lines changed

Diff for: print-802_11.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#ifndef lint
2424
static const char rcsid[] _U_ =
25-
"@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.28 2003-12-10 09:51:03 guy Exp $ (LBL)";
25+
"@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.29 2004-03-17 23:24:35 guy Exp $ (LBL)";
2626
#endif
2727

2828
#ifdef HAVE_CONFIG_H
@@ -910,7 +910,7 @@ ieee802_11_print(const u_char *p, u_int length, u_int caplen)
910910
/*
911911
* This is the top level routine of the printer. 'p' points
912912
* to the 802.11 header of the packet, 'h->ts' is the timestamp,
913-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
913+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
914914
* is the number of bytes actually captured.
915915
*/
916916
u_int

Diff for: print-ap1394.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
#ifndef lint
2222
static const char rcsid[] _U_ =
23-
"@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.2 2004-03-17 22:11:34 guy Exp $ (LBL)";
23+
"@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.3 2004-03-17 23:24:35 guy Exp $ (LBL)";
2424
#endif
2525

2626
#ifdef HAVE_CONFIG_H
@@ -77,7 +77,7 @@ ap1394_hdr_print(register const u_char *bp, u_int length)
7777
/*
7878
* This is the top level routine of the printer. 'p' points
7979
* to the ether header of the packet, 'h->ts' is the timestamp,
80-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
80+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
8181
* is the number of bytes actually captured.
8282
*/
8383
u_int

Diff for: print-arcnet.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
#ifndef lint
2424
static const char rcsid[] _U_ =
25-
"@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.17 2003-11-16 09:36:12 guy Exp $ (LBL)";
25+
"@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.18 2004-03-17 23:24:35 guy Exp $ (LBL)";
2626
#endif
2727

2828
#ifdef HAVE_CONFIG_H
@@ -103,7 +103,7 @@ arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid)
103103
/*
104104
* This is the top level routine of the printer. 'p' points
105105
* to the ARCNET header of the packet, 'h->ts' is the timestamp,
106-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
106+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
107107
* is the number of bytes actually captured.
108108
*/
109109
u_int
@@ -187,7 +187,7 @@ arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
187187
/*
188188
* This is the top level routine of the printer. 'p' points
189189
* to the ARCNET header of the packet, 'h->ts' is the timestamp,
190-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
190+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
191191
* is the number of bytes actually captured. It is quite similar
192192
* to the non-Linux style printer except that Linux doesn't ever
193193
* supply packets that look like exception frames, it always supplies

Diff for: print-atm.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
#ifndef lint
2222
static const char rcsid[] _U_ =
23-
"@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.35 2003-11-16 09:36:13 guy Exp $ (LBL)";
23+
"@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.36 2004-03-17 23:24:36 guy Exp $ (LBL)";
2424
#endif
2525

2626
#ifdef HAVE_CONFIG_H
@@ -72,7 +72,7 @@ atm_llc_print(const u_char *p, int length, int caplen)
7272
/*
7373
* This is the top level routine of the printer. 'p' points
7474
* to the LLC/SNAP header of the packet, 'h->ts' is the timestamp,
75-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
75+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
7676
* is the number of bytes actually captured.
7777
*/
7878
u_int

Diff for: print-cip.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#ifndef lint
2424
static const char rcsid[] _U_ =
25-
"@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.23 2003-11-16 09:36:16 guy Exp $ (LBL)";
25+
"@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.24 2004-03-17 23:24:36 guy Exp $ (LBL)";
2626
#endif
2727

2828
#ifdef HAVE_CONFIG_H
@@ -63,7 +63,7 @@ cip_print(int length)
6363
/*
6464
* This is the top level routine of the printer. 'p' points
6565
* to the LLC/SNAP or raw header of the packet, 'h->ts' is the timestamp,
66-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
66+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
6767
* is the number of bytes actually captured.
6868
*/
6969
u_int

Diff for: print-ether.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
#ifndef lint
2222
static const char rcsid[] _U_ =
23-
"@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.88 2004-02-18 14:23:27 hannes Exp $ (LBL)";
23+
"@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.89 2004-03-17 23:24:36 guy Exp $ (LBL)";
2424
#endif
2525

2626
#ifdef HAVE_CONFIG_H
@@ -153,7 +153,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
153153
/*
154154
* This is the top level routine of the printer. 'p' points
155155
* to the ether header of the packet, 'h->ts' is the timestamp,
156-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
156+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
157157
* is the number of bytes actually captured.
158158
*/
159159
u_int

Diff for: print-fddi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#ifndef lint
2323
static const char rcsid[] _U_ =
24-
"@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.63 2003-11-16 09:36:21 guy Exp $ (LBL)";
24+
"@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.64 2004-03-17 23:24:37 guy Exp $ (LBL)";
2525
#endif
2626

2727
#ifdef HAVE_CONFIG_H
@@ -298,7 +298,7 @@ fddi_print(const u_char *p, u_int length, u_int caplen)
298298
/*
299299
* This is the top level routine of the printer. 'p' points
300300
* to the FDDI header of the packet, 'h->ts' is the timestamp,
301-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
301+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
302302
* is the number of bytes actually captured.
303303
*/
304304
u_int

Diff for: print-ipfc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#ifndef lint
2323
static const char rcsid[] _U_ =
24-
"@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.6 2003-11-16 09:36:24 guy Exp $ (LBL)";
24+
"@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.7 2004-03-17 23:24:37 guy Exp $ (LBL)";
2525
#endif
2626

2727
#ifdef HAVE_CONFIG_H
@@ -125,7 +125,7 @@ ipfc_print(const u_char *p, u_int length, u_int caplen)
125125
/*
126126
* This is the top level routine of the printer. 'p' points
127127
* to the Network_Header of the packet, 'h->ts' is the timestamp,
128-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
128+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
129129
* is the number of bytes actually captured.
130130
*/
131131
u_int

Diff for: print-lane.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#ifndef lint
2424
static const char rcsid[] _U_ =
25-
"@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.22 2003-11-16 09:36:27 guy Exp $ (LBL)";
25+
"@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23 2004-03-17 23:24:37 guy Exp $ (LBL)";
2626
#endif
2727

2828
#ifdef HAVE_CONFIG_H
@@ -84,7 +84,7 @@ lane_hdr_print(register const u_char *bp, int length)
8484
/*
8585
* This is the top level routine of the printer. 'p' points
8686
* to the LANE header of the packet, 'h->ts' is the timestamp,
87-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
87+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
8888
* is the number of bytes actually captured.
8989
*
9090
* This assumes 802.3, not 802.5, LAN emulation.

Diff for: print-null.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#ifndef lint
2323
static const char rcsid[] _U_ =
24-
"@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.51 2003-11-16 09:36:30 guy Exp $ (LBL)";
24+
"@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.52 2004-03-17 23:24:38 guy Exp $ (LBL)";
2525
#endif
2626

2727
#ifdef HAVE_CONFIG_H
@@ -125,7 +125,7 @@ null_print(u_int family, u_int length)
125125
/*
126126
* This is the top level routine of the printer. 'p' points
127127
* to the ether header of the packet, 'h->ts' is the timestamp,
128-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
128+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
129129
* is the number of bytes actually captured.
130130
*/
131131
u_int

Diff for: print-sll.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
#ifndef lint
2222
static const char rcsid[] _U_ =
23-
"@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.14 2003-11-16 09:36:37 guy Exp $ (LBL)";
23+
"@(#) $Header: /tcpdump/master/tcpdump/print-sll.c,v 1.15 2004-03-17 23:24:38 guy Exp $ (LBL)";
2424
#endif
2525

2626
#ifdef HAVE_CONFIG_H
@@ -89,7 +89,7 @@ sll_print(register const struct sll_header *sllp, u_int length)
8989
/*
9090
* This is the top level routine of the printer. 'p' points to the
9191
* Linux "cooked capture" header of the packet, 'h->ts' is the timestamp,
92-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
92+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
9393
* is the number of bytes actually captured.
9494
*/
9595
u_int

Diff for: print-sunatm.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
#ifndef lint
3333
static const char rcsid[] _U_ =
34-
"@(#) $Header: /tcpdump/master/tcpdump/print-sunatm.c,v 1.7 2003-11-16 09:36:39 guy Exp $ (LBL)";
34+
"@(#) $Header: /tcpdump/master/tcpdump/print-sunatm.c,v 1.8 2004-03-17 23:24:38 guy Exp $ (LBL)";
3535
#endif
3636

3737
#ifdef HAVE_CONFIG_H
@@ -66,7 +66,7 @@ struct rtentry;
6666
/*
6767
* This is the top level routine of the printer. 'p' points
6868
* to the SunATM pseudo-header for the packet, 'h->ts' is the timestamp,
69-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
69+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
7070
* is the number of bytes actually captured.
7171
*/
7272
u_int

Diff for: print-symantec.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
#ifndef lint
2222
static const char rcsid[] _U_ =
23-
"@(#) $Header: /tcpdump/master/tcpdump/print-symantec.c,v 1.1 2004-03-11 09:36:16 guy Exp $ (LBL)";
23+
"@(#) $Header: /tcpdump/master/tcpdump/print-symantec.c,v 1.2 2004-03-17 23:24:38 guy Exp $ (LBL)";
2424
#endif
2525

2626
#ifdef HAVE_CONFIG_H
@@ -75,7 +75,7 @@ symantec_hdr_print(register const u_char *bp, u_int length)
7575
/*
7676
* This is the top level routine of the printer. 'p' points
7777
* to the ether header of the packet, 'h->ts' is the timestamp,
78-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
78+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
7979
* is the number of bytes actually captured.
8080
*/
8181
u_int

Diff for: print-token.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
#ifndef lint
2727
static const char rcsid[] _U_ =
28-
"@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.24 2003-11-16 09:36:40 guy Exp $";
28+
"@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.25 2004-03-17 23:24:38 guy Exp $";
2929
#endif
3030

3131
#ifdef HAVE_CONFIG_H
@@ -185,7 +185,7 @@ token_print(const u_char *p, u_int length, u_int caplen)
185185
/*
186186
* This is the top level routine of the printer. 'p' points
187187
* to the TR header of the packet, 'h->ts' is the timestamp,
188-
* 'h->length' is the length of the packet off the wire, and 'h->caplen'
188+
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
189189
* is the number of bytes actually captured.
190190
*/
191191
u_int

0 commit comments

Comments
 (0)