Rename EXTRACT_nBITS() macros to EXTRACT_BE_nBITS()

It indicates clearly that these macros are used to extract big-endian
integral values.

1 files changed, 57 insertions, 57 deletions

diff --git a/print-ospf.c b/print-ospf.c
index 8dad2eaa..22eb4c52 100644
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -192,8 +192,8 @@ ospf_print_grace_lsa(netdissect_options *ndo,
             ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
             return -1;
         }
-        tlv_type = EXTRACT_16BITS(tptr);
-        tlv_length = EXTRACT_16BITS(tptr+2);
+        tlv_type = EXTRACT_BE_16BITS(tptr);
+        tlv_length = EXTRACT_BE_16BITS(tptr + 2);
         tptr+=4;
         ls_length-=4;
 
@@ -221,7 +221,7 @@ ospf_print_grace_lsa(netdissect_options *ndo,
                 ND_PRINT((ndo, "\n\t    Bogus length %u != 4", tlv_length));
                 return -1;
             }
-            ND_PRINT((ndo, "%us", EXTRACT_32BITS(tptr)));
+            ND_PRINT((ndo, "%us", EXTRACT_BE_32BITS(tptr)));
             break;
 
         case LS_OPAQUE_GRACE_TLV_REASON:
@@ -279,8 +279,8 @@ ospf_print_te_lsa(netdissect_options *ndo,
             ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
             return -1;
         }
-        tlv_type = EXTRACT_16BITS(tptr);
-        tlv_length = EXTRACT_16BITS(tptr+2);
+        tlv_type = EXTRACT_BE_16BITS(tptr);
+        tlv_length = EXTRACT_BE_16BITS(tptr + 2);
         tptr+=4;
         ls_length-=4;
 
@@ -309,8 +309,8 @@ ospf_print_te_lsa(netdissect_options *ndo,
                     return -1;
                 }
                 ND_TCHECK2(*tptr, 4);
-                subtlv_type = EXTRACT_16BITS(tptr);
-                subtlv_length = EXTRACT_16BITS(tptr+2);
+                subtlv_type = EXTRACT_BE_16BITS(tptr);
+                subtlv_length = EXTRACT_BE_16BITS(tptr + 2);
                 tptr+=4;
                 tlv_length-=4;
 
@@ -330,7 +330,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
 			ND_PRINT((ndo, " != 4"));
 			goto invalid;
 		    }
-                    ND_PRINT((ndo, ", 0x%08x", EXTRACT_32BITS(tptr)));
+                    ND_PRINT((ndo, ", 0x%08x", EXTRACT_BE_32BITS(tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID:
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID:
@@ -340,11 +340,11 @@ ospf_print_te_lsa(netdissect_options *ndo,
 		    }
                     ND_PRINT((ndo, ", %s (0x%08x)",
                            ipaddr_string(ndo, tptr),
-                           EXTRACT_32BITS(tptr)));
+                           EXTRACT_BE_32BITS(tptr)));
                     if (subtlv_length == 8) /* rfc4203 */
                         ND_PRINT((ndo, ", %s (0x%08x)",
                                ipaddr_string(ndo, tptr+4),
-                               EXTRACT_32BITS(tptr + 4)));
+                               EXTRACT_BE_32BITS(tptr + 4)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP:
                 case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP:
@@ -360,7 +360,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
 			ND_PRINT((ndo, " != 4"));
 			goto invalid;
 		    }
-                    bw.i = EXTRACT_32BITS(tptr);
+                    bw.i = EXTRACT_BE_32BITS(tptr);
                     ND_PRINT((ndo, ", %.3f Mbps", bw.f * 8 / 1000000));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
@@ -369,7 +369,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
 			goto invalid;
 		    }
                     for (te_class = 0; te_class < 8; te_class++) {
-                        bw.i = EXTRACT_32BITS(tptr+te_class*4);
+                        bw.i = EXTRACT_BE_32BITS(tptr + te_class * 4);
                         ND_PRINT((ndo, "\n\t\tTE-Class %u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000));
@@ -394,7 +394,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
 		    }
                     /* decode BCs until the subTLV ends */
                     for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {
-                        bw.i = EXTRACT_32BITS(tptr+4+te_class*4);
+                        bw.i = EXTRACT_BE_32BITS(tptr + 4 + te_class * 4);
                         ND_PRINT((ndo, "\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
                                te_class,
                                bw.f * 8 / 1000000));
@@ -405,7 +405,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
 			ND_PRINT((ndo, " != 4"));
 			goto invalid;
 		    }
-                    ND_PRINT((ndo, ", Metric %u", EXTRACT_32BITS(tptr)));
+                    ND_PRINT((ndo, ", Metric %u", EXTRACT_BE_32BITS(tptr)));
                     break;
                 case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE:
 		    /* Protection Cap (1 octet) + Reserved ((3 octets) */
@@ -427,7 +427,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                     ND_PRINT((ndo, "\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
                            tok2str(gmpls_encoding_values, "Unknown", *(tptr + 1))));
                     for (priority_level = 0; priority_level < 8; priority_level++) {
-                        bw.i = EXTRACT_32BITS(tptr+4+(priority_level*4));
+                        bw.i = EXTRACT_BE_32BITS(tptr + 4 + (priority_level * 4));
                         ND_PRINT((ndo, "\n\t\t  priority level %d: %.3f Mbps",
                                priority_level,
                                bw.f * 8 / 1000000));
@@ -452,7 +452,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
                     if (count_srlg != 0)
                         ND_PRINT((ndo, "\n\t\t  Shared risk group: "));
                     while (count_srlg > 0) {
-                        bw.i = EXTRACT_32BITS(tptr);
+                        bw.i = EXTRACT_BE_32BITS(tptr);
                         ND_PRINT((ndo, "%d", bw.i));
                         tptr+=4;
                         count_srlg--;
@@ -515,7 +515,7 @@ ospf_print_lshdr(netdissect_options *ndo,
         u_int ls_length;
 
         ND_TCHECK(lshp->ls_length);
-        ls_length = EXTRACT_16BITS(&lshp->ls_length);
+        ls_length = EXTRACT_BE_16BITS(&lshp->ls_length);
         if (ls_length < sizeof(struct lsa_hdr)) {
                 ND_PRINT((ndo, "\n\t    Bogus length %u < header (%lu)", ls_length,
                     (unsigned long)sizeof(struct lsa_hdr)));
@@ -525,8 +525,8 @@ ospf_print_lshdr(netdissect_options *ndo,
         ND_TCHECK(lshp->ls_seq); /* XXX - ls_length check checked this */
         ND_PRINT((ndo, "\n\t  Advertising Router %s, seq 0x%08x, age %us, length %u",
                   ipaddr_string(ndo, &lshp->ls_router),
-                  EXTRACT_32BITS(&lshp->ls_seq),
-                  EXTRACT_16BITS(&lshp->ls_age),
+                  EXTRACT_BE_32BITS(&lshp->ls_seq),
+                  EXTRACT_BE_16BITS(&lshp->ls_age),
                   ls_length - (u_int)sizeof(struct lsa_hdr)));
 
         ND_TCHECK(lshp->ls_type); /* XXX - ls_length check checked this */
@@ -543,7 +543,7 @@ ospf_print_lshdr(netdissect_options *ndo,
 			   "unknown",
 			   *(&lshp->un_lsa_id.opaque_field.opaque_type)),
 		   *(&lshp->un_lsa_id.opaque_field.opaque_type),
-		   EXTRACT_24BITS(&lshp->un_lsa_id.opaque_field.opaque_id)
+		   EXTRACT_BE_24BITS(&lshp->un_lsa_id.opaque_field.opaque_id)
 
                    ));
             break;
@@ -595,7 +595,7 @@ ospf_print_tos_metrics(netdissect_options *ndo,
                tok2str(ospf_topology_values, "Unknown",
                        metric_count ? tos->metrics.tos_type : 0),
                metric_count ? tos->metrics.tos_type : 0,
-               EXTRACT_16BITS(&tos->metrics.tos_metric)));
+               EXTRACT_BE_16BITS(&tos->metrics.tos_metric)));
         metric_count++;
         tos++;
         toscount--;
@@ -639,7 +639,7 @@ ospf_print_lsa(netdissect_options *ndo,
 		          bittok2str(ospf_rla_flag_values, "none", lsap->lsa_un.un_rla.rla_flags)));
 
 		ND_TCHECK(lsap->lsa_un.un_rla.rla_count);
-		j = EXTRACT_16BITS(&lsap->lsa_un.un_rla.rla_count);
+		j = EXTRACT_BE_16BITS(&lsap->lsa_un.un_rla.rla_count);
 		ND_TCHECK(lsap->lsa_un.un_rla.rla_link);
 		rlp = lsap->lsa_un.un_rla.rla_link;
 		while (j--) {
@@ -706,7 +706,7 @@ ospf_print_lsa(netdissect_options *ndo,
 			register uint32_t ul;
 
 			ND_TCHECK(*lp);
-			ul = EXTRACT_32BITS(lp);
+			ul = EXTRACT_BE_32BITS(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
 			ND_PRINT((ndo, "\n\t\ttopology %s (%u) metric %d",
                                tok2str(ospf_topology_values, "Unknown", topology),
@@ -723,7 +723,7 @@ ospf_print_lsa(netdissect_options *ndo,
 			register uint32_t ul;
 
 			ND_TCHECK(*lp);
-			ul = EXTRACT_32BITS(lp);
+			ul = EXTRACT_BE_32BITS(lp);
                         topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS;
 			ND_PRINT((ndo, "\n\t\ttopology %s (%u) metric %d",
                                tok2str(ospf_topology_values, "Unknown", topology),
@@ -745,7 +745,7 @@ ospf_print_lsa(netdissect_options *ndo,
 			register uint32_t ul;
 
 			ND_TCHECK(almp->asla_tosmetric);
-			ul = EXTRACT_32BITS(&almp->asla_tosmetric);
+			ul = EXTRACT_BE_32BITS(&almp->asla_tosmetric);
                         topology = ((ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS);
 			ND_PRINT((ndo, "\n\t\ttopology %s (%u), type %d, metric",
                                tok2str(ospf_topology_values, "Unknown", topology),
@@ -773,7 +773,7 @@ ospf_print_lsa(netdissect_options *ndo,
 		mcp = lsap->lsa_un.un_mcla;
 		while ((const u_char *)mcp < ls_end) {
 			ND_TCHECK(mcp->mcla_vid);
-			switch (EXTRACT_32BITS(&mcp->mcla_vtype)) {
+			switch (EXTRACT_BE_32BITS(&mcp->mcla_vtype)) {
 
 			case MCLA_VERTEX_ROUTER:
 				ND_PRINT((ndo, "\n\t    Router Router-ID %s",
@@ -787,7 +787,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
 			default:
 				ND_PRINT((ndo, "\n\t    unknown VertexType (%u)",
-				    EXTRACT_32BITS(&mcp->mcla_vtype)));
+				    EXTRACT_BE_32BITS(&mcp->mcla_vtype)));
 				break;
 			}
 		++mcp;
@@ -808,8 +808,8 @@ ospf_print_lsa(netdissect_options *ndo,
                         ND_PRINT((ndo, "\n\t    Remaining LS length %u < 4", ls_length));
                         return(ls_end);
                     }
-                    tlv_type = EXTRACT_16BITS(tptr);
-                    tlv_length = EXTRACT_16BITS(tptr+2);
+                    tlv_type = EXTRACT_BE_16BITS(tptr);
+                    tlv_length = EXTRACT_BE_16BITS(tptr + 2);
                     tptr+=4;
                     ls_length-=4;
 
@@ -832,7 +832,7 @@ ospf_print_lsa(netdissect_options *ndo,
                             return(ls_end);
                         }
                         ND_PRINT((ndo, "Capabilities: %s",
-                               bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", EXTRACT_32BITS(tptr))));
+                               bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", EXTRACT_BE_32BITS(tptr))));
                         break;
                     default:
                         if (ndo->ndo_vflag <= 1) {
@@ -910,11 +910,11 @@ ospf_decode_lls(netdissect_options *ndo,
     }
 
     /* dig deeper if LLS data is available; see RFC4813 */
-    length2 = EXTRACT_16BITS(&op->ospf_len);
+    length2 = EXTRACT_BE_16BITS(&op->ospf_len);
     dptr = (const u_char *)op + length2;
     dataend = (const u_char *)op + length;
 
-    if (EXTRACT_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
+    if (EXTRACT_BE_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
         dptr = dptr + op->ospf_authdata[3];
         length2 += op->ospf_authdata[3];
     }
@@ -923,24 +923,24 @@ ospf_decode_lls(netdissect_options *ndo,
         return (1);
     }
     ND_TCHECK2(*dptr, 2);
-    ND_PRINT((ndo, "\n\t  LLS: checksum: 0x%04x", (u_int)EXTRACT_16BITS(dptr)));
+    ND_PRINT((ndo, "\n\t  LLS: checksum: 0x%04x", (u_int) EXTRACT_BE_16BITS(dptr)));
 
     dptr += 2;
     ND_TCHECK2(*dptr, 2);
-    length2 = EXTRACT_16BITS(dptr);
+    length2 = EXTRACT_BE_16BITS(dptr);
     ND_PRINT((ndo, ", length: %u", length2));
 
     dptr += 2;
     ND_TCHECK(*dptr);
     while (dptr < dataend) {
         ND_TCHECK2(*dptr, 2);
-        lls_type = EXTRACT_16BITS(dptr);
+        lls_type = EXTRACT_BE_16BITS(dptr);
         ND_PRINT((ndo, "\n\t    %s (%u)",
                tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type),
                lls_type));
         dptr += 2;
         ND_TCHECK2(*dptr, 2);
-        lls_len = EXTRACT_16BITS(dptr);
+        lls_len = EXTRACT_BE_16BITS(dptr);
         ND_PRINT((ndo, ", length: %u", lls_len));
         dptr += 2;
         switch (lls_type) {
@@ -951,7 +951,7 @@ ospf_decode_lls(netdissect_options *ndo,
                 lls_len = 4;
             }
             ND_TCHECK2(*dptr, 4);
-            lls_flags = EXTRACT_32BITS(dptr);
+            lls_flags = EXTRACT_BE_32BITS(dptr);
             ND_PRINT((ndo, "\n\t      Options: 0x%08x [%s]", lls_flags,
                    bittok2str(ospf_lls_eo_options, "?", lls_flags)));
 
@@ -963,7 +963,7 @@ ospf_decode_lls(netdissect_options *ndo,
                 lls_len = 20;
             }
             ND_TCHECK2(*dptr, 4);
-            ND_PRINT((ndo, "\n\t      Sequence number: 0x%08x", EXTRACT_32BITS(dptr)));
+            ND_PRINT((ndo, "\n\t      Sequence number: 0x%08x", EXTRACT_BE_32BITS(dptr)));
             break;
         }
 
@@ -994,8 +994,8 @@ ospf_decode_v2(netdissect_options *ndo,
 
 		ND_TCHECK(op->ospf_hello.hello_deadint);
 		ND_PRINT((ndo, "\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
-		          EXTRACT_16BITS(&op->ospf_hello.hello_helloint),
-		          EXTRACT_32BITS(&op->ospf_hello.hello_deadint),
+		          EXTRACT_BE_16BITS(&op->ospf_hello.hello_helloint),
+		          EXTRACT_BE_32BITS(&op->ospf_hello.hello_deadint),
 		          ipaddr_string(ndo, &op->ospf_hello.hello_mask),
 		          op->ospf_hello.hello_priority));
 
@@ -1028,10 +1028,10 @@ ospf_decode_v2(netdissect_options *ndo,
 		          bittok2str(ospf_dd_flag_values, "none", op->ospf_db.db_flags)));
 		ND_TCHECK(op->ospf_db.db_ifmtu);
 		if (op->ospf_db.db_ifmtu) {
-			ND_PRINT((ndo, ", MTU: %u", EXTRACT_16BITS(&op->ospf_db.db_ifmtu)));
+			ND_PRINT((ndo, ", MTU: %u", EXTRACT_BE_16BITS(&op->ospf_db.db_ifmtu)));
 		}
 		ND_TCHECK(op->ospf_db.db_seq);
-		ND_PRINT((ndo, ", Sequence: 0x%08x", EXTRACT_32BITS(&op->ospf_db.db_seq)));
+		ND_PRINT((ndo, ", Sequence: 0x%08x", EXTRACT_BE_32BITS(&op->ospf_db.db_seq)));
 
 		/* Print all the LS adv's */
 		lshp = op->ospf_db.db_lshdr;
@@ -1047,10 +1047,10 @@ ospf_decode_v2(netdissect_options *ndo,
 
                     ND_PRINT((ndo, "\n\t  Advertising Router: %s, %s LSA (%u)",
                            ipaddr_string(ndo, &lsrp->ls_router),
-                           tok2str(lsa_values,"unknown",EXTRACT_32BITS(lsrp->ls_type)),
-                           EXTRACT_32BITS(&lsrp->ls_type)));
+                           tok2str(lsa_values,"unknown",EXTRACT_BE_32BITS(lsrp->ls_type)),
+                           EXTRACT_BE_32BITS(&lsrp->ls_type)));
 
-                    switch (EXTRACT_32BITS(lsrp->ls_type)) {
+                    switch (EXTRACT_BE_32BITS(lsrp->ls_type)) {
                         /* the LSA header for opaque LSAs was slightly changed */
                     case LS_TYPE_OPAQUE_LL:
                     case LS_TYPE_OPAQUE_AL:
@@ -1058,7 +1058,7 @@ ospf_decode_v2(netdissect_options *ndo,
                         ND_PRINT((ndo, ", Opaque-Type: %s LSA (%u), Opaque-ID: %u",
                                tok2str(lsa_opaque_values, "unknown",lsrp->un_ls_stateid.opaque_field.opaque_type),
                                lsrp->un_ls_stateid.opaque_field.opaque_type,
-                               EXTRACT_24BITS(&lsrp->un_ls_stateid.opaque_field.opaque_id)));
+                               EXTRACT_BE_24BITS(&lsrp->un_ls_stateid.opaque_field.opaque_id)));
                         break;
                     default:
                         ND_PRINT((ndo, ", LSA-ID: %s",
@@ -1073,7 +1073,7 @@ ospf_decode_v2(netdissect_options *ndo,
 	case OSPF_TYPE_LS_UPDATE:
                 lsap = op->ospf_lsu.lsu_lsa;
                 ND_TCHECK(op->ospf_lsu.lsu_count);
-                lsa_count_max = EXTRACT_32BITS(&op->ospf_lsu.lsu_count);
+                lsa_count_max = EXTRACT_BE_32BITS(&op->ospf_lsu.lsu_count);
                 ND_PRINT((ndo, ", %d LSA%s", lsa_count_max, PLURAL_SUFFIX(lsa_count_max)));
                 for (lsa_count=1;lsa_count <= lsa_count_max;lsa_count++) {
                     ND_PRINT((ndo, "\n\t  LSA #%u", lsa_count));
@@ -1111,7 +1111,7 @@ ospf_print(netdissect_options *ndo,
 
 	/* XXX Before we do anything else, strip off the MD5 trailer */
 	ND_TCHECK(op->ospf_authtype);
-	if (EXTRACT_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
+	if (EXTRACT_BE_16BITS(&op->ospf_authtype) == OSPF_AUTH_MD5) {
 		length -= OSPF_AUTH_MD5_LEN;
 		ndo->ndo_snapend -= OSPF_AUTH_MD5_LEN;
 	}
@@ -1129,12 +1129,12 @@ ospf_print(netdissect_options *ndo,
 	}
 
 	ND_TCHECK(op->ospf_len);
-	if (length != EXTRACT_16BITS(&op->ospf_len)) {
-		ND_PRINT((ndo, " [len %d]", EXTRACT_16BITS(&op->ospf_len)));
+	if (length != EXTRACT_BE_16BITS(&op->ospf_len)) {
+		ND_PRINT((ndo, " [len %d]", EXTRACT_BE_16BITS(&op->ospf_len)));
 	}
 
-	if (length > EXTRACT_16BITS(&op->ospf_len)) {
-		dataend = bp + EXTRACT_16BITS(&op->ospf_len);
+	if (length > EXTRACT_BE_16BITS(&op->ospf_len)) {
+		dataend = bp + EXTRACT_BE_16BITS(&op->ospf_len);
 	} else {
 		dataend = bp + length;
 	}
@@ -1153,10 +1153,10 @@ ospf_print(netdissect_options *ndo,
 		ND_TCHECK2(op->ospf_authdata[0], sizeof(op->ospf_authdata));
 
 		ND_PRINT((ndo, ", Authentication Type: %s (%u)",
-		          tok2str(ospf_authtype_values, "unknown", EXTRACT_16BITS(&op->ospf_authtype)),
-		          EXTRACT_16BITS(&op->ospf_authtype)));
+		          tok2str(ospf_authtype_values, "unknown", EXTRACT_BE_16BITS(&op->ospf_authtype)),
+		          EXTRACT_BE_16BITS(&op->ospf_authtype)));
 
-		switch (EXTRACT_16BITS(&op->ospf_authtype)) {
+		switch (EXTRACT_BE_16BITS(&op->ospf_authtype)) {
 
 		case OSPF_AUTH_NONE:
 			break;
@@ -1170,7 +1170,7 @@ ospf_print(netdissect_options *ndo,
 			ND_PRINT((ndo, "\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x",
 			          *((op->ospf_authdata) + 2),
 			          *((op->ospf_authdata) + 3),
-			          EXTRACT_32BITS((op->ospf_authdata) + 4)));
+			          EXTRACT_BE_32BITS((op->ospf_authdata) + 4)));
 			break;
 
 		default:
@@ -1184,7 +1184,7 @@ ospf_print(netdissect_options *ndo,
 		/* ospf version 2 */
 		if (ospf_decode_v2(ndo, op, dataend))
 			goto trunc;
-		if (length > EXTRACT_16BITS(&op->ospf_len)) {
+		if (length > EXTRACT_BE_16BITS(&op->ospf_len)) {
 			if (ospf_decode_lls(ndo, op, length))
 				goto trunc;
 		}