Rename EXTRACT_ macros

Now all the macros have a name meaning a count in bytes.

With _S_: signed, _U_: unsigned

e.g.:
EXTRACT_BE_32BITS -> EXTRACT_BE_U_4
EXTRACT_LE_32BITS -> EXTRACT_LE_U_4
...
EXTRACT_BE_INT32 -> EXTRACT_BE_S_4

and have:
EXTRACT_8BITS -> EXTRACT_U_1
EXTRACT_INT8  -> EXTRACT_S_1

1 files changed, 42 insertions, 42 deletions

diff --git a/print-ldp.c b/print-ldp.c
index df43da78..5a7608b9 100644
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -251,13 +251,13 @@ ldp_tlv_print(netdissect_options *ndo,
 
     ldp_tlv_header = (const struct ldp_tlv_header *)tptr;
     ND_TCHECK(*ldp_tlv_header);
-    tlv_len=EXTRACT_BE_16BITS(ldp_tlv_header->length);
+    tlv_len=EXTRACT_BE_U_2(ldp_tlv_header->length);
     if (tlv_len + 4 > msg_tlen) {
         ND_PRINT((ndo, "\n\t\t TLV contents go past end of message"));
         return 0;
     }
     tlv_tlen=tlv_len;
-    tlv_type=LDP_MASK_TLV_TYPE(EXTRACT_BE_16BITS(ldp_tlv_header->type));
+    tlv_type=LDP_MASK_TLV_TYPE(EXTRACT_BE_U_2(ldp_tlv_header->type));
 
     /* FIXME vendor private / experimental check */
     ND_PRINT((ndo, "\n\t    %s TLV (0x%04x), length: %u, Flags: [%s and %s forward if unknown]",
@@ -266,8 +266,8 @@ ldp_tlv_print(netdissect_options *ndo,
                    tlv_type),
            tlv_type,
            tlv_len,
-           LDP_MASK_U_BIT(EXTRACT_BE_16BITS(&ldp_tlv_header->type)) ? "continue processing" : "ignore",
-           LDP_MASK_F_BIT(EXTRACT_BE_16BITS(&ldp_tlv_header->type)) ? "do" : "don't"));
+           LDP_MASK_U_BIT(EXTRACT_BE_U_2(&ldp_tlv_header->type)) ? "continue processing" : "ignore",
+           LDP_MASK_F_BIT(EXTRACT_BE_U_2(&ldp_tlv_header->type)) ? "do" : "don't"));
 
     tptr+=sizeof(struct ldp_tlv_header);
 
@@ -276,9 +276,9 @@ ldp_tlv_print(netdissect_options *ndo,
     case LDP_TLV_COMMON_HELLO:
         TLV_TCHECK(4);
         ND_PRINT((ndo, "\n\t      Hold Time: %us, Flags: [%s Hello%s]",
-               EXTRACT_BE_16BITS(tptr),
-               (EXTRACT_BE_16BITS(tptr + 2)&0x8000) ? "Targeted" : "Link",
-               (EXTRACT_BE_16BITS(tptr + 2)&0x4000) ? ", Request for targeted Hellos" : ""));
+               EXTRACT_BE_U_2(tptr),
+               (EXTRACT_BE_U_2(tptr + 2)&0x8000) ? "Targeted" : "Link",
+               (EXTRACT_BE_U_2(tptr + 2)&0x4000) ? ", Request for targeted Hellos" : ""));
         break;
 
     case LDP_TLV_IPV4_TRANSPORT_ADDR:
@@ -291,12 +291,12 @@ ldp_tlv_print(netdissect_options *ndo,
         break;
     case LDP_TLV_CONFIG_SEQ_NUMBER:
         TLV_TCHECK(4);
-        ND_PRINT((ndo, "\n\t      Sequence Number: %u", EXTRACT_BE_32BITS(tptr)));
+        ND_PRINT((ndo, "\n\t      Sequence Number: %u", EXTRACT_BE_U_4(tptr)));
         break;
 
     case LDP_TLV_ADDRESS_LIST:
         TLV_TCHECK(LDP_TLV_ADDRESS_LIST_AFNUM_LEN);
-	af = EXTRACT_BE_16BITS(tptr);
+	af = EXTRACT_BE_U_2(tptr);
 	tptr+=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
         tlv_tlen -= LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
 	ND_PRINT((ndo, "\n\t      Address Family: %s, addresses",
@@ -327,9 +327,9 @@ ldp_tlv_print(netdissect_options *ndo,
     case LDP_TLV_COMMON_SESSION:
 	TLV_TCHECK(8);
 	ND_PRINT((ndo, "\n\t      Version: %u, Keepalive: %us, Flags: [Downstream %s, Loop Detection %s]",
-	       EXTRACT_BE_16BITS(tptr), EXTRACT_BE_16BITS(tptr + 2),
-	       (EXTRACT_BE_16BITS(tptr + 6)&0x8000) ? "On Demand" : "Unsolicited",
-	       (EXTRACT_BE_16BITS(tptr + 6)&0x4000) ? "Enabled" : "Disabled"
+	       EXTRACT_BE_U_2(tptr), EXTRACT_BE_U_2(tptr + 2),
+	       (EXTRACT_BE_U_2(tptr + 6)&0x8000) ? "On Demand" : "Unsolicited",
+	       (EXTRACT_BE_U_2(tptr + 6)&0x4000) ? "Enabled" : "Disabled"
 	       ));
 	break;
 
@@ -348,7 +348,7 @@ ldp_tlv_print(netdissect_options *ndo,
 	    break;
 	case LDP_FEC_PREFIX:
 	    TLV_TCHECK(2);
-	    af = EXTRACT_BE_16BITS(tptr);
+	    af = EXTRACT_BE_U_2(tptr);
 	    tptr+=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
 	    tlv_tlen-=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
 	    if (af == AFNUM_INET) {
@@ -384,7 +384,7 @@ ldp_tlv_print(netdissect_options *ndo,
              * Pseudowire Types.
              */
             TLV_TCHECK(7);
-            vc_info_len = EXTRACT_8BITS(tptr + 2);
+            vc_info_len = EXTRACT_U_1(tptr + 2);
 
             /*
 	     * According to RFC 4908, the VC info Length field can be zero,
@@ -393,9 +393,9 @@ ldp_tlv_print(netdissect_options *ndo,
 	     */
             if (vc_info_len == 0) {
                 ND_PRINT((ndo, ": %s, %scontrol word, group-ID %u, VC-info-length: %u",
-                       tok2str(mpls_pw_types_values, "Unknown", EXTRACT_BE_16BITS(tptr)&0x7fff),
-                       EXTRACT_BE_16BITS(tptr)&0x8000 ? "" : "no ",
-                       EXTRACT_BE_32BITS(tptr + 3),
+                       tok2str(mpls_pw_types_values, "Unknown", EXTRACT_BE_U_2(tptr)&0x7fff),
+                       EXTRACT_BE_U_2(tptr)&0x8000 ? "" : "no ",
+                       EXTRACT_BE_U_4(tptr + 3),
                        vc_info_len));
                 break;
             }
@@ -403,10 +403,10 @@ ldp_tlv_print(netdissect_options *ndo,
             /* Make sure we have the VC ID as well */
             TLV_TCHECK(11);
 	    ND_PRINT((ndo, ": %s, %scontrol word, group-ID %u, VC-ID %u, VC-info-length: %u",
-		   tok2str(mpls_pw_types_values, "Unknown", EXTRACT_BE_16BITS(tptr)&0x7fff),
-		   EXTRACT_BE_16BITS(tptr)&0x8000 ? "" : "no ",
-		   EXTRACT_BE_32BITS(tptr + 3),
-		   EXTRACT_BE_32BITS(tptr + 7),
+		   tok2str(mpls_pw_types_values, "Unknown", EXTRACT_BE_U_2(tptr)&0x7fff),
+		   EXTRACT_BE_U_2(tptr)&0x8000 ? "" : "no ",
+		   EXTRACT_BE_U_4(tptr + 3),
+		   EXTRACT_BE_U_4(tptr + 7),
 		   vc_info_len));
             if (vc_info_len < 4) {
                 /* minimum 4, for the VC ID */
@@ -422,7 +422,7 @@ ldp_tlv_print(netdissect_options *ndo,
 
             while (vc_info_len > 2) {
                 vc_info_tlv_type = *tptr;
-                vc_info_tlv_len = EXTRACT_8BITS(tptr + 1);
+                vc_info_tlv_len = EXTRACT_U_1(tptr + 1);
                 if (vc_info_tlv_len < 2)
                     break;
                 if (vc_info_len < vc_info_tlv_len)
@@ -435,7 +435,7 @@ ldp_tlv_print(netdissect_options *ndo,
 
                 switch(vc_info_tlv_type) {
                 case LDP_FEC_MARTINI_IFPARM_MTU:
-                    ND_PRINT((ndo, ": %u", EXTRACT_BE_16BITS(tptr + 2)));
+                    ND_PRINT((ndo, ": %u", EXTRACT_BE_U_2(tptr + 2)));
                     break;
 
                 case LDP_FEC_MARTINI_IFPARM_DESC:
@@ -446,11 +446,11 @@ ldp_tlv_print(netdissect_options *ndo,
 
                 case LDP_FEC_MARTINI_IFPARM_VCCV:
                     ND_PRINT((ndo, "\n\t\t  Control Channels (0x%02x) = [%s]",
-                           EXTRACT_8BITS((tptr + 2)),
-                           bittok2str(ldp_fec_martini_ifparm_vccv_cc_values, "none", EXTRACT_8BITS((tptr + 2)))));
+                           EXTRACT_U_1((tptr + 2)),
+                           bittok2str(ldp_fec_martini_ifparm_vccv_cc_values, "none", EXTRACT_U_1((tptr + 2)))));
                     ND_PRINT((ndo, "\n\t\t  CV Types (0x%02x) = [%s]",
-                           EXTRACT_8BITS((tptr + 3)),
-                           bittok2str(ldp_fec_martini_ifparm_vccv_cv_values, "none", EXTRACT_8BITS((tptr + 3)))));
+                           EXTRACT_U_1((tptr + 3)),
+                           bittok2str(ldp_fec_martini_ifparm_vccv_cv_values, "none", EXTRACT_U_1((tptr + 3)))));
                     break;
 
                 default:
@@ -468,18 +468,18 @@ ldp_tlv_print(netdissect_options *ndo,
 
     case LDP_TLV_GENERIC_LABEL:
 	TLV_TCHECK(4);
-	ND_PRINT((ndo, "\n\t      Label: %u", EXTRACT_BE_32BITS(tptr) & 0xfffff));
+	ND_PRINT((ndo, "\n\t      Label: %u", EXTRACT_BE_U_4(tptr) & 0xfffff));
 	break;
 
     case LDP_TLV_STATUS:
 	TLV_TCHECK(8);
-	ui = EXTRACT_BE_32BITS(tptr);
+	ui = EXTRACT_BE_U_4(tptr);
 	tptr+=4;
 	ND_PRINT((ndo, "\n\t      Status: 0x%02x, Flags: [%s and %s forward]",
 	       ui&0x3fffffff,
 	       ui&0x80000000 ? "Fatal error" : "Advisory Notification",
 	       ui&0x40000000 ? "do" : "don't"));
-	ui = EXTRACT_BE_32BITS(tptr);
+	ui = EXTRACT_BE_U_4(tptr);
 	tptr+=4;
 	if (ui)
 	    ND_PRINT((ndo, ", causing Message ID: 0x%08x", ui));
@@ -487,7 +487,7 @@ ldp_tlv_print(netdissect_options *ndo,
 
     case LDP_TLV_FT_SESSION:
 	TLV_TCHECK(8);
-	ft_flags = EXTRACT_BE_16BITS(tptr);
+	ft_flags = EXTRACT_BE_U_2(tptr);
 	ND_PRINT((ndo, "\n\t      Flags: [%sReconnect, %sSave State, %sAll-Label Protection, %s Checkpoint, %sRe-Learn State]",
 	       ft_flags&0x8000 ? "" : "No ",
 	       ft_flags&0x8 ? "" : "Don't ",
@@ -495,18 +495,18 @@ ldp_tlv_print(netdissect_options *ndo,
 	       ft_flags&0x2 ? "Sequence Numbered Label" : "All Labels",
 	       ft_flags&0x1 ? "" : "Don't "));
 	tptr+=4;
-	ui = EXTRACT_BE_32BITS(tptr);
+	ui = EXTRACT_BE_U_4(tptr);
 	if (ui)
 	    ND_PRINT((ndo, ", Reconnect Timeout: %ums", ui));
 	tptr+=4;
-	ui = EXTRACT_BE_32BITS(tptr);
+	ui = EXTRACT_BE_U_4(tptr);
 	if (ui)
 	    ND_PRINT((ndo, ", Recovery Time: %ums", ui));
 	break;
 
     case LDP_TLV_MTU:
 	TLV_TCHECK(2);
-	ND_PRINT((ndo, "\n\t      MTU: %u", EXTRACT_BE_16BITS(tptr)));
+	ND_PRINT((ndo, "\n\t      MTU: %u", EXTRACT_BE_U_2(tptr)));
 	break;
 
 
@@ -573,14 +573,14 @@ ldp_pdu_print(netdissect_options *ndo,
     /*
      * Sanity checking of the header.
      */
-    if (EXTRACT_BE_16BITS(&ldp_com_header->version) != LDP_VERSION) {
+    if (EXTRACT_BE_U_2(&ldp_com_header->version) != LDP_VERSION) {
 	ND_PRINT((ndo, "%sLDP version %u packet not supported",
                (ndo->ndo_vflag < 1) ? "" : "\n\t",
-               EXTRACT_BE_16BITS(&ldp_com_header->version)));
+               EXTRACT_BE_U_2(&ldp_com_header->version)));
 	return 0;
     }
 
-    pdu_len = EXTRACT_BE_16BITS(&ldp_com_header->pdu_length);
+    pdu_len = EXTRACT_BE_U_2(&ldp_com_header->pdu_length);
     if (pdu_len < sizeof(struct ldp_common_header)-4) {
         /* length too short */
         ND_PRINT((ndo, "%sLDP, pdu-length: %u (too short, < %u)",
@@ -594,7 +594,7 @@ ldp_pdu_print(netdissect_options *ndo,
     ND_PRINT((ndo, "%sLDP, Label-Space-ID: %s:%u, pdu-length: %u",
            (ndo->ndo_vflag < 1) ? "" : "\n\t",
            ipaddr_string(ndo, &ldp_com_header->lsr_id),
-           EXTRACT_BE_16BITS(&ldp_com_header->label_space),
+           EXTRACT_BE_U_2(&ldp_com_header->label_space),
            pdu_len));
 
     /* bail out if non-verbose */
@@ -610,8 +610,8 @@ ldp_pdu_print(netdissect_options *ndo,
         ND_TCHECK2(*tptr, sizeof(struct ldp_msg_header));
 
         ldp_msg_header = (const struct ldp_msg_header *)tptr;
-        msg_len=EXTRACT_BE_16BITS(ldp_msg_header->length);
-        msg_type=LDP_MASK_MSG_TYPE(EXTRACT_BE_16BITS(ldp_msg_header->type));
+        msg_len=EXTRACT_BE_U_2(ldp_msg_header->length);
+        msg_type=LDP_MASK_MSG_TYPE(EXTRACT_BE_U_2(ldp_msg_header->type));
 
         if (msg_len < sizeof(struct ldp_msg_header)-4) {
             /* length too short */
@@ -633,8 +633,8 @@ ldp_pdu_print(netdissect_options *ndo,
                        msg_type),
                msg_type,
                msg_len,
-               EXTRACT_BE_32BITS(&ldp_msg_header->id),
-               LDP_MASK_U_BIT(EXTRACT_BE_16BITS(&ldp_msg_header->type)) ? "continue processing" : "ignore"));
+               EXTRACT_BE_U_4(&ldp_msg_header->id),
+               LDP_MASK_U_BIT(EXTRACT_BE_U_2(&ldp_msg_header->type)) ? "continue processing" : "ignore"));
 
         msg_tptr=tptr+sizeof(struct ldp_msg_header);
         msg_tlen=msg_len-(sizeof(struct ldp_msg_header)-4); /* Type & Length fields not included */