summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--netdissect.h2
-rw-r--r--print-ap1394.c4
-rw-r--r--print-arcnet.c16
-rw-r--r--print-bt.c4
-rw-r--r--print-enc.c4
-rw-r--r--print-ipnet.c4
-rw-r--r--print-nflog.c8
-rw-r--r--print-null.c4
-rw-r--r--print-pktap.c10
-rw-r--r--print-ppi.c10
-rw-r--r--print-raw.c2
-rw-r--r--print-sl.c8
-rw-r--r--print-sunatm.c4
-rw-r--r--print-symantec.c4
-rw-r--r--print-usb.c8
-rw-r--r--print.c6
16 files changed, 49 insertions, 49 deletions
diff --git a/netdissect.h b/netdissect.h
index 86605671..f2e45700 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -235,7 +235,7 @@ struct netdissect_options {
int ndo_packettype; /* as specified by -T */
int ndo_snaplen;
- int ndo_ll_header_length; /* link-layer header length */
+ int ndo_ll_hdr_len; /* link-layer header length */
/*global pointers to beginning and end of current packet (during printing) */
const u_char *ndo_packetp;
diff --git a/print-ap1394.c b/print-ap1394.c
index 8cc22fe8..861170bb 100644
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -96,11 +96,11 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
ndo->ndo_protocol = "ap1394";
if (caplen < FIREWIRE_HDRLEN) {
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
nd_print_trunc(ndo);
return;
}
- ndo->ndo_ll_header_length += FIREWIRE_HDRLEN;
+ ndo->ndo_ll_hdr_len += FIREWIRE_HDRLEN;
if (ndo->ndo_eflag)
ap1394_hdr_print(ndo, p, length);
diff --git a/print-arcnet.c b/print-arcnet.c
index 0fa64b29..72477f48 100644
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -193,7 +193,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
ndo->ndo_protocol = "arcnet_if";
if (caplen < ARC_HDRLEN) {
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
@@ -217,7 +217,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
arcnet_print(ndo, p, length, 0, 0, 0);
ND_PRINT(" phds");
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
@@ -227,7 +227,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
arcnet_print(ndo, p, length, 0, 0, 0);
ND_PRINT(" phds extended");
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
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
/*
* This is a middle fragment.
*/
- ndo->ndo_ll_header_length += archdrlen;
+ ndo->ndo_ll_hdr_len += archdrlen;
return;
}
if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
ND_DEFAULTPRINT(p, caplen);
- ndo->ndo_ll_header_length += archdrlen;
+ ndo->ndo_ll_hdr_len += archdrlen;
}
/*
@@ -287,7 +287,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
ndo->ndo_protocol = "arcnet_linux_if";
if (caplen < ARC_LINUX_HDRLEN) {
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
@@ -299,7 +299,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
archdrlen = ARC_LINUX_HDRNEWLEN;
if (caplen < ARC_LINUX_HDRNEWLEN) {
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
break;
@@ -323,7 +323,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
ND_DEFAULTPRINT(p, caplen);
- ndo->ndo_ll_header_length += archdrlen;
+ ndo->ndo_ll_hdr_len += archdrlen;
}
/*
diff --git a/print-bt.c b/print-bt.c
index d65a5ff8..438ff956 100644
--- a/print-bt.c
+++ b/print-bt.c
@@ -56,11 +56,11 @@ bt_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *
ndo->ndo_protocol = "bluetooth";
nd_print_protocol(ndo);
if (caplen < BT_HDRLEN) {
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
nd_print_trunc(ndo);
return;
}
- ndo->ndo_ll_header_length += BT_HDRLEN;
+ ndo->ndo_ll_hdr_len += BT_HDRLEN;
caplen -= BT_HDRLEN;
length -= BT_HDRLEN;
p += BT_HDRLEN;
diff --git a/print-enc.c b/print-enc.c
index aeacd6c6..60733190 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -105,11 +105,11 @@ enc_if_print(netdissect_options *ndo,
ndo->ndo_protocol = "enc";
if (caplen < ENC_HDRLEN) {
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
nd_print_trunc(ndo);
return;
}
- ndo->ndo_ll_header_length += ENC_HDRLEN;
+ ndo->ndo_ll_hdr_len += ENC_HDRLEN;
hdr = (const struct enchdr *)p;
/*
diff --git a/print-ipnet.c b/print-ipnet.c
index f958d42c..ba1e7005 100644
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -66,11 +66,11 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
const ipnet_hdr_t *hdr;
if (caplen < sizeof(ipnet_hdr_t)) {
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
nd_print_trunc(ndo);
return;
}
- ndo->ndo_ll_header_length += sizeof(ipnet_hdr_t);
+ ndo->ndo_ll_hdr_len += sizeof(ipnet_hdr_t);
if (ndo->ndo_eflag)
ipnet_hdr_print(ndo, p, length);
diff --git a/print-nflog.c b/print-nflog.c
index 83222da6..cc58e022 100644
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -145,10 +145,10 @@ nflog_if_print(netdissect_options *ndo,
ndo->ndo_protocol = "nflog";
if (caplen < NFLOG_HDR_LEN) {
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
- ndo->ndo_ll_header_length += NFLOG_HDR_LEN;
+ ndo->ndo_ll_hdr_len += NFLOG_HDR_LEN;
ND_TCHECK_SIZE(hdr);
if (GET_U_1(hdr->nflog_version) != 0) {
@@ -225,11 +225,11 @@ nflog_if_print(netdissect_options *ndo,
break;
}
- ndo->ndo_ll_header_length += h_size - NFLOG_HDR_LEN;
+ ndo->ndo_ll_hdr_len += h_size - NFLOG_HDR_LEN;
return;
trunc:
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += h_size - NFLOG_HDR_LEN;
+ ndo->ndo_ll_hdr_len += h_size - NFLOG_HDR_LEN;
return;
}
diff --git a/print-null.c b/print-null.c
index f2ea96e2..1edff6af 100644
--- a/print-null.c
+++ b/print-null.c
@@ -83,11 +83,11 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
ndo->ndo_protocol = "null";
if (caplen < NULL_HDRLEN) {
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
nd_print_trunc(ndo);
return;
}
- ndo->ndo_ll_header_length += NULL_HDRLEN;
+ ndo->ndo_ll_hdr_len += NULL_HDRLEN;
family = GET_HE_U_4(p);
diff --git a/print-pktap.c b/print-pktap.c
index b38ad641..43042d97 100644
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -109,7 +109,7 @@ pktap_if_print(netdissect_options *ndo,
ndo->ndo_protocol = "pktap";
if (caplen < sizeof(pktap_header_t)) {
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
hdr = (const pktap_header_t *)p;
@@ -124,12 +124,12 @@ pktap_if_print(netdissect_options *ndo,
* be expanded in the future)?
*/
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
if (caplen < hdrlen) {
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
@@ -155,7 +155,7 @@ pktap_if_print(netdissect_options *ndo,
nhdr.len = length;
if (ndo->ndo_void_printer == TRUE) {
printer.void_printer(ndo, &nhdr, p);
- hdrlen += ndo->ndo_ll_header_length;
+ hdrlen += ndo->ndo_ll_hdr_len;
} else
hdrlen += printer.uint_printer(ndo, &nhdr, p);
} else {
@@ -169,7 +169,7 @@ pktap_if_print(netdissect_options *ndo,
break;
}
- ndo->ndo_ll_header_length += hdrlen;
+ ndo->ndo_ll_hdr_len += hdrlen;
return;
}
#endif /* DLT_PKTAP */
diff --git a/print-ppi.c b/print-ppi.c
index 97754265..17fd9833 100644
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -79,7 +79,7 @@ ppi_if_print(netdissect_options *ndo,
ndo->ndo_protocol = "ppi";
if (caplen < sizeof(ppi_header_t)) {
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
@@ -90,7 +90,7 @@ ppi_if_print(netdissect_options *ndo,
ND_PRINT(" [length %u < %zu or > 65532]", len,
sizeof(ppi_header_t));
nd_print_invalid(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
if (caplen < len) {
@@ -99,7 +99,7 @@ ppi_if_print(netdissect_options *ndo,
* bother.
*/
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
dlt = GET_LE_U_4(hdr->ppi_dlt);
@@ -118,7 +118,7 @@ ppi_if_print(netdissect_options *ndo,
nhdr.len = length;
if (ndo->ndo_void_printer == TRUE) {
printer.void_printer(ndo, &nhdr, p);
- hdrlen = ndo->ndo_ll_header_length;
+ hdrlen = ndo->ndo_ll_hdr_len;
} else
hdrlen = printer.uint_printer(ndo, &nhdr, p);
} else {
@@ -129,7 +129,7 @@ ppi_if_print(netdissect_options *ndo,
ND_DEFAULTPRINT(p, caplen);
hdrlen = 0;
}
- ndo->ndo_ll_header_length += len + hdrlen;
+ ndo->ndo_ll_hdr_len += len + hdrlen;
return;
}
#endif /* DLT_PPI */
diff --git a/print-raw.c b/print-raw.c
index ff1ca2d5..78e3e401 100644
--- a/print-raw.c
+++ b/print-raw.c
@@ -37,7 +37,7 @@ void
raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
{
ndo->ndo_protocol = "raw";
- ndo->ndo_ll_header_length += 0;
+ ndo->ndo_ll_hdr_len += 0;
if (ndo->ndo_eflag)
ND_PRINT("ip: ");
diff --git a/print-sl.c b/print-sl.c
index 64bd96da..3866bbc4 100644
--- a/print-sl.c
+++ b/print-sl.c
@@ -65,10 +65,10 @@ sl_if_print(netdissect_options *ndo,
ndo->ndo_protocol = "slip";
if (caplen < SLIP_HDRLEN) {
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
- ndo->ndo_ll_header_length += SLIP_HDRLEN;
+ ndo->ndo_ll_hdr_len += SLIP_HDRLEN;
caplen -= SLIP_HDRLEN;
length -= SLIP_HDRLEN;
@@ -106,10 +106,10 @@ sl_bsdos_if_print(netdissect_options *ndo,
ndo->ndo_protocol = "slip_bsdos";
if (caplen < SLIP_HDRLEN) {
nd_print_trunc(ndo);
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
return;
}
- ndo->ndo_ll_header_length += SLIP_HDRLEN;
+ ndo->ndo_ll_hdr_len += SLIP_HDRLEN;
length -= SLIP_HDRLEN;
diff --git a/print-sunatm.c b/print-sunatm.c
index 27f63c3d..cad97755 100644
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -71,11 +71,11 @@ sunatm_if_print(netdissect_options *ndo,
ndo->ndo_protocol = "sunatm";
if (caplen < PKT_BEGIN_POS) {
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
nd_print_trunc(ndo);
return;
}
- ndo->ndo_ll_header_length += PKT_BEGIN_POS;
+ ndo->ndo_ll_hdr_len += PKT_BEGIN_POS;
if (ndo->ndo_eflag) {
ND_PRINT(GET_U_1(p + DIR_POS) & 0x80 ? "Tx: " : "Rx: ");
diff --git a/print-symantec.c b/print-symantec.c
index 5e203581..faacd117 100644
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -79,12 +79,12 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
ndo->ndo_protocol = "symantec";
if (caplen < sizeof (struct symantec_header)) {
- ndo->ndo_ll_header_length += caplen;
+ ndo->ndo_ll_hdr_len += caplen;
nd_print_trunc(ndo);
return;
}
- ndo->ndo_ll_header_length += sizeof (struct symantec_header);
+ ndo->ndo_ll_hdr_len += sizeof (struct symantec_header);
if (ndo->ndo_eflag)
symantec_hdr_print(ndo, p, length);
diff --git a/print-usb.c b/print-usb.c
index dc697f5f..7d2aece7 100644
--- a/print-usb.c
+++ b/print-usb.c
@@ -253,11 +253,11 @@ usb_linux_48_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
{
ndo->ndo_protocol = "usb_linux_48_byte";
if (h->caplen < sizeof(pcap_usb_header)) {
- ndo->ndo_ll_header_length += h->caplen;
+ ndo->ndo_ll_hdr_len += h->caplen;
nd_print_trunc(ndo);
return;
}
- ndo->ndo_ll_header_length += sizeof (pcap_usb_header);
+ ndo->ndo_ll_hdr_len += sizeof (pcap_usb_header);
usb_header_print(ndo, (const pcap_usb_header *) p);
@@ -279,11 +279,11 @@ usb_linux_64_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
{
ndo->ndo_protocol = "usb_linux_64_byte";
if (h->caplen < sizeof(pcap_usb_header_mmapped)) {
- ndo->ndo_ll_header_length += h->caplen;
+ ndo->ndo_ll_hdr_len += h->caplen;
nd_print_trunc(ndo);
return;
}
- ndo->ndo_ll_header_length += sizeof (pcap_usb_header_mmapped);
+ ndo->ndo_ll_hdr_len += sizeof (pcap_usb_header_mmapped);
usb_header_print(ndo, (const pcap_usb_header *) p);
diff --git a/print.c b/print.c
index a7f006f9..9c4eef55 100644
--- a/print.c
+++ b/print.c
@@ -461,18 +461,18 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
ndo->ndo_snapend = sp + h->caplen;
ndo->ndo_protocol = "";
- ndo->ndo_ll_header_length = 0;
+ ndo->ndo_ll_hdr_len = 0;
if (setjmp(ndo->ndo_truncated) == 0) {
/* Print the packet. */
if (ndo->ndo_void_printer == TRUE) {
(ndo->ndo_if_printer.void_printer)(ndo, h, sp);
- hdrlen = ndo->ndo_ll_header_length;
+ hdrlen = ndo->ndo_ll_hdr_len;
} else
hdrlen = (ndo->ndo_if_printer.uint_printer)(ndo, h, sp);
} else {
/* A printer quit because the packet was truncated; report it */
ND_PRINT(" [|%s]", ndo->ndo_protocol);
- hdrlen = ndo->ndo_ll_header_length;
+ hdrlen = ndo->ndo_ll_hdr_len;
}
/*
View Lorry Controller Status