Rename a field of the netdissect_options structure

diff --git a/netdissect.h b/netdissect.h
index 866056711b3b0f33dc4df9c511e6591da467ac68..f2e4570073d9df0b228f67b5ef05fff561446281 100644 (file)
--- 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 8cc22fe83215ee8b2ec69c804bb706d2b23b7295..861170bbe8e988b0aecf7558dec5022ac48d76c4 100644 (file)
--- 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 0fa64b29126a1e70f96fc842a6f929c0347ec38e..72477f48e0f7038a5da830a8eb763fd952cab505 100644 (file)
--- 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 d65a5ff820037b06de4af699f30371c809b86a2c..438ff9561cbc4a6e975d6d0a7607b8016d971577 100644 (file)
--- 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 aeacd6c6818a752cfdcd4ac5c3ca5dd4a743c17b..607331906c9bc762c4d4c8f0fa70216a21156c84 100644 (file)
--- 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 f958d42c032918d705f25aeb4c78cad609bbd480..ba1e7005db2daf6cb6363ee885dee6702a6e7abd 100644 (file)
--- 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 83222da692eef917bae7b21f7458c5e692ed4dcd..cc58e022dcb1e1cffc7b17885d8206c095f8ef90 100644 (file)
--- 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 f2ea96e2f73a9ce389bc52e4066c3d1e751838f5..1edff6af6e2168c74c098ca8625018bd8a7f2fb4 100644 (file)
--- 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 b38ad6419b783c08fe3c55de0398a617c363078f..43042d9745670b41ffb2a51168a9280a1ab408bf 100644 (file)
--- 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 977542650c83e9b26ad1a9a5f87138d89e9376e6..17fd9833065d6aee2fd567e6a610548cf5ef443f 100644 (file)
--- 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 ff1ca2d550845104e3c3a47a0fdc09510549521e..78e3e401b678a4538340b497c43cf1980bf8a2bd 100644 (file)
--- 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 64bd96daf6b0073cbb0578f9802920ea5467c171..3866bbc4825138143990dd9ba6b7879428dbdbd3 100644 (file)
--- 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 27f63c3db8cd611262ec954f99265870471e663a..cad977551e44702af60298811d3ae52b4b78092d 100644 (file)
--- 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 5e203581187dfd7dd3c5106d612226c7617acc64..faacd117650f8fd27e129b763913cf8bfcaa98df 100644 (file)
--- 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 dc697f5fc719a83c356e7b66170fb19d51c4979b..7d2aece79976fbc22fe1f4e261177021cd1f3b96 100644 (file)
--- 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 a7f006f965e6eae64e44ef747caec438db1e9638..9c4eef5542fb7f5e4d54c6707625b240410d59ee 100644 (file)
--- 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;
        }
 
        /*