Skip to content

Commit 96c6002

Browse files
fxlbfxlb
committed
Rename a field of the netdissect_options structure
1 parent 073fea9 commit 96c6002

16 files changed

+49
-49
lines changed

‎netdissect.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ struct netdissect_options {
235235
int ndo_packettype; /* as specified by -T */
236236

237237
int ndo_snaplen;
238-
int ndo_ll_header_length; /* link-layer header length */
238+
int ndo_ll_hdr_len; /* link-layer header length */
239239

240240
/*global pointers to beginning and end of current packet (during printing) */
241241
const u_char *ndo_packetp;

‎print-ap1394.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
9696

9797
ndo->ndo_protocol = "ap1394";
9898
if (caplen < FIREWIRE_HDRLEN) {
99-
ndo->ndo_ll_header_length += caplen;
99+
ndo->ndo_ll_hdr_len += caplen;
100100
nd_print_trunc(ndo);
101101
return;
102102
}
103-
ndo->ndo_ll_header_length += FIREWIRE_HDRLEN;
103+
ndo->ndo_ll_hdr_len += FIREWIRE_HDRLEN;
104104

105105
if (ndo->ndo_eflag)
106106
ap1394_hdr_print(ndo, p, length);

‎print-arcnet.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
193193
ndo->ndo_protocol = "arcnet_if";
194194
if (caplen < ARC_HDRLEN) {
195195
nd_print_trunc(ndo);
196-
ndo->ndo_ll_header_length += caplen;
196+
ndo->ndo_ll_hdr_len += caplen;
197197
return;
198198
}
199199

@@ -217,7 +217,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
217217
arcnet_print(ndo, p, length, 0, 0, 0);
218218
ND_PRINT(" phds");
219219
nd_print_trunc(ndo);
220-
ndo->ndo_ll_header_length += caplen;
220+
ndo->ndo_ll_hdr_len += caplen;
221221
return;
222222
}
223223

@@ -227,7 +227,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
227227
arcnet_print(ndo, p, length, 0, 0, 0);
228228
ND_PRINT(" phds extended");
229229
nd_print_trunc(ndo);
230-
ndo->ndo_ll_header_length += caplen;
230+
ndo->ndo_ll_hdr_len += caplen;
231231
return;
232232
}
233233
flag = GET_U_1(ap->arc_flag2);
@@ -254,14 +254,14 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
254254
/*
255255
* This is a middle fragment.
256256
*/
257-
ndo->ndo_ll_header_length += archdrlen;
257+
ndo->ndo_ll_hdr_len += archdrlen;
258258
return;
259259
}
260260

261261
if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
262262
ND_DEFAULTPRINT(p, caplen);
263263

264-
ndo->ndo_ll_header_length += archdrlen;
264+
ndo->ndo_ll_hdr_len += archdrlen;
265265
}
266266

267267
/*
@@ -287,7 +287,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
287287
ndo->ndo_protocol = "arcnet_linux_if";
288288
if (caplen < ARC_LINUX_HDRLEN) {
289289
nd_print_trunc(ndo);
290-
ndo->ndo_ll_header_length += caplen;
290+
ndo->ndo_ll_hdr_len += caplen;
291291
return;
292292
}
293293

@@ -299,7 +299,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
299299
archdrlen = ARC_LINUX_HDRNEWLEN;
300300
if (caplen < ARC_LINUX_HDRNEWLEN) {
301301
nd_print_trunc(ndo);
302-
ndo->ndo_ll_header_length += caplen;
302+
ndo->ndo_ll_hdr_len += caplen;
303303
return;
304304
}
305305
break;
@@ -323,7 +323,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
323323
if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
324324
ND_DEFAULTPRINT(p, caplen);
325325

326-
ndo->ndo_ll_header_length += archdrlen;
326+
ndo->ndo_ll_hdr_len += archdrlen;
327327
}
328328

329329
/*

‎print-bt.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ bt_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *
5656
ndo->ndo_protocol = "bluetooth";
5757
nd_print_protocol(ndo);
5858
if (caplen < BT_HDRLEN) {
59-
ndo->ndo_ll_header_length += caplen;
59+
ndo->ndo_ll_hdr_len += caplen;
6060
nd_print_trunc(ndo);
6161
return;
6262
}
63-
ndo->ndo_ll_header_length += BT_HDRLEN;
63+
ndo->ndo_ll_hdr_len += BT_HDRLEN;
6464
caplen -= BT_HDRLEN;
6565
length -= BT_HDRLEN;
6666
p += BT_HDRLEN;

‎print-enc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ enc_if_print(netdissect_options *ndo,
105105

106106
ndo->ndo_protocol = "enc";
107107
if (caplen < ENC_HDRLEN) {
108-
ndo->ndo_ll_header_length += caplen;
108+
ndo->ndo_ll_hdr_len += caplen;
109109
nd_print_trunc(ndo);
110110
return;
111111
}
112-
ndo->ndo_ll_header_length += ENC_HDRLEN;
112+
ndo->ndo_ll_hdr_len += ENC_HDRLEN;
113113

114114
hdr = (const struct enchdr *)p;
115115
/*

‎print-ipnet.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
6666
const ipnet_hdr_t *hdr;
6767

6868
if (caplen < sizeof(ipnet_hdr_t)) {
69-
ndo->ndo_ll_header_length += caplen;
69+
ndo->ndo_ll_hdr_len += caplen;
7070
nd_print_trunc(ndo);
7171
return;
7272
}
73-
ndo->ndo_ll_header_length += sizeof(ipnet_hdr_t);
73+
ndo->ndo_ll_hdr_len += sizeof(ipnet_hdr_t);
7474

7575
if (ndo->ndo_eflag)
7676
ipnet_hdr_print(ndo, p, length);

‎print-nflog.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ nflog_if_print(netdissect_options *ndo,
145145
ndo->ndo_protocol = "nflog";
146146
if (caplen < NFLOG_HDR_LEN) {
147147
nd_print_trunc(ndo);
148-
ndo->ndo_ll_header_length += caplen;
148+
ndo->ndo_ll_hdr_len += caplen;
149149
return;
150150
}
151-
ndo->ndo_ll_header_length += NFLOG_HDR_LEN;
151+
ndo->ndo_ll_hdr_len += NFLOG_HDR_LEN;
152152

153153
ND_TCHECK_SIZE(hdr);
154154
if (GET_U_1(hdr->nflog_version) != 0) {
@@ -225,11 +225,11 @@ nflog_if_print(netdissect_options *ndo,
225225
break;
226226
}
227227

228-
ndo->ndo_ll_header_length += h_size - NFLOG_HDR_LEN;
228+
ndo->ndo_ll_hdr_len += h_size - NFLOG_HDR_LEN;
229229
return;
230230
trunc:
231231
nd_print_trunc(ndo);
232-
ndo->ndo_ll_header_length += h_size - NFLOG_HDR_LEN;
232+
ndo->ndo_ll_hdr_len += h_size - NFLOG_HDR_LEN;
233233
return;
234234
}
235235

‎print-null.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
8383

8484
ndo->ndo_protocol = "null";
8585
if (caplen < NULL_HDRLEN) {
86-
ndo->ndo_ll_header_length += caplen;
86+
ndo->ndo_ll_hdr_len += caplen;
8787
nd_print_trunc(ndo);
8888
return;
8989
}
90-
ndo->ndo_ll_header_length += NULL_HDRLEN;
90+
ndo->ndo_ll_hdr_len += NULL_HDRLEN;
9191

9292
family = GET_HE_U_4(p);
9393

‎print-pktap.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ pktap_if_print(netdissect_options *ndo,
109109
ndo->ndo_protocol = "pktap";
110110
if (caplen < sizeof(pktap_header_t)) {
111111
nd_print_trunc(ndo);
112-
ndo->ndo_ll_header_length += caplen;
112+
ndo->ndo_ll_hdr_len += caplen;
113113
return;
114114
}
115115
hdr = (const pktap_header_t *)p;
@@ -124,12 +124,12 @@ pktap_if_print(netdissect_options *ndo,
124124
* be expanded in the future)?
125125
*/
126126
nd_print_trunc(ndo);
127-
ndo->ndo_ll_header_length += caplen;
127+
ndo->ndo_ll_hdr_len += caplen;
128128
return;
129129
}
130130
if (caplen < hdrlen) {
131131
nd_print_trunc(ndo);
132-
ndo->ndo_ll_header_length += caplen;
132+
ndo->ndo_ll_hdr_len += caplen;
133133
return;
134134
}
135135

@@ -155,7 +155,7 @@ pktap_if_print(netdissect_options *ndo,
155155
nhdr.len = length;
156156
if (ndo->ndo_void_printer == TRUE) {
157157
printer.void_printer(ndo, &nhdr, p);
158-
hdrlen += ndo->ndo_ll_header_length;
158+
hdrlen += ndo->ndo_ll_hdr_len;
159159
} else
160160
hdrlen += printer.uint_printer(ndo, &nhdr, p);
161161
} else {
@@ -169,7 +169,7 @@ pktap_if_print(netdissect_options *ndo,
169169
break;
170170
}
171171

172-
ndo->ndo_ll_header_length += hdrlen;
172+
ndo->ndo_ll_hdr_len += hdrlen;
173173
return;
174174
}
175175
#endif /* DLT_PKTAP */

‎print-ppi.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ppi_if_print(netdissect_options *ndo,
7979
ndo->ndo_protocol = "ppi";
8080
if (caplen < sizeof(ppi_header_t)) {
8181
nd_print_trunc(ndo);
82-
ndo->ndo_ll_header_length += caplen;
82+
ndo->ndo_ll_hdr_len += caplen;
8383
return;
8484
}
8585

@@ -90,7 +90,7 @@ ppi_if_print(netdissect_options *ndo,
9090
ND_PRINT(" [length %u < %zu or > 65532]", len,
9191
sizeof(ppi_header_t));
9292
nd_print_invalid(ndo);
93-
ndo->ndo_ll_header_length += caplen;
93+
ndo->ndo_ll_hdr_len += caplen;
9494
return;
9595
}
9696
if (caplen < len) {
@@ -99,7 +99,7 @@ ppi_if_print(netdissect_options *ndo,
9999
* bother.
100100
*/
101101
nd_print_trunc(ndo);
102-
ndo->ndo_ll_header_length += caplen;
102+
ndo->ndo_ll_hdr_len += caplen;
103103
return;
104104
}
105105
dlt = GET_LE_U_4(hdr->ppi_dlt);
@@ -118,7 +118,7 @@ ppi_if_print(netdissect_options *ndo,
118118
nhdr.len = length;
119119
if (ndo->ndo_void_printer == TRUE) {
120120
printer.void_printer(ndo, &nhdr, p);
121-
hdrlen = ndo->ndo_ll_header_length;
121+
hdrlen = ndo->ndo_ll_hdr_len;
122122
} else
123123
hdrlen = printer.uint_printer(ndo, &nhdr, p);
124124
} else {
@@ -129,7 +129,7 @@ ppi_if_print(netdissect_options *ndo,
129129
ND_DEFAULTPRINT(p, caplen);
130130
hdrlen = 0;
131131
}
132-
ndo->ndo_ll_header_length += len + hdrlen;
132+
ndo->ndo_ll_hdr_len += len + hdrlen;
133133
return;
134134
}
135135
#endif /* DLT_PPI */

‎print-raw.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void
3737
raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
3838
{
3939
ndo->ndo_protocol = "raw";
40-
ndo->ndo_ll_header_length += 0;
40+
ndo->ndo_ll_hdr_len += 0;
4141
if (ndo->ndo_eflag)
4242
ND_PRINT("ip: ");
4343

‎print-sl.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ sl_if_print(netdissect_options *ndo,
6565
ndo->ndo_protocol = "slip";
6666
if (caplen < SLIP_HDRLEN) {
6767
nd_print_trunc(ndo);
68-
ndo->ndo_ll_header_length += caplen;
68+
ndo->ndo_ll_hdr_len += caplen;
6969
return;
7070
}
71-
ndo->ndo_ll_header_length += SLIP_HDRLEN;
71+
ndo->ndo_ll_hdr_len += SLIP_HDRLEN;
7272

7373
caplen -= SLIP_HDRLEN;
7474
length -= SLIP_HDRLEN;
@@ -106,10 +106,10 @@ sl_bsdos_if_print(netdissect_options *ndo,
106106
ndo->ndo_protocol = "slip_bsdos";
107107
if (caplen < SLIP_HDRLEN) {
108108
nd_print_trunc(ndo);
109-
ndo->ndo_ll_header_length += caplen;
109+
ndo->ndo_ll_hdr_len += caplen;
110110
return;
111111
}
112-
ndo->ndo_ll_header_length += SLIP_HDRLEN;
112+
ndo->ndo_ll_hdr_len += SLIP_HDRLEN;
113113

114114
length -= SLIP_HDRLEN;
115115

‎print-sunatm.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ sunatm_if_print(netdissect_options *ndo,
7171

7272
ndo->ndo_protocol = "sunatm";
7373
if (caplen < PKT_BEGIN_POS) {
74-
ndo->ndo_ll_header_length += caplen;
74+
ndo->ndo_ll_hdr_len += caplen;
7575
nd_print_trunc(ndo);
7676
return;
7777
}
78-
ndo->ndo_ll_header_length += PKT_BEGIN_POS;
78+
ndo->ndo_ll_hdr_len += PKT_BEGIN_POS;
7979

8080
if (ndo->ndo_eflag) {
8181
ND_PRINT(GET_U_1(p + DIR_POS) & 0x80 ? "Tx: " : "Rx: ");

‎print-symantec.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
7979

8080
ndo->ndo_protocol = "symantec";
8181
if (caplen < sizeof (struct symantec_header)) {
82-
ndo->ndo_ll_header_length += caplen;
82+
ndo->ndo_ll_hdr_len += caplen;
8383
nd_print_trunc(ndo);
8484
return;
8585
}
8686

87-
ndo->ndo_ll_header_length += sizeof (struct symantec_header);
87+
ndo->ndo_ll_hdr_len += sizeof (struct symantec_header);
8888
if (ndo->ndo_eflag)
8989
symantec_hdr_print(ndo, p, length);
9090

‎print-usb.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ usb_linux_48_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
253253
{
254254
ndo->ndo_protocol = "usb_linux_48_byte";
255255
if (h->caplen < sizeof(pcap_usb_header)) {
256-
ndo->ndo_ll_header_length += h->caplen;
256+
ndo->ndo_ll_hdr_len += h->caplen;
257257
nd_print_trunc(ndo);
258258
return;
259259
}
260-
ndo->ndo_ll_header_length += sizeof (pcap_usb_header);
260+
ndo->ndo_ll_hdr_len += sizeof (pcap_usb_header);
261261

262262
usb_header_print(ndo, (const pcap_usb_header *) p);
263263

@@ -279,11 +279,11 @@ usb_linux_64_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
279279
{
280280
ndo->ndo_protocol = "usb_linux_64_byte";
281281
if (h->caplen < sizeof(pcap_usb_header_mmapped)) {
282-
ndo->ndo_ll_header_length += h->caplen;
282+
ndo->ndo_ll_hdr_len += h->caplen;
283283
nd_print_trunc(ndo);
284284
return;
285285
}
286-
ndo->ndo_ll_header_length += sizeof (pcap_usb_header_mmapped);
286+
ndo->ndo_ll_hdr_len += sizeof (pcap_usb_header_mmapped);
287287

288288
usb_header_print(ndo, (const pcap_usb_header *) p);
289289

‎print.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -461,18 +461,18 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
461461
ndo->ndo_snapend = sp + h->caplen;
462462

463463
ndo->ndo_protocol = "";
464-
ndo->ndo_ll_header_length = 0;
464+
ndo->ndo_ll_hdr_len = 0;
465465
if (setjmp(ndo->ndo_truncated) == 0) {
466466
/* Print the packet. */
467467
if (ndo->ndo_void_printer == TRUE) {
468468
(ndo->ndo_if_printer.void_printer)(ndo, h, sp);
469-
hdrlen = ndo->ndo_ll_header_length;
469+
hdrlen = ndo->ndo_ll_hdr_len;
470470
} else
471471
hdrlen = (ndo->ndo_if_printer.uint_printer)(ndo, h, sp);
472472
} else {
473473
/* A printer quit because the packet was truncated; report it */
474474
ND_PRINT(" [|%s]", ndo->ndo_protocol);
475-
hdrlen = ndo->ndo_ll_header_length;
475+
hdrlen = ndo->ndo_ll_hdr_len;
476476
}
477477

478478
/*

0 commit comments

Comments
 (0)