]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-rsvp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove EXTRACT_LE_8BITS() macro, use EXTRACT_8BITS() macro
[tcpdump] / print-rsvp.c
diff --git a/print-rsvp.c b/print-rsvp.c
index b0fb34469401e1eaa353cf7e6845dbb2caba4be2..3689b77e15f2a76dc7c7328256a8b08d50ffda9e 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -139,7 +139,7 @@ static const struct tok rsvp_header_flag_values[] = {
 #define        RSVP_OBJ_LABEL_SET          36  /* rfc3473 */
 #define        RSVP_OBJ_PROTECTION         37  /* rfc3473 */
 #define RSVP_OBJ_S2L                50  /* rfc4875 */
 #define        RSVP_OBJ_LABEL_SET          36  /* rfc3473 */
 #define        RSVP_OBJ_PROTECTION         37  /* rfc3473 */
 #define RSVP_OBJ_S2L                50  /* rfc4875 */
-#define        RSVP_OBJ_DETOUR             63  /* draft-ietf-mpls-rsvp-lsp-fastreroute-07 */
+#define        RSVP_OBJ_DETOUR             63  /* rfc4090 */
 #define        RSVP_OBJ_CLASSTYPE          66  /* rfc4124 */
 #define RSVP_OBJ_CLASSTYPE_OLD      125 /* draft-ietf-tewg-diff-te-proto-07 */
 #define        RSVP_OBJ_SUGGESTED_LABEL    129 /* rfc3473 */
 #define        RSVP_OBJ_CLASSTYPE          66  /* rfc4124 */
 #define RSVP_OBJ_CLASSTYPE_OLD      125 /* draft-ietf-tewg-diff-te-proto-07 */
 #define        RSVP_OBJ_SUGGESTED_LABEL    129 /* rfc3473 */
@@ -148,7 +148,7 @@ static const struct tok rsvp_header_flag_values[] = {
 #define        RSVP_OBJ_NOTIFY_REQ         195 /* rfc3473 */
 #define        RSVP_OBJ_ADMIN_STATUS       196 /* rfc3473 */
 #define        RSVP_OBJ_PROPERTIES         204 /* juniper proprietary */
 #define        RSVP_OBJ_NOTIFY_REQ         195 /* rfc3473 */
 #define        RSVP_OBJ_ADMIN_STATUS       196 /* rfc3473 */
 #define        RSVP_OBJ_PROPERTIES         204 /* juniper proprietary */
-#define        RSVP_OBJ_FASTREROUTE        205 /* draft-ietf-mpls-rsvp-lsp-fastreroute-07 */
+#define        RSVP_OBJ_FASTREROUTE        205 /* rfc4090 */
 #define        RSVP_OBJ_SESSION_ATTRIBUTE  207 /* rfc3209 */
 #define RSVP_OBJ_GENERALIZED_UNI    229 /* OIF RSVP extensions UNI 1.0 Signaling, Rel. 2 */
 #define RSVP_OBJ_CALL_ID            230 /* rfc3474 */
 #define        RSVP_OBJ_SESSION_ATTRIBUTE  207 /* rfc3209 */
 #define RSVP_OBJ_GENERALIZED_UNI    229 /* OIF RSVP extensions UNI 1.0 Signaling, Rel. 2 */
 #define RSVP_OBJ_CALL_ID            230 /* rfc3474 */
@@ -339,7 +339,7 @@ static const struct tok rsvp_obj_xro_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 
-/* draft-ietf-mpls-rsvp-lsp-fastreroute-07.txt */
+/* RFC4090 */
 static const struct tok rsvp_obj_rro_flag_values[] = {
     { 0x01,                  "Local protection available" },
     { 0x02,                   "Local protection in use" },
 static const struct tok rsvp_obj_rro_flag_values[] = {
     { 0x01,                  "Local protection available" },
     { 0x02,                   "Local protection in use" },
@@ -501,7 +501,7 @@ rsvp_intserv_print(netdissect_options *ndo,
         return 0;
     parameter_id = *(tptr);
     ND_TCHECK2(*(tptr + 2), 2);
         return 0;
     parameter_id = *(tptr);
     ND_TCHECK2(*(tptr + 2), 2);
-    parameter_length = EXTRACT_16BITS(tptr+2)<<2; /* convert wordcount to bytecount */
+    parameter_length = EXTRACT_BE_16BITS(tptr + 2)<<2; /* convert wordcount to bytecount */
 
     ND_PRINT((ndo, "\n\t      Parameter ID: %s (%u), length: %u, Flags: [0x%02x]",
            tok2str(rsvp_intserv_parameter_id_values,"unknown",parameter_id),
 
     ND_PRINT((ndo, "\n\t      Parameter ID: %s (%u), length: %u, Flags: [0x%02x]",
            tok2str(rsvp_intserv_parameter_id_values,"unknown",parameter_id),
@@ -523,7 +523,7 @@ rsvp_intserv_print(netdissect_options *ndo,
         */
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
         */
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
-            ND_PRINT((ndo, "\n\t\tIS hop count: %u", EXTRACT_32BITS(tptr + 4)));
+            ND_PRINT((ndo, "\n\t\tIS hop count: %u", EXTRACT_BE_32BITS(tptr + 4)));
         }
         break;
 
         }
         break;
 
@@ -537,7 +537,7 @@ rsvp_intserv_print(netdissect_options *ndo,
         */
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
         */
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
-            bw.i = EXTRACT_32BITS(tptr+4);
+            bw.i = EXTRACT_BE_32BITS(tptr + 4);
             ND_PRINT((ndo, "\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000));
         }
         break;
             ND_PRINT((ndo, "\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000));
         }
         break;
@@ -553,10 +553,10 @@ rsvp_intserv_print(netdissect_options *ndo,
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
             ND_PRINT((ndo, "\n\t\tMinimum path latency: "));
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
             ND_PRINT((ndo, "\n\t\tMinimum path latency: "));
-            if (EXTRACT_32BITS(tptr+4) == 0xffffffff)
+            if (EXTRACT_BE_32BITS(tptr + 4) == 0xffffffff)
                 ND_PRINT((ndo, "don't care"));
             else
                 ND_PRINT((ndo, "don't care"));
             else
-                ND_PRINT((ndo, "%u", EXTRACT_32BITS(tptr + 4)));
+                ND_PRINT((ndo, "%u", EXTRACT_BE_32BITS(tptr + 4)));
         }
         break;
 
         }
         break;
 
@@ -571,7 +571,7 @@ rsvp_intserv_print(netdissect_options *ndo,
         */
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
         */
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
-            ND_PRINT((ndo, "\n\t\tComposed MTU: %u bytes", EXTRACT_32BITS(tptr + 4)));
+            ND_PRINT((ndo, "\n\t\tComposed MTU: %u bytes", EXTRACT_BE_32BITS(tptr + 4)));
         }
         break;
     case 127:
         }
         break;
     case 127:
@@ -593,14 +593,14 @@ rsvp_intserv_print(netdissect_options *ndo,
 
         if (parameter_length == 20) {
            ND_TCHECK2(*(tptr + 4), 20);
 
         if (parameter_length == 20) {
            ND_TCHECK2(*(tptr + 4), 20);
-            bw.i = EXTRACT_32BITS(tptr+4);
+            bw.i = EXTRACT_BE_32BITS(tptr + 4);
             ND_PRINT((ndo, "\n\t\tToken Bucket Rate: %.10g Mbps", bw.f / 125000));
             ND_PRINT((ndo, "\n\t\tToken Bucket Rate: %.10g Mbps", bw.f / 125000));
-            bw.i = EXTRACT_32BITS(tptr+8);
+            bw.i = EXTRACT_BE_32BITS(tptr + 8);
             ND_PRINT((ndo, "\n\t\tToken Bucket Size: %.10g bytes", bw.f));
             ND_PRINT((ndo, "\n\t\tToken Bucket Size: %.10g bytes", bw.f));
-            bw.i = EXTRACT_32BITS(tptr+12);
+            bw.i = EXTRACT_BE_32BITS(tptr + 12);
             ND_PRINT((ndo, "\n\t\tPeak Data Rate: %.10g Mbps", bw.f / 125000));
             ND_PRINT((ndo, "\n\t\tPeak Data Rate: %.10g Mbps", bw.f / 125000));
-            ND_PRINT((ndo, "\n\t\tMinimum Policed Unit: %u bytes", EXTRACT_32BITS(tptr + 16)));
-            ND_PRINT((ndo, "\n\t\tMaximum Packet Size: %u bytes", EXTRACT_32BITS(tptr + 20)));
+            ND_PRINT((ndo, "\n\t\tMinimum Policed Unit: %u bytes", EXTRACT_BE_32BITS(tptr + 16)));
+            ND_PRINT((ndo, "\n\t\tMaximum Packet Size: %u bytes", EXTRACT_BE_32BITS(tptr + 20)));
         }
         break;
 
         }
         break;
 
@@ -617,9 +617,9 @@ rsvp_intserv_print(netdissect_options *ndo,
 
         if (parameter_length == 8) {
            ND_TCHECK2(*(tptr + 4), 8);
 
         if (parameter_length == 8) {
            ND_TCHECK2(*(tptr + 4), 8);
-            bw.i = EXTRACT_32BITS(tptr+4);
+            bw.i = EXTRACT_BE_32BITS(tptr + 4);
             ND_PRINT((ndo, "\n\t\tRate: %.10g Mbps", bw.f / 125000));
             ND_PRINT((ndo, "\n\t\tRate: %.10g Mbps", bw.f / 125000));
-            ND_PRINT((ndo, "\n\t\tSlack Term: %u", EXTRACT_32BITS(tptr + 8)));
+            ND_PRINT((ndo, "\n\t\tSlack Term: %u", EXTRACT_BE_32BITS(tptr + 8)));
         }
         break;
 
         }
         break;
 
@@ -629,7 +629,7 @@ rsvp_intserv_print(netdissect_options *ndo,
     case 136:
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
     case 136:
         if (parameter_length == 4) {
            ND_TCHECK2(*(tptr + 4), 4);
-            ND_PRINT((ndo, "\n\t\tValue: %u", EXTRACT_32BITS(tptr + 4)));
+            ND_PRINT((ndo, "\n\t\tValue: %u", EXTRACT_BE_32BITS(tptr + 4)));
         }
         break;
 
         }
         break;
 
@@ -659,7 +659,7 @@ rsvp_clear_checksum(void *header)
 static int
 rsvp_obj_print(netdissect_options *ndo,
                const u_char *pptr, u_int plen, const u_char *tptr,
 static int
 rsvp_obj_print(netdissect_options *ndo,
                const u_char *pptr, u_int plen, const u_char *tptr,
-               const char *ident, u_int tlen,
+               const char *indent, u_int tlen,
                const struct rsvp_common_header *rsvp_com_header)
 {
     const struct rsvp_object_header *rsvp_obj_header;
                const struct rsvp_common_header *rsvp_com_header)
 {
     const struct rsvp_object_header *rsvp_obj_header;
@@ -684,21 +684,21 @@ rsvp_obj_print(netdissect_options *ndo,
         ND_TCHECK2(*tptr, sizeof(struct rsvp_object_header));
 
         rsvp_obj_header = (const struct rsvp_object_header *)tptr;
         ND_TCHECK2(*tptr, sizeof(struct rsvp_object_header));
 
         rsvp_obj_header = (const struct rsvp_object_header *)tptr;
-        rsvp_obj_len=EXTRACT_16BITS(rsvp_obj_header->length);
+        rsvp_obj_len=EXTRACT_BE_16BITS(rsvp_obj_header->length);
         rsvp_obj_ctype=rsvp_obj_header->ctype;
 
         if(rsvp_obj_len % 4) {
         rsvp_obj_ctype=rsvp_obj_header->ctype;
 
         if(rsvp_obj_len % 4) {
-            ND_PRINT((ndo, "%sERROR: object header size %u not a multiple of 4", ident, rsvp_obj_len));
+            ND_PRINT((ndo, "%sERROR: object header size %u not a multiple of 4", indent, rsvp_obj_len));
             return -1;
         }
         if(rsvp_obj_len < sizeof(struct rsvp_object_header)) {
             return -1;
         }
         if(rsvp_obj_len < sizeof(struct rsvp_object_header)) {
-            ND_PRINT((ndo, "%sERROR: object header too short %u < %lu", ident, rsvp_obj_len,
-                   (unsigned long)sizeof(const struct rsvp_object_header)));
+            ND_PRINT((ndo, "%sERROR: object header too short %u < %lu", indent, rsvp_obj_len,
+                   (unsigned long)sizeof(struct rsvp_object_header)));
             return -1;
         }
 
         ND_PRINT((ndo, "%s%s Object (%u) Flags: [%s",
             return -1;
         }
 
         ND_PRINT((ndo, "%s%s Object (%u) Flags: [%s",
-               ident,
+               indent,
                tok2str(rsvp_obj_values,
                        "Unknown",
                        rsvp_obj_header->class_num),
                tok2str(rsvp_obj_values,
                        "Unknown",
                        rsvp_obj_header->class_num),
@@ -717,7 +717,7 @@ rsvp_obj_print(netdissect_options *ndo,
                rsvp_obj_len));
 
         if(tlen < rsvp_obj_len) {
                rsvp_obj_len));
 
         if(tlen < rsvp_obj_len) {
-            ND_PRINT((ndo, "%sERROR: object goes past end of objects TLV", ident));
+            ND_PRINT((ndo, "%sERROR: object goes past end of objects TLV", indent));
             return -1;
         }
 
             return -1;
         }
 
@@ -736,13 +736,13 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 DestAddress: %s, Protocol ID: 0x%02x",
                 if (obj_tlen < 8)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 DestAddress: %s, Protocol ID: 0x%02x",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        *(obj_tptr + sizeof(struct in_addr))));
                 ND_PRINT((ndo, "%s  Flags: [0x%02x], DestPort %u",
                        ipaddr_string(ndo, obj_tptr),
                        *(obj_tptr + sizeof(struct in_addr))));
                 ND_PRINT((ndo, "%s  Flags: [0x%02x], DestPort %u",
-                       ident,
+                       indent,
                        *(obj_tptr+5),
                        *(obj_tptr+5),
-                       EXTRACT_16BITS(obj_tptr + 6)));
+                       EXTRACT_BE_16BITS(obj_tptr + 6)));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -750,13 +750,13 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 20)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv6 DestAddress: %s, Protocol ID: 0x%02x",
                 if (obj_tlen < 20)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv6 DestAddress: %s, Protocol ID: 0x%02x",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr),
                        *(obj_tptr + sizeof(struct in6_addr))));
                 ND_PRINT((ndo, "%s  Flags: [0x%02x], DestPort %u",
                        ip6addr_string(ndo, obj_tptr),
                        *(obj_tptr + sizeof(struct in6_addr))));
                 ND_PRINT((ndo, "%s  Flags: [0x%02x], DestPort %u",
-                       ident,
+                       indent,
                        *(obj_tptr+sizeof(struct in6_addr)+1),
                        *(obj_tptr+sizeof(struct in6_addr)+1),
-                       EXTRACT_16BITS(obj_tptr + sizeof(struct in6_addr) + 2)));
+                       EXTRACT_BE_16BITS(obj_tptr + sizeof(struct in6_addr) + 2)));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -765,9 +765,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 36)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                 if (obj_tlen < 36)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr),
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+18),
+                       EXTRACT_BE_16BITS(obj_tptr + 18),
                        ip6addr_string(ndo, obj_tptr + 20)));
                 obj_tlen-=36;
                 obj_tptr+=36;
                        ip6addr_string(ndo, obj_tptr + 20)));
                 obj_tlen-=36;
                 obj_tptr+=36;
@@ -777,9 +777,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 26)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv6 P2MP LSP ID: 0x%08x, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                 if (obj_tlen < 26)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv6 P2MP LSP ID: 0x%08x, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6),
+                       indent,
+                       EXTRACT_BE_32BITS(obj_tptr),
+                       EXTRACT_BE_16BITS(obj_tptr + 6),
                        ip6addr_string(ndo, obj_tptr + 8)));
                 obj_tlen-=26;
                 obj_tptr+=26;
                        ip6addr_string(ndo, obj_tptr + 8)));
                 obj_tlen-=26;
                 obj_tptr+=26;
@@ -788,9 +788,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 12)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                 if (obj_tlen < 12)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6),
+                       EXTRACT_BE_16BITS(obj_tptr + 6),
                        ipaddr_string(ndo, obj_tptr + 8)));
                 obj_tlen-=12;
                 obj_tptr+=12;
                        ipaddr_string(ndo, obj_tptr + 8)));
                 obj_tlen-=12;
                 obj_tptr+=12;
@@ -800,9 +800,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 12)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                 if (obj_tlen < 12)
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6),
+                       EXTRACT_BE_16BITS(obj_tptr + 6),
                        ipaddr_string(ndo, obj_tptr + 8)));
                 obj_tlen-=12;
                 obj_tptr+=12;
                        ipaddr_string(ndo, obj_tptr + 8)));
                 obj_tlen-=12;
                 obj_tptr+=12;
@@ -818,7 +818,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < sizeof(struct in_addr))
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 Receiver Address: %s",
                 if (obj_tlen < sizeof(struct in_addr))
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 Receiver Address: %s",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr)));
                 obj_tlen-=sizeof(struct in_addr);
                 obj_tptr+=sizeof(struct in_addr);
                        ipaddr_string(ndo, obj_tptr)));
                 obj_tlen-=sizeof(struct in_addr);
                 obj_tptr+=sizeof(struct in_addr);
@@ -827,7 +827,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < sizeof(struct in6_addr))
                     return -1;
                 ND_PRINT((ndo, "%s  IPv6 Receiver Address: %s",
                 if (obj_tlen < sizeof(struct in6_addr))
                     return -1;
                 ND_PRINT((ndo, "%s  IPv6 Receiver Address: %s",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr)));
                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tptr+=sizeof(struct in6_addr);
                        ip6addr_string(ndo, obj_tptr)));
                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tptr+=sizeof(struct in6_addr);
@@ -843,7 +843,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < sizeof(struct in_addr))
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 Notify Node Address: %s",
                 if (obj_tlen < sizeof(struct in_addr))
                     return -1;
                 ND_PRINT((ndo, "%s  IPv4 Notify Node Address: %s",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr)));
                 obj_tlen-=sizeof(struct in_addr);
                 obj_tptr+=sizeof(struct in_addr);
                        ipaddr_string(ndo, obj_tptr)));
                 obj_tlen-=sizeof(struct in_addr);
                 obj_tptr+=sizeof(struct in_addr);
@@ -852,7 +852,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < sizeof(struct in6_addr))
                     return-1;
                 ND_PRINT((ndo, "%s  IPv6 Notify Node Address: %s",
                 if (obj_tlen < sizeof(struct in6_addr))
                     return-1;
                 ND_PRINT((ndo, "%s  IPv6 Notify Node Address: %s",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr)));
                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tptr+=sizeof(struct in6_addr);
                        ip6addr_string(ndo, obj_tptr)));
                 obj_tlen-=sizeof(struct in6_addr);
                 obj_tptr+=sizeof(struct in6_addr);
@@ -869,7 +869,7 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 while(obj_tlen >= 4 ) {
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 while(obj_tlen >= 4 ) {
-                    ND_PRINT((ndo, "%s  Label: %u", ident, EXTRACT_32BITS(obj_tptr)));
+                    ND_PRINT((ndo, "%s  Label: %u", indent, EXTRACT_BE_32BITS(obj_tptr)));
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
@@ -878,8 +878,8 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Generalized Label: %u",
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Generalized Label: %u",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr)));
+                       indent,
+                       EXTRACT_BE_32BITS(obj_tptr)));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -887,11 +887,11 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 12)
                     return-1;
                 ND_PRINT((ndo, "%s  Waveband ID: %u%s  Start Label: %u, Stop Label: %u",
                 if (obj_tlen < 12)
                     return-1;
                 ND_PRINT((ndo, "%s  Waveband ID: %u%s  Start Label: %u, Stop Label: %u",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr),
-                       ident,
-                       EXTRACT_32BITS(obj_tptr+4),
-                       EXTRACT_32BITS(obj_tptr + 8)));
+                       indent,
+                       EXTRACT_BE_32BITS(obj_tptr),
+                       indent,
+                       EXTRACT_BE_32BITS(obj_tptr + 4),
+                       EXTRACT_BE_32BITS(obj_tptr + 8)));
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
@@ -906,10 +906,10 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Reservation Style: %s, Flags: [0x%02x]",
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Reservation Style: %s, Flags: [0x%02x]",
-                       ident,
+                       indent,
                        tok2str(rsvp_resstyle_values,
                                "Unknown",
                        tok2str(rsvp_resstyle_values,
                                "Unknown",
-                               EXTRACT_24BITS(obj_tptr+1)),
+                               EXTRACT_BE_24BITS(obj_tptr + 1)),
                        *(obj_tptr)));
                 obj_tlen-=4;
                 obj_tptr+=4;
                        *(obj_tptr)));
                 obj_tlen-=4;
                 obj_tptr+=4;
@@ -925,9 +925,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr + 6)));
+                       EXTRACT_BE_16BITS(obj_tptr + 6)));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -935,9 +935,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr),
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr + 18)));
+                       EXTRACT_BE_16BITS(obj_tptr + 18)));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -946,12 +946,12 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT((ndo, "%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                     return-1;
                 ND_PRINT((ndo, "%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr),
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+18),
-                       ident,
+                       EXTRACT_BE_16BITS(obj_tptr + 18),
+                       indent,
                        ip6addr_string(ndo, obj_tptr+20),
                        ip6addr_string(ndo, obj_tptr+20),
-                       EXTRACT_16BITS(obj_tptr + 38)));
+                       EXTRACT_BE_16BITS(obj_tptr + 38)));
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
@@ -959,9 +959,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr + 6)));
+                       EXTRACT_BE_16BITS(obj_tptr + 6)));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -970,12 +970,12 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                     return-1;
                 ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6),
-                       ident,
+                       EXTRACT_BE_16BITS(obj_tptr + 6),
+                       indent,
                        ipaddr_string(ndo, obj_tptr+8),
                        ipaddr_string(ndo, obj_tptr+8),
-                       EXTRACT_16BITS(obj_tptr + 12)));
+                       EXTRACT_BE_16BITS(obj_tptr + 12)));
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
@@ -989,10 +989,10 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_1:
                 while(obj_tlen >= 4 ) {
                     ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
             case RSVP_CTYPE_1:
                 while(obj_tlen >= 4 ) {
                     ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
-                           ident,
+                           indent,
                            tok2str(ethertype_values,
                                    "Unknown Protocol (0x%04x)",
                            tok2str(ethertype_values,
                                    "Unknown Protocol (0x%04x)",
-                                   EXTRACT_16BITS(obj_tptr + 2))));
+                                   EXTRACT_BE_16BITS(obj_tptr + 2))));
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
@@ -1001,19 +1001,19 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 12)
                     return-1;
                 ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
                 if (obj_tlen < 12)
                     return-1;
                 ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
-                       ident,
+                       indent,
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
-                               EXTRACT_16BITS(obj_tptr + 2))));
+                               EXTRACT_BE_16BITS(obj_tptr + 2))));
                 ND_PRINT((ndo, ",%s merge capability",((*(obj_tptr + 4)) & 0x80) ? "no" : "" ));
                 ND_PRINT((ndo, "%s  Minimum VPI/VCI: %u/%u",
                 ND_PRINT((ndo, ",%s merge capability",((*(obj_tptr + 4)) & 0x80) ? "no" : "" ));
                 ND_PRINT((ndo, "%s  Minimum VPI/VCI: %u/%u",
-                       ident,
-                       (EXTRACT_16BITS(obj_tptr+4))&0xfff,
-                       (EXTRACT_16BITS(obj_tptr + 6)) & 0xfff));
+                       indent,
+                       (EXTRACT_BE_16BITS(obj_tptr + 4))&0xfff,
+                       (EXTRACT_BE_16BITS(obj_tptr + 6)) & 0xfff));
                 ND_PRINT((ndo, "%s  Maximum VPI/VCI: %u/%u",
                 ND_PRINT((ndo, "%s  Maximum VPI/VCI: %u/%u",
-                       ident,
-                       (EXTRACT_16BITS(obj_tptr+8))&0xfff,
-                       (EXTRACT_16BITS(obj_tptr + 10)) & 0xfff));
+                       indent,
+                       (EXTRACT_BE_16BITS(obj_tptr + 8))&0xfff,
+                       (EXTRACT_BE_16BITS(obj_tptr + 10)) & 0xfff));
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
@@ -1021,16 +1021,16 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 12)
                     return-1;
                 ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
                 if (obj_tlen < 12)
                     return-1;
                 ND_PRINT((ndo, "%s  L3 Protocol ID: %s",
-                       ident,
+                       indent,
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
-                               EXTRACT_16BITS(obj_tptr + 2))));
+                               EXTRACT_BE_16BITS(obj_tptr + 2))));
                 ND_PRINT((ndo, "%s  Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI",
                 ND_PRINT((ndo, "%s  Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI",
-                       ident,
-                       (EXTRACT_32BITS(obj_tptr+4))&0x7fffff,
-                       (EXTRACT_32BITS(obj_tptr+8))&0x7fffff,
-                       (((EXTRACT_16BITS(obj_tptr+4)>>7)&3) == 0 ) ? "10" : "",
-                       (((EXTRACT_16BITS(obj_tptr + 4) >> 7) & 3) == 2 ) ? "23" : ""));
+                       indent,
+                       (EXTRACT_BE_32BITS(obj_tptr + 4))&0x7fffff,
+                       (EXTRACT_BE_32BITS(obj_tptr + 8))&0x7fffff,
+                       (((EXTRACT_BE_16BITS(obj_tptr + 4)>>7)&3) == 0 ) ? "10" : "",
+                       (((EXTRACT_BE_16BITS(obj_tptr + 4) >> 7) & 3) == 2 ) ? "23" : ""));
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
@@ -1038,21 +1038,21 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  LSP Encoding Type: %s (%u)",
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  LSP Encoding Type: %s (%u)",
-                       ident,
+                       indent,
                        tok2str(gmpls_encoding_values,
                                "Unknown",
                                *obj_tptr),
                       *obj_tptr));
                 ND_PRINT((ndo, "%s  Switching Type: %s (%u), Payload ID: %s (0x%04x)",
                        tok2str(gmpls_encoding_values,
                                "Unknown",
                                *obj_tptr),
                       *obj_tptr));
                 ND_PRINT((ndo, "%s  Switching Type: %s (%u), Payload ID: %s (0x%04x)",
-                       ident,
+                       indent,
                        tok2str(gmpls_switch_cap_values,
                                "Unknown",
                                *(obj_tptr+1)),
                       *(obj_tptr+1),
                        tok2str(gmpls_payload_values,
                                "Unknown",
                        tok2str(gmpls_switch_cap_values,
                                "Unknown",
                                *(obj_tptr+1)),
                       *(obj_tptr+1),
                        tok2str(gmpls_payload_values,
                                "Unknown",
-                               EXTRACT_16BITS(obj_tptr+2)),
-                      EXTRACT_16BITS(obj_tptr + 2)));
+                               EXTRACT_BE_16BITS(obj_tptr + 2)),
+                       EXTRACT_BE_16BITS(obj_tptr + 2)));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -1071,14 +1071,14 @@ rsvp_obj_print(netdissect_options *ndo,
                    ND_TCHECK2(*obj_tptr, 4);
                    length = *(obj_tptr + 1);
                     ND_PRINT((ndo, "%s  Subobject Type: %s, length %u",
                    ND_TCHECK2(*obj_tptr, 4);
                    length = *(obj_tptr + 1);
                     ND_PRINT((ndo, "%s  Subobject Type: %s, length %u",
-                           ident,
+                           indent,
                            tok2str(rsvp_obj_xro_values,
                                    "Unknown %u",
                                    RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)),
                            length));
 
                     if (length == 0) { /* prevent infinite loops */
                            tok2str(rsvp_obj_xro_values,
                                    "Unknown %u",
                                    RSVP_OBJ_XRO_MASK_SUBOBJ(*obj_tptr)),
                            length));
 
                     if (length == 0) { /* prevent infinite loops */
-                        ND_PRINT((ndo, "%s  ERROR: zero length ERO subtype", ident));
+                        ND_PRINT((ndo, "%s  ERROR: zero length ERO subtype", indent));
                         break;
                     }
 
                         break;
                     }
 
@@ -1120,7 +1120,7 @@ rsvp_obj_print(netdissect_options *ndo,
                                        "Unknown",
                                        *(obj_tptr+3) + 256*RSVP_OBJ_RRO),
                                *(obj_tptr+3),
                                        "Unknown",
                                        *(obj_tptr+3) + 256*RSVP_OBJ_RRO),
                                *(obj_tptr+3),
-                               EXTRACT_32BITS(obj_tptr + 4)));
+                               EXTRACT_BE_32BITS(obj_tptr + 4)));
                     }
                     obj_tlen-=*(obj_tptr+1);
                     obj_tptr+=*(obj_tptr+1);
                     }
                     obj_tlen-=*(obj_tptr+1);
                     obj_tptr+=*(obj_tptr+1);
@@ -1138,9 +1138,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Instance: 0x%08x, Destination Instance: 0x%08x",
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Instance: 0x%08x, Destination Instance: 0x%08x",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr + 4)));
+                       indent,
+                       EXTRACT_BE_32BITS(obj_tptr),
+                       EXTRACT_BE_32BITS(obj_tptr + 4)));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -1155,9 +1155,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Restart  Time: %ums, Recovery Time: %ums",
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Restart  Time: %ums, Recovery Time: %ums",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr + 4)));
+                       indent,
+                       EXTRACT_BE_32BITS(obj_tptr),
+                       EXTRACT_BE_32BITS(obj_tptr + 4)));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -1174,11 +1174,11 @@ rsvp_obj_print(netdissect_options *ndo,
                 namelen = *(obj_tptr+3);
                 if (obj_tlen < 4+namelen)
                     return-1;
                 namelen = *(obj_tptr+3);
                 if (obj_tlen < 4+namelen)
                     return-1;
-                ND_PRINT((ndo, "%s  Session Name: ", ident));
+                ND_PRINT((ndo, "%s  Session Name: ", indent));
                 for (i = 0; i < namelen; i++)
                     safeputchar(ndo, *(obj_tptr + 4 + i));
                 ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Flags: [%s] (%#x)",
                 for (i = 0; i < namelen; i++)
                     safeputchar(ndo, *(obj_tptr + 4 + i));
                 ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Flags: [%s] (%#x)",
-                       ident,
+                       indent,
                        (int)*obj_tptr,
                        (int)*(obj_tptr+1),
                        bittok2str(rsvp_session_attribute_flag_values,
                        (int)*obj_tptr,
                        (int)*(obj_tptr+1),
                        bittok2str(rsvp_session_attribute_flag_values,
@@ -1216,12 +1216,12 @@ rsvp_obj_print(netdissect_options *ndo,
                      */
                     if (total_subobj_len < 4)
                         goto invalid;
                      */
                     if (total_subobj_len < 4)
                         goto invalid;
-                    subobj_len  = EXTRACT_16BITS(obj_tptr);
-                    subobj_type = (EXTRACT_16BITS(obj_tptr+2))>>8;
-                    af = (EXTRACT_16BITS(obj_tptr+2))&0x00FF;
+                    subobj_len  = EXTRACT_BE_16BITS(obj_tptr);
+                    subobj_type = (EXTRACT_BE_16BITS(obj_tptr + 2))>>8;
+                    af = (EXTRACT_BE_16BITS(obj_tptr + 2))&0x00FF;
 
                     ND_PRINT((ndo, "%s  Subobject Type: %s (%u), AF: %s (%u), length: %u",
 
                     ND_PRINT((ndo, "%s  Subobject Type: %s (%u), AF: %s (%u), length: %u",
-                           ident,
+                           indent,
                            tok2str(rsvp_obj_generalized_uni_values, "Unknown", subobj_type),
                            subobj_type,
                            tok2str(af_values, "Unknown", af), af,
                            tok2str(rsvp_obj_generalized_uni_values, "Unknown", subobj_type),
                            subobj_type,
                            tok2str(af_values, "Unknown", af), af,
@@ -1245,13 +1245,13 @@ rsvp_obj_print(netdissect_options *ndo,
                             if (subobj_len < 8)
                                 return -1;
                             ND_PRINT((ndo, "%s    UNI IPv4 TNA address: %s",
                             if (subobj_len < 8)
                                 return -1;
                             ND_PRINT((ndo, "%s    UNI IPv4 TNA address: %s",
-                                   ident, ipaddr_string(ndo, obj_tptr + 4)));
+                                   indent, ipaddr_string(ndo, obj_tptr + 4)));
                             break;
                         case AFNUM_INET6:
                             if (subobj_len < 20)
                                 return -1;
                             ND_PRINT((ndo, "%s    UNI IPv6 TNA address: %s",
                             break;
                         case AFNUM_INET6:
                             if (subobj_len < 20)
                                 return -1;
                             ND_PRINT((ndo, "%s    UNI IPv6 TNA address: %s",
-                                   ident, ip6addr_string(ndo, obj_tptr + 4)));
+                                   indent, ip6addr_string(ndo, obj_tptr + 4)));
                             break;
                         case AFNUM_NSAP:
                             if (subobj_len) {
                             break;
                         case AFNUM_NSAP:
                             if (subobj_len) {
@@ -1275,11 +1275,11 @@ rsvp_obj_print(netdissect_options *ndo,
                         }
 
                         ND_PRINT((ndo, "%s    U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
                         }
 
                         ND_PRINT((ndo, "%s    U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
-                               ident,
-                               ((EXTRACT_32BITS(obj_tptr+4))>>31),
-                               ((EXTRACT_32BITS(obj_tptr+4))&0xFF),
-                               EXTRACT_32BITS(obj_tptr+8),
-                               EXTRACT_32BITS(obj_tptr + 12)));
+                               indent,
+                               ((EXTRACT_BE_32BITS(obj_tptr + 4))>>31),
+                               ((EXTRACT_BE_32BITS(obj_tptr + 4))&0xFF),
+                               EXTRACT_BE_32BITS(obj_tptr + 8),
+                               EXTRACT_BE_32BITS(obj_tptr + 12)));
                         break;
 
                     case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:
                         break;
 
                     case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:
@@ -1288,7 +1288,7 @@ rsvp_obj_print(netdissect_options *ndo,
                         }
 
                         ND_PRINT((ndo, "%s    Service level: %u",
                         }
 
                         ND_PRINT((ndo, "%s    Service level: %u",
-                               ident, (EXTRACT_32BITS(obj_tptr + 4)) >> 24));
+                               indent, (EXTRACT_BE_32BITS(obj_tptr + 4)) >> 24));
                         break;
 
                     default:
                         break;
 
                     default:
@@ -1318,9 +1318,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_32BITS(obj_tptr + 4)));
+                       EXTRACT_BE_32BITS(obj_tptr + 4)));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 if (obj_tlen)
                 obj_tlen-=8;
                 obj_tptr+=8;
                 if (obj_tlen)
@@ -1331,9 +1331,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr),
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_32BITS(obj_tptr + 16)));
+                       EXTRACT_BE_32BITS(obj_tptr + 16)));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
                 obj_tlen-=20;
                 obj_tptr+=20;
                 hexdump=TRUE; /* unless we have a TLV parser lets just hexdump */
@@ -1349,8 +1349,8 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Refresh Period: %ums",
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Refresh Period: %ums",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr)));
+                       indent,
+                       EXTRACT_BE_32BITS(obj_tptr)));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -1368,16 +1368,16 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Msg-Version: %u, length: %u",
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Msg-Version: %u, length: %u",
-                       ident,
+                       indent,
                        (*obj_tptr & 0xf0) >> 4,
                        (*obj_tptr & 0xf0) >> 4,
-                       EXTRACT_16BITS(obj_tptr + 2) << 2));
+                       EXTRACT_BE_16BITS(obj_tptr + 2) << 2));
                 obj_tptr+=4; /* get to the start of the service header */
                 obj_tlen-=4;
 
                 while (obj_tlen >= 4) {
                 obj_tptr+=4; /* get to the start of the service header */
                 obj_tlen-=4;
 
                 while (obj_tlen >= 4) {
-                    intserv_serv_tlen=EXTRACT_16BITS(obj_tptr+2)<<2;
+                    intserv_serv_tlen=EXTRACT_BE_16BITS(obj_tptr + 2)<<2;
                     ND_PRINT((ndo, "%s  Service Type: %s (%u), break bit %s set, Service length: %u",
                     ND_PRINT((ndo, "%s  Service Type: %s (%u), break bit %s set, Service length: %u",
-                           ident,
+                           indent,
                            tok2str(rsvp_intserv_service_type_values,"unknown",*(obj_tptr)),
                            *(obj_tptr),
                            (*(obj_tptr+1)&0x80) ? "" : "not",
                            tok2str(rsvp_intserv_service_type_values,"unknown",*(obj_tptr)),
                            *(obj_tptr),
                            (*(obj_tptr+1)&0x80) ? "" : "not",
@@ -1407,9 +1407,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr + 6)));
+                       EXTRACT_BE_16BITS(obj_tptr + 6)));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -1417,9 +1417,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Source Port: %u",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr),
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr + 18)));
+                       EXTRACT_BE_16BITS(obj_tptr + 18)));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -1427,9 +1427,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Flow Label: %u",
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, Flow Label: %u",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr),
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_24BITS(obj_tptr + 17)));
+                       EXTRACT_BE_24BITS(obj_tptr + 17)));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -1437,9 +1437,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, LSP-ID: 0x%04x",
                 if (obj_tlen < 20)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, LSP-ID: 0x%04x",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr + 18)));
+                       EXTRACT_BE_16BITS(obj_tptr + 18)));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -1448,12 +1448,12 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT((ndo, "%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                     return-1;
                 ND_PRINT((ndo, "%s  IPv6 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr),
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+18),
-                       ident,
+                       EXTRACT_BE_16BITS(obj_tptr + 18),
+                       indent,
                        ip6addr_string(ndo, obj_tptr+20),
                        ip6addr_string(ndo, obj_tptr+20),
-                       EXTRACT_16BITS(obj_tptr + 38)));
+                       EXTRACT_BE_16BITS(obj_tptr + 38)));
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
@@ -1461,9 +1461,9 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, LSP-ID: 0x%04x",
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Source Address: %s, LSP-ID: 0x%04x",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr + 6)));
+                       EXTRACT_BE_16BITS(obj_tptr + 6)));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -1472,12 +1472,12 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                     return-1;
                 ND_PRINT((ndo, "%s  IPv4 Tunnel Sender Address: %s, LSP ID: 0x%04x"
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+6),
-                       ident,
+                       EXTRACT_BE_16BITS(obj_tptr + 6),
+                       indent,
                        ipaddr_string(ndo, obj_tptr+8),
                        ipaddr_string(ndo, obj_tptr+8),
-                       EXTRACT_16BITS(obj_tptr + 12)));
+                       EXTRACT_BE_16BITS(obj_tptr + 12)));
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
@@ -1494,18 +1494,18 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_1: /* new style */
                 if (obj_tlen < sizeof(struct rsvp_obj_frr_t))
                     return-1;
             case RSVP_CTYPE_1: /* new style */
                 if (obj_tlen < sizeof(struct rsvp_obj_frr_t))
                     return-1;
-                bw.i = EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->bandwidth);
+                bw.i = EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_frr->bandwidth);
                 ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
                 ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
-                       ident,
+                       indent,
                        (int)obj_ptr.rsvp_obj_frr->setup_prio,
                        (int)obj_ptr.rsvp_obj_frr->hold_prio,
                        (int)obj_ptr.rsvp_obj_frr->hop_limit,
                         bw.f * 8 / 1000000));
                 ND_PRINT((ndo, "%s  Include-any: 0x%08x, Exclude-any: 0x%08x, Include-all: 0x%08x",
                        (int)obj_ptr.rsvp_obj_frr->setup_prio,
                        (int)obj_ptr.rsvp_obj_frr->hold_prio,
                        (int)obj_ptr.rsvp_obj_frr->hop_limit,
                         bw.f * 8 / 1000000));
                 ND_PRINT((ndo, "%s  Include-any: 0x%08x, Exclude-any: 0x%08x, Include-all: 0x%08x",
-                       ident,
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->include_any),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->exclude_any),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->include_all)));
+                       indent,
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_frr->include_any),
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_frr->exclude_any),
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_frr->include_all)));
                 obj_tlen-=sizeof(struct rsvp_obj_frr_t);
                 obj_tptr+=sizeof(struct rsvp_obj_frr_t);
                 break;
                 obj_tlen-=sizeof(struct rsvp_obj_frr_t);
                 obj_tptr+=sizeof(struct rsvp_obj_frr_t);
                 break;
@@ -1513,17 +1513,17 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_TUNNEL_IPV4: /* old style */
                 if (obj_tlen < 16)
                     return-1;
             case RSVP_CTYPE_TUNNEL_IPV4: /* old style */
                 if (obj_tlen < 16)
                     return-1;
-                bw.i = EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->bandwidth);
+                bw.i = EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_frr->bandwidth);
                 ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
                 ND_PRINT((ndo, "%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
-                       ident,
+                       indent,
                        (int)obj_ptr.rsvp_obj_frr->setup_prio,
                        (int)obj_ptr.rsvp_obj_frr->hold_prio,
                        (int)obj_ptr.rsvp_obj_frr->hop_limit,
                         bw.f * 8 / 1000000));
                 ND_PRINT((ndo, "%s  Include Colors: 0x%08x, Exclude Colors: 0x%08x",
                        (int)obj_ptr.rsvp_obj_frr->setup_prio,
                        (int)obj_ptr.rsvp_obj_frr->hold_prio,
                        (int)obj_ptr.rsvp_obj_frr->hop_limit,
                         bw.f * 8 / 1000000));
                 ND_PRINT((ndo, "%s  Include Colors: 0x%08x, Exclude Colors: 0x%08x",
-                       ident,
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->include_any),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_frr->exclude_any)));
+                       indent,
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_frr->include_any),
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_frr->exclude_any)));
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
@@ -1538,7 +1538,7 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_TUNNEL_IPV4:
                 while(obj_tlen >= 8) {
                     ND_PRINT((ndo, "%s  PLR-ID: %s, Avoid-Node-ID: %s",
             case RSVP_CTYPE_TUNNEL_IPV4:
                 while(obj_tlen >= 8) {
                     ND_PRINT((ndo, "%s  PLR-ID: %s, Avoid-Node-ID: %s",
-                           ident,
+                           indent,
                            ipaddr_string(ndo, obj_tptr),
                            ipaddr_string(ndo, obj_tptr + 4)));
                     obj_tlen-=8;
                            ipaddr_string(ndo, obj_tptr),
                            ipaddr_string(ndo, obj_tptr + 4)));
                     obj_tlen-=8;
@@ -1555,8 +1555,8 @@ rsvp_obj_print(netdissect_options *ndo,
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 ND_PRINT((ndo, "%s  CT: %u",
             switch(rsvp_obj_ctype) {
             case RSVP_CTYPE_1:
                 ND_PRINT((ndo, "%s  CT: %u",
-                       ident,
-                       EXTRACT_32BITS(obj_tptr) & 0x7));
+                       indent,
+                       EXTRACT_BE_32BITS(obj_tptr) & 0x7));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -1572,12 +1572,12 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return-1;
                 error_code=*(obj_tptr+5);
                 if (obj_tlen < 8)
                     return-1;
                 error_code=*(obj_tptr+5);
-                error_value=EXTRACT_16BITS(obj_tptr+6);
+                error_value=EXTRACT_BE_16BITS(obj_tptr + 6);
                 ND_PRINT((ndo, "%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
                 ND_PRINT((ndo, "%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
-                       ident,
+                       indent,
                        ipaddr_string(ndo, obj_tptr),
                        *(obj_tptr+4),
                        ipaddr_string(ndo, obj_tptr),
                        *(obj_tptr+4),
-                       ident,
+                       indent,
                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        error_code));
                 switch (error_code) {
                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        error_code));
                 switch (error_code) {
@@ -1604,12 +1604,12 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 20)
                     return-1;
                 error_code=*(obj_tptr+17);
                 if (obj_tlen < 20)
                     return-1;
                 error_code=*(obj_tptr+17);
-                error_value=EXTRACT_16BITS(obj_tptr+18);
+                error_value=EXTRACT_BE_16BITS(obj_tptr + 18);
                 ND_PRINT((ndo, "%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
                 ND_PRINT((ndo, "%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
-                       ident,
+                       indent,
                        ip6addr_string(ndo, obj_tptr),
                        *(obj_tptr+16),
                        ip6addr_string(ndo, obj_tptr),
                        *(obj_tptr+16),
-                       ident,
+                       indent,
                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        error_code));
 
                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        error_code));
 
@@ -1635,17 +1635,17 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;
-                padbytes = EXTRACT_16BITS(obj_tptr+2);
+                padbytes = EXTRACT_BE_16BITS(obj_tptr + 2);
                 ND_PRINT((ndo, "%s  TLV count: %u, padding bytes: %u",
                 ND_PRINT((ndo, "%s  TLV count: %u, padding bytes: %u",
-                       ident,
-                       EXTRACT_16BITS(obj_tptr),
+                       indent,
+                       EXTRACT_BE_16BITS(obj_tptr),
                        padbytes));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 /* loop through as long there is anything longer than the TLV header (2) */
                 while(obj_tlen >= 2 + padbytes) {
                     ND_PRINT((ndo, "%s    %s TLV (0x%02x), length: %u", /* length includes header */
                        padbytes));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 /* loop through as long there is anything longer than the TLV header (2) */
                 while(obj_tlen >= 2 + padbytes) {
                     ND_PRINT((ndo, "%s    %s TLV (0x%02x), length: %u", /* length includes header */
-                           ident,
+                           indent,
                            tok2str(rsvp_obj_prop_tlv_values,"unknown",*obj_tptr),
                            *obj_tptr,
                            *(obj_tptr + 1)));
                            tok2str(rsvp_obj_prop_tlv_values,"unknown",*obj_tptr),
                            *obj_tptr,
                            *(obj_tptr + 1)));
@@ -1672,17 +1672,17 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Flags [0x%02x], epoch: %u",
                 if (obj_tlen < 8)
                     return-1;
                 ND_PRINT((ndo, "%s  Flags [0x%02x], epoch: %u",
-                       ident,
+                       indent,
                        *obj_tptr,
                        *obj_tptr,
-                       EXTRACT_24BITS(obj_tptr + 1)));
+                       EXTRACT_BE_24BITS(obj_tptr + 1)));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 /* loop through as long there are no messages left */
                 while(obj_tlen >= 4) {
                     ND_PRINT((ndo, "%s    Message-ID 0x%08x (%u)",
                 obj_tlen-=4;
                 obj_tptr+=4;
                 /* loop through as long there are no messages left */
                 while(obj_tlen >= 4) {
                     ND_PRINT((ndo, "%s    Message-ID 0x%08x (%u)",
-                           ident,
-                           EXTRACT_32BITS(obj_tptr),
-                           EXTRACT_32BITS(obj_tptr)));
+                           indent,
+                           EXTRACT_BE_32BITS(obj_tptr),
+                           EXTRACT_BE_32BITS(obj_tptr)));
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
@@ -1699,20 +1699,20 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr;
                 ND_PRINT((ndo, "%s  Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]",
                     return-1;
                 obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr;
                 ND_PRINT((ndo, "%s  Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]",
-                       ident,
-                       EXTRACT_16BITS(obj_ptr.rsvp_obj_integrity->key_id),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->key_id+2),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->sequence),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->sequence+4),
+                       indent,
+                       EXTRACT_BE_16BITS(obj_ptr.rsvp_obj_integrity->key_id),
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_integrity->key_id + 2),
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_integrity->sequence),
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_integrity->sequence + 4),
                        bittok2str(rsvp_obj_integrity_flag_values,
                                   "none",
                                   obj_ptr.rsvp_obj_integrity->flags)));
                 ND_PRINT((ndo, "%s  MD5-sum 0x%08x%08x%08x%08x ",
                        bittok2str(rsvp_obj_integrity_flag_values,
                                   "none",
                                   obj_ptr.rsvp_obj_integrity->flags)));
                 ND_PRINT((ndo, "%s  MD5-sum 0x%08x%08x%08x%08x ",
-                       ident,
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest+4),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest+8),
-                       EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest + 12)));
+                       indent,
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_integrity->digest),
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_integrity->digest + 4),
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_integrity->digest + 8),
+                       EXTRACT_BE_32BITS(obj_ptr.rsvp_obj_integrity->digest + 12)));
 
                 sigcheck = signature_verify(ndo, pptr, plen,
                                             obj_ptr.rsvp_obj_integrity->digest,
 
                 sigcheck = signature_verify(ndo, pptr, plen,
                                             obj_ptr.rsvp_obj_integrity->digest,
@@ -1733,9 +1733,9 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;
-                ND_PRINT((ndo, "%s  Flags [%s]", ident,
+                ND_PRINT((ndo, "%s  Flags [%s]", indent,
                        bittok2str(rsvp_obj_admin_status_flag_values, "none",
                        bittok2str(rsvp_obj_admin_status_flag_values, "none",
-                                  EXTRACT_32BITS(obj_tptr))));
+                                  EXTRACT_BE_32BITS(obj_tptr))));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -1749,11 +1749,11 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_1:
                 if (obj_tlen < 4)
                     return-1;
-                action = (EXTRACT_16BITS(obj_tptr)>>8);
+                action = (EXTRACT_BE_16BITS(obj_tptr)>>8);
 
 
-                ND_PRINT((ndo, "%s  Action: %s (%u), Label type: %u", ident,
+                ND_PRINT((ndo, "%s  Action: %s (%u), Label type: %u", indent,
                        tok2str(rsvp_obj_label_set_action_values, "Unknown", action),
                        tok2str(rsvp_obj_label_set_action_values, "Unknown", action),
-                       action, ((EXTRACT_32BITS(obj_tptr) & 0x7F))));
+                       action, ((EXTRACT_BE_32BITS(obj_tptr) & 0x7F))));
 
                 switch (action) {
                 case LABEL_SET_INCLUSIVE_RANGE:
 
                 switch (action) {
                 case LABEL_SET_INCLUSIVE_RANGE:
@@ -1762,9 +1762,9 @@ rsvp_obj_print(netdissect_options *ndo,
                    /* only a couple of subchannels are expected */
                    if (obj_tlen < 12)
                        return -1;
                    /* only a couple of subchannels are expected */
                    if (obj_tlen < 12)
                        return -1;
-                   ND_PRINT((ndo, "%s  Start range: %u, End range: %u", ident,
-                           EXTRACT_32BITS(obj_tptr+4),
-                           EXTRACT_32BITS(obj_tptr + 8)));
+                   ND_PRINT((ndo, "%s  Start range: %u, End range: %u", indent,
+                           EXTRACT_BE_32BITS(obj_tptr + 4),
+                           EXTRACT_BE_32BITS(obj_tptr + 8)));
                    obj_tlen-=12;
                    obj_tptr+=12;
                     break;
                    obj_tlen-=12;
                    obj_tptr+=12;
                     break;
@@ -1774,8 +1774,8 @@ rsvp_obj_print(netdissect_options *ndo,
                     obj_tptr+=4;
                     subchannel = 1;
                     while(obj_tlen >= 4 ) {
                     obj_tptr+=4;
                     subchannel = 1;
                     while(obj_tlen >= 4 ) {
-                        ND_PRINT((ndo, "%s  Subchannel #%u: %u", ident, subchannel,
-                               EXTRACT_32BITS(obj_tptr)));
+                        ND_PRINT((ndo, "%s  Subchannel #%u: %u", indent, subchannel,
+                               EXTRACT_BE_32BITS(obj_tptr)));
                         obj_tptr+=4;
                         obj_tlen-=4;
                         subchannel++;
                         obj_tptr+=4;
                         obj_tlen-=4;
                         subchannel++;
@@ -1794,7 +1794,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Sub-LSP destination address: %s",
                 if (obj_tlen < 4)
                     return-1;
                 ND_PRINT((ndo, "%s  Sub-LSP destination address: %s",
-                       ident, ipaddr_string(ndo, obj_tptr)));
+                       indent, ipaddr_string(ndo, obj_tptr)));
 
                 obj_tlen-=4;
                 obj_tptr+=4;
 
                 obj_tlen-=4;
                 obj_tptr+=4;
@@ -1803,7 +1803,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 if (obj_tlen < 16)
                     return-1;
                 ND_PRINT((ndo, "%s  Sub-LSP destination address: %s",
                 if (obj_tlen < 16)
                     return-1;
                 ND_PRINT((ndo, "%s  Sub-LSP destination address: %s",
-                       ident, ip6addr_string(ndo, obj_tptr)));
+                       indent, ip6addr_string(ndo, obj_tptr)));
 
                 obj_tlen-=16;
                 obj_tptr+=16;
 
                 obj_tlen-=16;
                 obj_tptr+=16;
@@ -1878,7 +1878,7 @@ rsvp_print(netdissect_options *ndo,
 
     /* ok they seem to want to know everything - lets fully decode it */
 
 
     /* ok they seem to want to know everything - lets fully decode it */
 
-    plen = tlen = EXTRACT_16BITS(rsvp_com_header->length);
+    plen = tlen = EXTRACT_BE_16BITS(rsvp_com_header->length);
 
     ND_PRINT((ndo, "\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
            RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
 
     ND_PRINT((ndo, "\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
            RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
@@ -1887,16 +1887,16 @@ rsvp_print(netdissect_options *ndo,
            bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)),
            tlen,
            rsvp_com_header->ttl,
            bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)),
            tlen,
            rsvp_com_header->ttl,
-           EXTRACT_16BITS(rsvp_com_header->checksum)));
+           EXTRACT_BE_16BITS(rsvp_com_header->checksum)));
 
 
-    if (tlen < sizeof(const struct rsvp_common_header)) {
+    if (tlen < sizeof(struct rsvp_common_header)) {
         ND_PRINT((ndo, "ERROR: common header too short %u < %lu", tlen,
         ND_PRINT((ndo, "ERROR: common header too short %u < %lu", tlen,
-               (unsigned long)sizeof(const struct rsvp_common_header)));
+               (unsigned long)sizeof(struct rsvp_common_header)));
         return;
     }
 
         return;
     }
 
-    tptr+=sizeof(const struct rsvp_common_header);
-    tlen-=sizeof(const struct rsvp_common_header);
+    tptr+=sizeof(struct rsvp_common_header);
+    tlen-=sizeof(struct rsvp_common_header);
 
     switch(rsvp_com_header->msg_type) {
 
 
     switch(rsvp_com_header->msg_type) {
 
@@ -1924,7 +1924,7 @@ rsvp_print(netdissect_options *ndo,
                 return;
             }
 
                 return;
             }
 
-            subplen = subtlen = EXTRACT_16BITS(rsvp_com_header->length);
+            subplen = subtlen = EXTRACT_BE_16BITS(rsvp_com_header->length);
 
             ND_PRINT((ndo, "\n\t  RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
                    RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
 
             ND_PRINT((ndo, "\n\t  RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
                    RSVP_EXTRACT_VERSION(rsvp_com_header->version_flags),
@@ -1933,11 +1933,11 @@ rsvp_print(netdissect_options *ndo,
                    bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)),
                    subtlen,
                    rsvp_com_header->ttl,
                    bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(rsvp_com_header->version_flags)),
                    subtlen,
                    rsvp_com_header->ttl,
-                   EXTRACT_16BITS(rsvp_com_header->checksum)));
+                   EXTRACT_BE_16BITS(rsvp_com_header->checksum)));
 
 
-            if (subtlen < sizeof(const struct rsvp_common_header)) {
+            if (subtlen < sizeof(struct rsvp_common_header)) {
                 ND_PRINT((ndo, "ERROR: common header too short %u < %lu", subtlen,
                 ND_PRINT((ndo, "ERROR: common header too short %u < %lu", subtlen,
-                       (unsigned long)sizeof(const struct rsvp_common_header)));
+                       (unsigned long)sizeof(struct rsvp_common_header)));
                 return;
             }
 
                 return;
             }
 
@@ -1947,8 +1947,8 @@ rsvp_print(netdissect_options *ndo,
                 return;
             }
 
                 return;
             }
 
-            subtptr+=sizeof(const struct rsvp_common_header);
-            subtlen-=sizeof(const struct rsvp_common_header);
+            subtptr+=sizeof(struct rsvp_common_header);
+            subtlen-=sizeof(struct rsvp_common_header);
 
             /*
              * Print all objects in the submessage.
 
             /*
              * Print all objects in the submessage.
@@ -1956,8 +1956,8 @@ rsvp_print(netdissect_options *ndo,
             if (rsvp_obj_print(ndo, subpptr, subplen, subtptr, "\n\t    ", subtlen, rsvp_com_header) == -1)
                 return;
 
             if (rsvp_obj_print(ndo, subpptr, subplen, subtptr, "\n\t    ", subtlen, rsvp_com_header) == -1)
                 return;
 
-            tptr+=subtlen+sizeof(const struct rsvp_common_header);
-            tlen-=subtlen+sizeof(const struct rsvp_common_header);
+            tptr+=subtlen+sizeof(struct rsvp_common_header);
+            tlen-=subtlen+sizeof(struct rsvp_common_header);
         }
 
         break;
         }
 
         break;
[mirror] the TCPdump network dissector