]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-rsvp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #760 from leres/master
[tcpdump] / print-rsvp.c
diff --git a/print-rsvp.c b/print-rsvp.c
index 27b6933d1aec0e6c301c49933a40e18cdb34bdbf..17dd7358da97fe9137377ec0c960bfaca955cb06 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -33,7 +33,6 @@
 #include "af.h"
 #include "signature.h"
 
 #include "af.h"
 #include "signature.h"
 
-static const char tstr[] = " [|rsvp]";
 
 /*
  * RFC 2205 common header
 
 /*
  * RFC 2205 common header
@@ -491,7 +490,7 @@ static const struct tok rsvp_obj_generalized_uni_values[] = {
  */
 static u_int
 rsvp_intserv_print(netdissect_options *ndo,
  */
 static u_int
 rsvp_intserv_print(netdissect_options *ndo,
-                   const u_char *tptr, u_short obj_tlen)
+                   const u_char *tptr, u_int obj_tlen)
 {
     u_int parameter_id,parameter_length;
     union {
 {
     u_int parameter_id,parameter_length;
     union {
@@ -502,15 +501,15 @@ rsvp_intserv_print(netdissect_options *ndo,
     if (obj_tlen < 4)
         return 0;
     ND_TCHECK_1(tptr);
     if (obj_tlen < 4)
         return 0;
     ND_TCHECK_1(tptr);
-    parameter_id = EXTRACT_U_1(tptr);
+    parameter_id = GET_U_1(tptr);
     ND_TCHECK_2(tptr + 2);
     ND_TCHECK_2(tptr + 2);
-    parameter_length = EXTRACT_BE_U_2(tptr + 2)<<2; /* convert wordcount to bytecount */
+    parameter_length = GET_BE_U_2(tptr + 2)<<2; /* convert wordcount to bytecount */
 
     ND_PRINT("\n\t      Parameter ID: %s (%u), length: %u, Flags: [0x%02x]",
            tok2str(rsvp_intserv_parameter_id_values,"unknown",parameter_id),
            parameter_id,
            parameter_length,
 
     ND_PRINT("\n\t      Parameter ID: %s (%u), length: %u, Flags: [0x%02x]",
            tok2str(rsvp_intserv_parameter_id_values,"unknown",parameter_id),
            parameter_id,
            parameter_length,
-           EXTRACT_U_1(tptr + 1));
+           GET_U_1(tptr + 1));
 
     if (obj_tlen < parameter_length+4)
         return 0;
 
     if (obj_tlen < parameter_length+4)
         return 0;
@@ -526,7 +525,7 @@ rsvp_intserv_print(netdissect_options *ndo,
         */
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
         */
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
-            ND_PRINT("\n\t\tIS hop count: %u", EXTRACT_BE_U_4(tptr + 4));
+            ND_PRINT("\n\t\tIS hop count: %u", GET_BE_U_4(tptr + 4));
         }
         break;
 
         }
         break;
 
@@ -540,7 +539,7 @@ rsvp_intserv_print(netdissect_options *ndo,
         */
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
         */
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
-            bw.i = EXTRACT_BE_U_4(tptr + 4);
+            bw.i = GET_BE_U_4(tptr + 4);
             ND_PRINT("\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000);
         }
         break;
             ND_PRINT("\n\t\tPath b/w estimate: %.10g Mbps", bw.f / 125000);
         }
         break;
@@ -556,10 +555,10 @@ rsvp_intserv_print(netdissect_options *ndo,
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
             ND_PRINT("\n\t\tMinimum path latency: ");
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
             ND_PRINT("\n\t\tMinimum path latency: ");
-            if (EXTRACT_BE_U_4(tptr + 4) == 0xffffffff)
+            if (GET_BE_U_4(tptr + 4) == 0xffffffff)
                 ND_PRINT("don't care");
             else
                 ND_PRINT("don't care");
             else
-                ND_PRINT("%u", EXTRACT_BE_U_4(tptr + 4));
+                ND_PRINT("%u", GET_BE_U_4(tptr + 4));
         }
         break;
 
         }
         break;
 
@@ -574,7 +573,7 @@ rsvp_intserv_print(netdissect_options *ndo,
         */
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
         */
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
-            ND_PRINT("\n\t\tComposed MTU: %u bytes", EXTRACT_BE_U_4(tptr + 4));
+            ND_PRINT("\n\t\tComposed MTU: %u bytes", GET_BE_U_4(tptr + 4));
         }
         break;
     case 127:
         }
         break;
     case 127:
@@ -596,14 +595,16 @@ rsvp_intserv_print(netdissect_options *ndo,
 
         if (parameter_length == 20) {
            ND_TCHECK_LEN(tptr + 4, 20);
 
         if (parameter_length == 20) {
            ND_TCHECK_LEN(tptr + 4, 20);
-            bw.i = EXTRACT_BE_U_4(tptr + 4);
+            bw.i = GET_BE_U_4(tptr + 4);
             ND_PRINT("\n\t\tToken Bucket Rate: %.10g Mbps", bw.f / 125000);
             ND_PRINT("\n\t\tToken Bucket Rate: %.10g Mbps", bw.f / 125000);
-            bw.i = EXTRACT_BE_U_4(tptr + 8);
+            bw.i = GET_BE_U_4(tptr + 8);
             ND_PRINT("\n\t\tToken Bucket Size: %.10g bytes", bw.f);
             ND_PRINT("\n\t\tToken Bucket Size: %.10g bytes", bw.f);
-            bw.i = EXTRACT_BE_U_4(tptr + 12);
+            bw.i = GET_BE_U_4(tptr + 12);
             ND_PRINT("\n\t\tPeak Data Rate: %.10g Mbps", bw.f / 125000);
             ND_PRINT("\n\t\tPeak Data Rate: %.10g Mbps", bw.f / 125000);
-            ND_PRINT("\n\t\tMinimum Policed Unit: %u bytes", EXTRACT_BE_U_4(tptr + 16));
-            ND_PRINT("\n\t\tMaximum Packet Size: %u bytes", EXTRACT_BE_U_4(tptr + 20));
+            ND_PRINT("\n\t\tMinimum Policed Unit: %u bytes",
+                     GET_BE_U_4(tptr + 16));
+            ND_PRINT("\n\t\tMaximum Packet Size: %u bytes",
+                     GET_BE_U_4(tptr + 20));
         }
         break;
 
         }
         break;
 
@@ -620,9 +621,9 @@ rsvp_intserv_print(netdissect_options *ndo,
 
         if (parameter_length == 8) {
            ND_TCHECK_8(tptr + 4);
 
         if (parameter_length == 8) {
            ND_TCHECK_8(tptr + 4);
-            bw.i = EXTRACT_BE_U_4(tptr + 4);
+            bw.i = GET_BE_U_4(tptr + 4);
             ND_PRINT("\n\t\tRate: %.10g Mbps", bw.f / 125000);
             ND_PRINT("\n\t\tRate: %.10g Mbps", bw.f / 125000);
-            ND_PRINT("\n\t\tSlack Term: %u", EXTRACT_BE_U_4(tptr + 8));
+            ND_PRINT("\n\t\tSlack Term: %u", GET_BE_U_4(tptr + 8));
         }
         break;
 
         }
         break;
 
@@ -632,7 +633,7 @@ rsvp_intserv_print(netdissect_options *ndo,
     case 136:
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
     case 136:
         if (parameter_length == 4) {
            ND_TCHECK_4(tptr + 4);
-            ND_PRINT("\n\t\tValue: %u", EXTRACT_BE_U_4(tptr + 4));
+            ND_PRINT("\n\t\tValue: %u", GET_BE_U_4(tptr + 4));
         }
         break;
 
         }
         break;
 
@@ -643,7 +644,7 @@ rsvp_intserv_print(netdissect_options *ndo,
     return (parameter_length+4); /* header length 4 bytes */
 
 trunc:
     return (parameter_length+4); /* header length 4 bytes */
 
 trunc:
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return 0;
 }
 
     return 0;
 }
 
@@ -672,15 +673,15 @@ rsvp_obj_print(netdissect_options *ndo,
         const struct rsvp_obj_frr_t *rsvp_obj_frr;
     } obj_ptr;
 
         const struct rsvp_obj_frr_t *rsvp_obj_frr;
     } obj_ptr;
 
-    u_short rsvp_obj_len,rsvp_obj_ctype,rsvp_obj_class_num,obj_tlen;
-    u_int intserv_serv_tlen;
+    u_short rsvp_obj_len,rsvp_obj_ctype,rsvp_obj_class_num;
+    u_int obj_tlen,intserv_serv_tlen;
     int hexdump;
     u_int processed,padbytes,error_code,error_value,i,sigcheck;
     union {
        float f;
        uint32_t i;
     } bw;
     int hexdump;
     u_int processed,padbytes,error_code,error_value,i,sigcheck;
     union {
        float f;
        uint32_t i;
     } bw;
-    uint8_t namelen;
+    u_int namelen;
 
     u_int action, subchannel;
 
 
     u_int action, subchannel;
 
@@ -689,8 +690,8 @@ rsvp_obj_print(netdissect_options *ndo,
         ND_TCHECK_LEN(tptr, sizeof(struct rsvp_object_header));
 
         rsvp_obj_header = (const struct rsvp_object_header *)tptr;
         ND_TCHECK_LEN(tptr, sizeof(struct rsvp_object_header));
 
         rsvp_obj_header = (const struct rsvp_object_header *)tptr;
-        rsvp_obj_len=EXTRACT_BE_U_2(rsvp_obj_header->length);
-        rsvp_obj_ctype=EXTRACT_U_1(rsvp_obj_header->ctype);
+        rsvp_obj_len=GET_BE_U_2(rsvp_obj_header->length);
+        rsvp_obj_ctype=GET_U_1(rsvp_obj_header->ctype);
 
         if(rsvp_obj_len % 4) {
             ND_PRINT("%sERROR: object header size %u not a multiple of 4", indent, rsvp_obj_len);
 
         if(rsvp_obj_len % 4) {
             ND_PRINT("%sERROR: object header size %u not a multiple of 4", indent, rsvp_obj_len);
@@ -702,7 +703,7 @@ rsvp_obj_print(netdissect_options *ndo,
             return -1;
         }
 
             return -1;
         }
 
-        rsvp_obj_class_num = EXTRACT_U_1(rsvp_obj_header->class_num);
+        rsvp_obj_class_num = GET_U_1(rsvp_obj_header->class_num);
         ND_PRINT("%s%s Object (%u) Flags: [%s",
                indent,
                tok2str(rsvp_obj_values,
         ND_PRINT("%s%s Object (%u) Flags: [%s",
                indent,
                tok2str(rsvp_obj_values,
@@ -730,8 +731,7 @@ rsvp_obj_print(netdissect_options *ndo,
         obj_tlen=rsvp_obj_len-sizeof(struct rsvp_object_header);
 
         /* did we capture enough for fully decoding the object ? */
         obj_tlen=rsvp_obj_len-sizeof(struct rsvp_object_header);
 
         /* did we capture enough for fully decoding the object ? */
-        if (!ND_TTEST_LEN(tptr, rsvp_obj_len))
-            return -1;
+        ND_TCHECK_LEN(tptr, rsvp_obj_len);
         hexdump=FALSE;
 
         switch(rsvp_obj_class_num) {
         hexdump=FALSE;
 
         switch(rsvp_obj_class_num) {
@@ -743,11 +743,11 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  IPv4 DestAddress: %s, Protocol ID: 0x%02x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  IPv4 DestAddress: %s, Protocol ID: 0x%02x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_U_1(obj_tptr + sizeof(nd_ipv4)));
+                       GET_U_1(obj_tptr + sizeof(nd_ipv4)));
                 ND_PRINT("%s  Flags: [0x%02x], DestPort %u",
                        indent,
                 ND_PRINT("%s  Flags: [0x%02x], DestPort %u",
                        indent,
-                       EXTRACT_U_1((obj_tptr + 5)),
-                       EXTRACT_BE_U_2(obj_tptr + 6));
+                       GET_U_1((obj_tptr + 5)),
+                       GET_BE_U_2(obj_tptr + 6));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -757,11 +757,11 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  IPv6 DestAddress: %s, Protocol ID: 0x%02x",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
                 ND_PRINT("%s  IPv6 DestAddress: %s, Protocol ID: 0x%02x",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_U_1(obj_tptr + sizeof(nd_ipv6)));
+                       GET_U_1(obj_tptr + sizeof(nd_ipv6)));
                 ND_PRINT("%s  Flags: [0x%02x], DestPort %u",
                        indent,
                 ND_PRINT("%s  Flags: [0x%02x], DestPort %u",
                        indent,
-                       EXTRACT_U_1((obj_tptr + sizeof(nd_ipv6) + 1)),
-                       EXTRACT_BE_U_2(obj_tptr + sizeof(nd_ipv6) + 2));
+                       GET_U_1((obj_tptr + sizeof(nd_ipv6) + 1)),
+                       GET_BE_U_2(obj_tptr + sizeof(nd_ipv6) + 2));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -772,7 +772,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
                 ND_PRINT("%s  IPv6 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18),
+                       GET_BE_U_2(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;
@@ -783,8 +783,8 @@ rsvp_obj_print(netdissect_options *ndo,
                     return -1;
                 ND_PRINT("%s  IPv6 P2MP LSP ID: 0x%08x, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                        indent,
                     return -1;
                 ND_PRINT("%s  IPv6 P2MP LSP ID: 0x%08x, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                        indent,
-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_2(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;
@@ -795,7 +795,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  IPv4 P2MP LSP ID: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       GET_BE_U_2(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;
@@ -807,7 +807,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  IPv4 Tunnel EndPoint: %s, Tunnel ID: 0x%04x, Extended Tunnel ID: %s",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       GET_BE_U_2(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;
@@ -874,7 +874,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("%s  Label: %u", indent, EXTRACT_BE_U_4(obj_tptr));
+                    ND_PRINT("%s  Label: %u", indent, GET_BE_U_4(obj_tptr));
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
@@ -884,7 +884,7 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT("%s  Generalized Label: %u",
                        indent,
                     return-1;
                 ND_PRINT("%s  Generalized Label: %u",
                        indent,
-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_BE_U_4(obj_tptr));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -893,10 +893,10 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT("%s  Waveband ID: %u%s  Start Label: %u, Stop Label: %u",
                        indent,
                     return-1;
                 ND_PRINT("%s  Waveband ID: %u%s  Start Label: %u, Stop Label: %u",
                        indent,
-                       EXTRACT_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr),
                        indent,
                        indent,
-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       EXTRACT_BE_U_4(obj_tptr + 8));
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_BE_U_4(obj_tptr + 8));
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
@@ -914,8 +914,8 @@ rsvp_obj_print(netdissect_options *ndo,
                        indent,
                        tok2str(rsvp_resstyle_values,
                                "Unknown",
                        indent,
                        tok2str(rsvp_resstyle_values,
                                "Unknown",
-                               EXTRACT_BE_U_3(obj_tptr + 1)),
-                       EXTRACT_U_1(obj_tptr));
+                               GET_BE_U_3(obj_tptr + 1)),
+                       GET_U_1(obj_tptr));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -932,7 +932,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6));
+                       GET_BE_U_2(obj_tptr + 6));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -942,7 +942,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18));
+                       GET_BE_U_2(obj_tptr + 18));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -953,10 +953,10 @@ rsvp_obj_print(netdissect_options *ndo,
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18),
+                       GET_BE_U_2(obj_tptr + 18),
                        indent,
                        ip6addr_string(ndo, obj_tptr+20),
                        indent,
                        ip6addr_string(ndo, obj_tptr+20),
-                       EXTRACT_BE_U_2(obj_tptr + 38));
+                       GET_BE_U_2(obj_tptr + 38));
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
@@ -966,7 +966,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  IPv4 Tunnel Sender Address: %s, LSP-ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6));
+                       GET_BE_U_2(obj_tptr + 6));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -977,10 +977,10 @@ rsvp_obj_print(netdissect_options *ndo,
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       GET_BE_U_2(obj_tptr + 6),
                        indent,
                        ipaddr_string(ndo, obj_tptr+8),
                        indent,
                        ipaddr_string(ndo, obj_tptr+8),
-                       EXTRACT_BE_U_2(obj_tptr + 12));
+                       GET_BE_U_2(obj_tptr + 12));
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
@@ -997,7 +997,7 @@ rsvp_obj_print(netdissect_options *ndo,
                            indent,
                            tok2str(ethertype_values,
                                    "Unknown Protocol (0x%04x)",
                            indent,
                            tok2str(ethertype_values,
                                    "Unknown Protocol (0x%04x)",
-                                   EXTRACT_BE_U_2(obj_tptr + 2)));
+                                   GET_BE_U_2(obj_tptr + 2)));
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
@@ -1009,16 +1009,17 @@ rsvp_obj_print(netdissect_options *ndo,
                        indent,
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
                        indent,
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
-                               EXTRACT_BE_U_2(obj_tptr + 2)));
-                ND_PRINT(",%s merge capability",((EXTRACT_U_1(obj_tptr + 4)) & 0x80) ? "no" : "" );
+                               GET_BE_U_2(obj_tptr + 2)));
+                ND_PRINT(",%s merge capability",
+                         ((GET_U_1(obj_tptr + 4)) & 0x80) ? "no" : "" );
                 ND_PRINT("%s  Minimum VPI/VCI: %u/%u",
                        indent,
                 ND_PRINT("%s  Minimum VPI/VCI: %u/%u",
                        indent,
-                       (EXTRACT_BE_U_2(obj_tptr + 4))&0xfff,
-                       (EXTRACT_BE_U_2(obj_tptr + 6)) & 0xfff);
+                       (GET_BE_U_2(obj_tptr + 4))&0xfff,
+                       (GET_BE_U_2(obj_tptr + 6)) & 0xfff);
                 ND_PRINT("%s  Maximum VPI/VCI: %u/%u",
                        indent,
                 ND_PRINT("%s  Maximum VPI/VCI: %u/%u",
                        indent,
-                       (EXTRACT_BE_U_2(obj_tptr + 8))&0xfff,
-                       (EXTRACT_BE_U_2(obj_tptr + 10)) & 0xfff);
+                       (GET_BE_U_2(obj_tptr + 8))&0xfff,
+                       (GET_BE_U_2(obj_tptr + 10)) & 0xfff);
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
@@ -1029,13 +1030,13 @@ rsvp_obj_print(netdissect_options *ndo,
                        indent,
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
                        indent,
                        tok2str(ethertype_values,
                                "Unknown Protocol (0x%04x)",
-                               EXTRACT_BE_U_2(obj_tptr + 2)));
+                               GET_BE_U_2(obj_tptr + 2)));
                 ND_PRINT("%s  Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI",
                        indent,
                 ND_PRINT("%s  Minimum/Maximum DLCI: %u/%u, %s%s bit DLCI",
                        indent,
-                       (EXTRACT_BE_U_4(obj_tptr + 4))&0x7fffff,
-                       (EXTRACT_BE_U_4(obj_tptr + 8))&0x7fffff,
-                       (((EXTRACT_BE_U_2(obj_tptr + 4)>>7)&3) == 0 ) ? "10" : "",
-                       (((EXTRACT_BE_U_2(obj_tptr + 4) >> 7) & 3) == 2 ) ? "23" : "");
+                       (GET_BE_U_4(obj_tptr + 4))&0x7fffff,
+                       (GET_BE_U_4(obj_tptr + 8))&0x7fffff,
+                       (((GET_BE_U_2(obj_tptr + 4)>>7)&3) == 0 ) ? "10" : "",
+                       (((GET_BE_U_2(obj_tptr + 4) >> 7) & 3) == 2 ) ? "23" : "");
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
                 obj_tlen-=12;
                 obj_tptr+=12;
                 break;
@@ -1046,18 +1047,18 @@ rsvp_obj_print(netdissect_options *ndo,
                        indent,
                        tok2str(gmpls_encoding_values,
                                "Unknown",
                        indent,
                        tok2str(gmpls_encoding_values,
                                "Unknown",
-                               EXTRACT_U_1(obj_tptr)),
-                       EXTRACT_U_1(obj_tptr));
+                               GET_U_1(obj_tptr)),
+                       GET_U_1(obj_tptr));
                 ND_PRINT("%s  Switching Type: %s (%u), Payload ID: %s (0x%04x)",
                        indent,
                        tok2str(gmpls_switch_cap_values,
                                "Unknown",
                 ND_PRINT("%s  Switching Type: %s (%u), Payload ID: %s (0x%04x)",
                        indent,
                        tok2str(gmpls_switch_cap_values,
                                "Unknown",
-                               EXTRACT_U_1((obj_tptr + 1))),
-                       EXTRACT_U_1(obj_tptr + 1),
+                               GET_U_1((obj_tptr + 1))),
+                       GET_U_1(obj_tptr + 1),
                        tok2str(gmpls_payload_values,
                                "Unknown",
                        tok2str(gmpls_payload_values,
                                "Unknown",
-                               EXTRACT_BE_U_2(obj_tptr + 2)),
-                       EXTRACT_BE_U_2(obj_tptr + 2));
+                               GET_BE_U_2(obj_tptr + 2)),
+                       GET_BE_U_2(obj_tptr + 2));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -1074,12 +1075,12 @@ rsvp_obj_print(netdissect_options *ndo,
                    u_char length;
 
                    ND_TCHECK_4(obj_tptr);
                    u_char length;
 
                    ND_TCHECK_4(obj_tptr);
-                   length = EXTRACT_U_1(obj_tptr + 1);
+                   length = GET_U_1(obj_tptr + 1);
                     ND_PRINT("%s  Subobject Type: %s, length %u",
                            indent,
                            tok2str(rsvp_obj_xro_values,
                                    "Unknown %u",
                     ND_PRINT("%s  Subobject Type: %s, length %u",
                            indent,
                            tok2str(rsvp_obj_xro_values,
                                    "Unknown %u",
-                                   RSVP_OBJ_XRO_MASK_SUBOBJ(EXTRACT_U_1(obj_tptr))),
+                                   RSVP_OBJ_XRO_MASK_SUBOBJ(GET_U_1(obj_tptr))),
                            length);
                     if (obj_tlen < length) {
                         ND_PRINT("%s  ERROR: ERO subobject length > object length", indent);
                            length);
                     if (obj_tlen < length) {
                         ND_PRINT("%s  ERROR: ERO subobject length > object length", indent);
@@ -1091,7 +1092,7 @@ rsvp_obj_print(netdissect_options *ndo,
                         break;
                     }
 
                         break;
                     }
 
-                    switch(RSVP_OBJ_XRO_MASK_SUBOBJ(EXTRACT_U_1(obj_tptr))) {
+                    switch(RSVP_OBJ_XRO_MASK_SUBOBJ(GET_U_1(obj_tptr))) {
                    u_char prefix_length;
 
                     case RSVP_OBJ_XRO_IPV4:
                    u_char prefix_length;
 
                     case RSVP_OBJ_XRO_IPV4:
@@ -1100,19 +1101,19 @@ rsvp_obj_print(netdissect_options *ndo,
                                goto invalid;
                        }
                        ND_TCHECK_8(obj_tptr);
                                goto invalid;
                        }
                        ND_TCHECK_8(obj_tptr);
-                       prefix_length = EXTRACT_U_1(obj_tptr + 6);
+                       prefix_length = GET_U_1(obj_tptr + 6);
                        if (prefix_length != 32) {
                                ND_PRINT(" ERROR: Prefix length %u != 32",
                                          prefix_length);
                                goto invalid;
                        }
                         ND_PRINT(", %s, %s/%u, Flags: [%s]",
                        if (prefix_length != 32) {
                                ND_PRINT(" ERROR: Prefix length %u != 32",
                                          prefix_length);
                                goto invalid;
                        }
                         ND_PRINT(", %s, %s/%u, Flags: [%s]",
-                               RSVP_OBJ_XRO_MASK_LOOSE(EXTRACT_U_1(obj_tptr)) ? "Loose" : "Strict",
+                               RSVP_OBJ_XRO_MASK_LOOSE(GET_U_1(obj_tptr)) ? "Loose" : "Strict",
                                ipaddr_string(ndo, obj_tptr+2),
                                ipaddr_string(ndo, obj_tptr+2),
-                               EXTRACT_U_1((obj_tptr + 6)),
+                               GET_U_1((obj_tptr + 6)),
                                bittok2str(rsvp_obj_rro_flag_values,
                                    "none",
                                bittok2str(rsvp_obj_rro_flag_values,
                                    "none",
-                                   EXTRACT_U_1((obj_tptr + 7)))); /* rfc3209 says that this field is rsvd. */
+                                   GET_U_1((obj_tptr + 7)))); /* rfc3209 says that this field is rsvd. */
                     break;
                     case RSVP_OBJ_XRO_LABEL:
                        if (length != 8) {
                     break;
                     case RSVP_OBJ_XRO_LABEL:
                        if (length != 8) {
@@ -1123,13 +1124,13 @@ rsvp_obj_print(netdissect_options *ndo,
                         ND_PRINT(", Flags: [%s] (%#x), Class-Type: %s (%u), %u",
                                bittok2str(rsvp_obj_rro_label_flag_values,
                                    "none",
                         ND_PRINT(", Flags: [%s] (%#x), Class-Type: %s (%u), %u",
                                bittok2str(rsvp_obj_rro_label_flag_values,
                                    "none",
-                                   EXTRACT_U_1((obj_tptr + 2))),
-                               EXTRACT_U_1(obj_tptr + 2),
+                                   GET_U_1((obj_tptr + 2))),
+                               GET_U_1(obj_tptr + 2),
                                tok2str(rsvp_ctype_values,
                                        "Unknown",
                                tok2str(rsvp_ctype_values,
                                        "Unknown",
-                                       EXTRACT_U_1((obj_tptr + 3)) + (256 * RSVP_OBJ_RRO)),
-                               EXTRACT_U_1((obj_tptr + 3)),
-                               EXTRACT_BE_U_4(obj_tptr + 4));
+                                       GET_U_1((obj_tptr + 3)) + (256 * RSVP_OBJ_RRO)),
+                               GET_U_1((obj_tptr + 3)),
+                               GET_BE_U_4(obj_tptr + 4));
                     }
                     obj_tlen-=length;
                     obj_tptr+=length;
                     }
                     obj_tlen-=length;
                     obj_tptr+=length;
@@ -1148,8 +1149,8 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT("%s  Source Instance: 0x%08x, Destination Instance: 0x%08x",
                        indent,
                     return-1;
                 ND_PRINT("%s  Source Instance: 0x%08x, Destination Instance: 0x%08x",
                        indent,
-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr + 4));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr + 4));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -1165,8 +1166,8 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT("%s  Restart  Time: %ums, Recovery Time: %ums",
                        indent,
                     return-1;
                 ND_PRINT("%s  Restart  Time: %ums, Recovery Time: %ums",
                        indent,
-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr + 4));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr + 4));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -1180,20 +1181,20 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 4)
                     return-1;
             case RSVP_CTYPE_TUNNEL_IPV4:
                 if (obj_tlen < 4)
                     return-1;
-                namelen = EXTRACT_U_1(obj_tptr + 3);
+                namelen = GET_U_1(obj_tptr + 3);
                 if (obj_tlen < 4+namelen)
                     return-1;
                 ND_PRINT("%s  Session Name: ", indent);
                 for (i = 0; i < namelen; i++)
                 if (obj_tlen < 4+namelen)
                     return-1;
                 ND_PRINT("%s  Session Name: ", indent);
                 for (i = 0; i < namelen; i++)
-                    safeputchar(ndo, EXTRACT_U_1(obj_tptr + 4 + i));
+                    fn_print_char(ndo, GET_U_1(obj_tptr + 4 + i));
                 ND_PRINT("%s  Setup Priority: %u, Holding Priority: %u, Flags: [%s] (%#x)",
                        indent,
                 ND_PRINT("%s  Setup Priority: %u, Holding Priority: %u, Flags: [%s] (%#x)",
                        indent,
-                       EXTRACT_U_1(obj_tptr),
-                       EXTRACT_U_1(obj_tptr + 1),
+                       GET_U_1(obj_tptr),
+                       GET_U_1(obj_tptr + 1),
                        bittok2str(rsvp_session_attribute_flag_values,
                                   "none",
                        bittok2str(rsvp_session_attribute_flag_values,
                                   "none",
-                                  EXTRACT_U_1((obj_tptr + 2))),
-                       EXTRACT_U_1(obj_tptr + 2));
+                                  GET_U_1((obj_tptr + 2))),
+                       GET_U_1(obj_tptr + 2));
                 obj_tlen-=4+namelen;
                 obj_tptr+=4+namelen;
                 break;
                 obj_tlen-=4+namelen;
                 obj_tptr+=4+namelen;
                 break;
@@ -1225,9 +1226,9 @@ rsvp_obj_print(netdissect_options *ndo,
                      */
                     if (total_subobj_len < 4)
                         goto invalid;
                      */
                     if (total_subobj_len < 4)
                         goto invalid;
-                    subobj_len  = EXTRACT_BE_U_2(obj_tptr);
-                    subobj_type = (EXTRACT_BE_U_2(obj_tptr + 2))>>8;
-                    af = (EXTRACT_BE_U_2(obj_tptr + 2))&0x00FF;
+                    subobj_len  = GET_BE_U_2(obj_tptr);
+                    subobj_type = (GET_BE_U_2(obj_tptr + 2))>>8;
+                    af = (GET_BE_U_2(obj_tptr + 2))&0x00FF;
 
                     ND_PRINT("%s  Subobject Type: %s (%u), AF: %s (%u), length: %u",
                            indent,
 
                     ND_PRINT("%s  Subobject Type: %s (%u), AF: %s (%u), length: %u",
                            indent,
@@ -1306,10 +1307,10 @@ rsvp_obj_print(netdissect_options *ndo,
 
                         ND_PRINT("%s    U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
                                indent,
 
                         ND_PRINT("%s    U-bit: %x, Label type: %u, Logical port id: %u, Label: %u",
                                indent,
-                               ((EXTRACT_BE_U_4(obj_tptr + 4))>>31),
-                               ((EXTRACT_BE_U_4(obj_tptr + 4))&0xFF),
-                               EXTRACT_BE_U_4(obj_tptr + 8),
-                               EXTRACT_BE_U_4(obj_tptr + 12));
+                               ((GET_BE_U_4(obj_tptr + 4))>>31),
+                               ((GET_BE_U_4(obj_tptr + 4))&0xFF),
+                               GET_BE_U_4(obj_tptr + 8),
+                               GET_BE_U_4(obj_tptr + 12));
                         break;
 
                     case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:
                         break;
 
                     case RSVP_GEN_UNI_SUBOBJ_SERVICE_LEVEL:
@@ -1318,7 +1319,7 @@ rsvp_obj_print(netdissect_options *ndo,
                         }
 
                         ND_PRINT("%s    Service level: %u",
                         }
 
                         ND_PRINT("%s    Service level: %u",
-                               indent, (EXTRACT_BE_U_4(obj_tptr + 4)) >> 24);
+                               indent, (GET_BE_U_4(obj_tptr + 4)) >> 24);
                         break;
 
                     default:
                         break;
 
                     default:
@@ -1345,7 +1346,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr + 4));
+                       GET_BE_U_4(obj_tptr + 4));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 if (obj_tlen)
                 obj_tlen-=8;
                 obj_tptr+=8;
                 if (obj_tlen)
@@ -1358,7 +1359,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Previous/Next Interface: %s, Logical Interface Handle: 0x%08x",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr + 16));
+                       GET_BE_U_4(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 */
@@ -1375,7 +1376,7 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT("%s  Refresh Period: %ums",
                        indent,
                     return-1;
                 ND_PRINT("%s  Refresh Period: %ums",
                        indent,
-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_BE_U_4(obj_tptr));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -1394,18 +1395,18 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT("%s  Msg-Version: %u, length: %u",
                        indent,
                     return-1;
                 ND_PRINT("%s  Msg-Version: %u, length: %u",
                        indent,
-                       (EXTRACT_U_1(obj_tptr) & 0xf0) >> 4,
-                       EXTRACT_BE_U_2(obj_tptr + 2) << 2);
+                       (GET_U_1(obj_tptr) & 0xf0) >> 4,
+                       GET_BE_U_2(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_BE_U_2(obj_tptr + 2)<<2;
+                    intserv_serv_tlen=GET_BE_U_2(obj_tptr + 2)<<2;
                     ND_PRINT("%s  Service Type: %s (%u), break bit %sset, Service length: %u",
                            indent,
                     ND_PRINT("%s  Service Type: %s (%u), break bit %sset, Service length: %u",
                            indent,
-                           tok2str(rsvp_intserv_service_type_values,"unknown",EXTRACT_U_1((obj_tptr))),
-                           EXTRACT_U_1(obj_tptr),
-                           (EXTRACT_U_1(obj_tptr + 1)&0x80) ? "" : "not ",
+                           tok2str(rsvp_intserv_service_type_values,"unknown",GET_U_1((obj_tptr))),
+                           GET_U_1(obj_tptr),
+                           (GET_U_1(obj_tptr + 1)&0x80) ? "" : "not ",
                            intserv_serv_tlen);
 
                     obj_tptr+=4; /* get to the start of the parameter list */
                            intserv_serv_tlen);
 
                     obj_tptr+=4; /* get to the start of the parameter list */
@@ -1434,7 +1435,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6));
+                       GET_BE_U_2(obj_tptr + 6));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -1444,7 +1445,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Source Address: %s, Source Port: %u",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18));
+                       GET_BE_U_2(obj_tptr + 18));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -1454,7 +1455,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  Source Address: %s, Flow Label: %u",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Source Address: %s, Flow Label: %u",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_3(obj_tptr + 17));
+                       GET_BE_U_3(obj_tptr + 17));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -1464,7 +1465,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  Source Address: %s, LSP-ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Source Address: %s, LSP-ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18));
+                       GET_BE_U_2(obj_tptr + 18));
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
                 obj_tlen-=20;
                 obj_tptr+=20;
                 break;
@@ -1475,10 +1476,10 @@ rsvp_obj_print(netdissect_options *ndo,
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 18),
+                       GET_BE_U_2(obj_tptr + 18),
                        indent,
                        ip6addr_string(ndo, obj_tptr+20),
                        indent,
                        ip6addr_string(ndo, obj_tptr+20),
-                       EXTRACT_BE_U_2(obj_tptr + 38));
+                       GET_BE_U_2(obj_tptr + 38));
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
                 obj_tlen-=40;
                 obj_tptr+=40;
                 break;
@@ -1488,7 +1489,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 ND_PRINT("%s  Source Address: %s, LSP-ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Source Address: %s, LSP-ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6));
+                       GET_BE_U_2(obj_tptr + 6));
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
                 obj_tlen-=8;
                 obj_tptr+=8;
                 break;
@@ -1499,10 +1500,10 @@ rsvp_obj_print(netdissect_options *ndo,
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                        "%s  Sub-Group Originator ID: %s, Sub-Group ID: 0x%04x",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 6),
+                       GET_BE_U_2(obj_tptr + 6),
                        indent,
                        ipaddr_string(ndo, obj_tptr+8),
                        indent,
                        ipaddr_string(ndo, obj_tptr+8),
-                       EXTRACT_BE_U_2(obj_tptr + 12));
+                       GET_BE_U_2(obj_tptr + 12));
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
@@ -1519,7 +1520,7 @@ 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_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
+                bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
                 ND_PRINT("%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
                        indent,
                        obj_ptr.rsvp_obj_frr->setup_prio,
                 ND_PRINT("%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
                        indent,
                        obj_ptr.rsvp_obj_frr->setup_prio,
@@ -1528,9 +1529,9 @@ rsvp_obj_print(netdissect_options *ndo,
                        bw.f * 8 / 1000000);
                 ND_PRINT("%s  Include-any: 0x%08x, Exclude-any: 0x%08x, Include-all: 0x%08x",
                        indent,
                        bw.f * 8 / 1000000);
                 ND_PRINT("%s  Include-any: 0x%08x, Exclude-any: 0x%08x, Include-all: 0x%08x",
                        indent,
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_all));
+                       GET_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any),
+                       GET_BE_U_4(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;
@@ -1538,7 +1539,7 @@ 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_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
+                bw.i = GET_BE_U_4(obj_ptr.rsvp_obj_frr->bandwidth);
                 ND_PRINT("%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
                        indent,
                        obj_ptr.rsvp_obj_frr->setup_prio,
                 ND_PRINT("%s  Setup Priority: %u, Holding Priority: %u, Hop-limit: %u, Bandwidth: %.10g Mbps",
                        indent,
                        obj_ptr.rsvp_obj_frr->setup_prio,
@@ -1547,8 +1548,8 @@ rsvp_obj_print(netdissect_options *ndo,
                        bw.f * 8 / 1000000);
                 ND_PRINT("%s  Include Colors: 0x%08x, Exclude Colors: 0x%08x",
                        indent,
                        bw.f * 8 / 1000000);
                 ND_PRINT("%s  Include Colors: 0x%08x, Exclude Colors: 0x%08x",
                        indent,
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any));
+                       GET_BE_U_4(obj_ptr.rsvp_obj_frr->include_any),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_frr->exclude_any));
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
                 obj_tlen-=16;
                 obj_tptr+=16;
                 break;
@@ -1581,7 +1582,7 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_1:
                 ND_PRINT("%s  CT: %u",
                        indent,
             case RSVP_CTYPE_1:
                 ND_PRINT("%s  CT: %u",
                        indent,
-                       EXTRACT_BE_U_4(obj_tptr) & 0x7);
+                       GET_BE_U_4(obj_tptr) & 0x7);
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -1596,12 +1597,12 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;
             case RSVP_CTYPE_IPV4:
                 if (obj_tlen < 8)
                     return-1;
-                error_code=EXTRACT_U_1(obj_tptr + 5);
-                error_value=EXTRACT_BE_U_2(obj_tptr + 6);
+                error_code=GET_U_1(obj_tptr + 5);
+                error_value=GET_BE_U_2(obj_tptr + 6);
                 ND_PRINT("%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
                        indent,
                        ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_U_1(obj_tptr + 4),
+                       GET_U_1(obj_tptr + 4),
                        indent,
                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        error_code);
                        indent,
                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        error_code);
@@ -1628,12 +1629,12 @@ rsvp_obj_print(netdissect_options *ndo,
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;
             case RSVP_CTYPE_IPV6:
                 if (obj_tlen < 20)
                     return-1;
-                error_code=EXTRACT_U_1(obj_tptr + 17);
-                error_value=EXTRACT_BE_U_2(obj_tptr + 18);
+                error_code=GET_U_1(obj_tptr + 17);
+                error_value=GET_BE_U_2(obj_tptr + 18);
                 ND_PRINT("%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
                 ND_PRINT("%s  Error Node Address: %s, Flags: [0x%02x]%s  Error Code: %s (%u)",
                        indent,
                        ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_U_1(obj_tptr + 16),
+                       GET_U_1(obj_tptr + 16),
                        indent,
                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        error_code);
                        indent,
                        tok2str(rsvp_obj_error_code_values,"unknown",error_code),
                        error_code);
@@ -1660,10 +1661,10 @@ 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_BE_U_2(obj_tptr + 2);
+                padbytes = GET_BE_U_2(obj_tptr + 2);
                 ND_PRINT("%s  TLV count: %u, padding bytes: %u",
                        indent,
                 ND_PRINT("%s  TLV count: %u, padding bytes: %u",
                        indent,
-                       EXTRACT_BE_U_2(obj_tptr),
+                       GET_BE_U_2(obj_tptr),
                        padbytes);
                 obj_tlen-=4;
                 obj_tptr+=4;
                        padbytes);
                 obj_tlen-=4;
                 obj_tptr+=4;
@@ -1671,17 +1672,17 @@ rsvp_obj_print(netdissect_options *ndo,
                 while(obj_tlen >= 2 + padbytes) {
                     ND_PRINT("%s    %s TLV (0x%02x), length: %u", /* length includes header */
                            indent,
                 while(obj_tlen >= 2 + padbytes) {
                     ND_PRINT("%s    %s TLV (0x%02x), length: %u", /* length includes header */
                            indent,
-                           tok2str(rsvp_obj_prop_tlv_values,"unknown",EXTRACT_U_1(obj_tptr)),
-                           EXTRACT_U_1(obj_tptr),
-                           EXTRACT_U_1(obj_tptr + 1));
-                    if (obj_tlen < EXTRACT_U_1(obj_tptr + 1))
+                           tok2str(rsvp_obj_prop_tlv_values,"unknown",GET_U_1(obj_tptr)),
+                           GET_U_1(obj_tptr),
+                           GET_U_1(obj_tptr + 1));
+                    if (obj_tlen < GET_U_1(obj_tptr + 1))
                         return-1;
                         return-1;
-                    if (EXTRACT_U_1(obj_tptr + 1) < 2)
+                    if (GET_U_1(obj_tptr + 1) < 2)
                         return -1;
                     print_unknown_data(ndo, obj_tptr + 2, "\n\t\t",
                         return -1;
                     print_unknown_data(ndo, obj_tptr + 2, "\n\t\t",
-                                       EXTRACT_U_1(obj_tptr + 1) - 2);
-                    obj_tlen-=EXTRACT_U_1(obj_tptr + 1);
-                    obj_tptr+=EXTRACT_U_1(obj_tptr + 1);
+                                       GET_U_1(obj_tptr + 1) - 2);
+                    obj_tlen-=GET_U_1(obj_tptr + 1);
+                    obj_tptr+=GET_U_1(obj_tptr + 1);
                 }
                 break;
             default:
                 }
                 break;
             default:
@@ -1699,16 +1700,16 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT("%s  Flags [0x%02x], epoch: %u",
                        indent,
                     return-1;
                 ND_PRINT("%s  Flags [0x%02x], epoch: %u",
                        indent,
-                       EXTRACT_U_1(obj_tptr),
-                       EXTRACT_BE_U_3(obj_tptr + 1));
+                       GET_U_1(obj_tptr),
+                       GET_BE_U_3(obj_tptr + 1));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 /* loop through as long there are no messages left */
                 while(obj_tlen >= 4) {
                     ND_PRINT("%s    Message-ID 0x%08x (%u)",
                            indent,
                 obj_tlen-=4;
                 obj_tptr+=4;
                 /* loop through as long there are no messages left */
                 while(obj_tlen >= 4) {
                     ND_PRINT("%s    Message-ID 0x%08x (%u)",
                            indent,
-                           EXTRACT_BE_U_4(obj_tptr),
-                           EXTRACT_BE_U_4(obj_tptr));
+                           GET_BE_U_4(obj_tptr),
+                           GET_BE_U_4(obj_tptr));
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
                     obj_tlen-=4;
                     obj_tptr+=4;
                 }
@@ -1726,19 +1727,19 @@ rsvp_obj_print(netdissect_options *ndo,
                 obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr;
                 ND_PRINT("%s  Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]",
                        indent,
                 obj_ptr.rsvp_obj_integrity = (const struct rsvp_obj_integrity_t *)obj_tptr;
                 ND_PRINT("%s  Key-ID 0x%04x%08x, Sequence 0x%08x%08x, Flags [%s]",
                        indent,
-                       EXTRACT_BE_U_2(obj_ptr.rsvp_obj_integrity->key_id),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->key_id + 2),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence + 4),
+                       GET_BE_U_2(obj_ptr.rsvp_obj_integrity->key_id),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->key_id + 2),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->sequence + 4),
                        bittok2str(rsvp_obj_integrity_flag_values,
                                   "none",
                                   obj_ptr.rsvp_obj_integrity->flags));
                 ND_PRINT("%s  MD5-sum 0x%08x%08x%08x%08x ",
                        indent,
                        bittok2str(rsvp_obj_integrity_flag_values,
                                   "none",
                                   obj_ptr.rsvp_obj_integrity->flags));
                 ND_PRINT("%s  MD5-sum 0x%08x%08x%08x%08x ",
                        indent,
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 4),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 8),
-                       EXTRACT_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 12));
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->digest),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 4),
+                       GET_BE_U_4(obj_ptr.rsvp_obj_integrity->digest + 8),
+                       GET_BE_U_4(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,
@@ -1761,7 +1762,7 @@ rsvp_obj_print(netdissect_options *ndo,
                     return-1;
                 ND_PRINT("%s  Flags [%s]", indent,
                        bittok2str(rsvp_obj_admin_status_flag_values, "none",
                     return-1;
                 ND_PRINT("%s  Flags [%s]", indent,
                        bittok2str(rsvp_obj_admin_status_flag_values, "none",
-                                  EXTRACT_BE_U_4(obj_tptr)));
+                                  GET_BE_U_4(obj_tptr)));
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
                 obj_tlen-=4;
                 obj_tptr+=4;
                 break;
@@ -1775,11 +1776,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_BE_U_2(obj_tptr)>>8);
+                action = (GET_BE_U_2(obj_tptr)>>8);
 
                 ND_PRINT("%s  Action: %s (%u), Label type: %u", indent,
                        tok2str(rsvp_obj_label_set_action_values, "Unknown", action),
 
                 ND_PRINT("%s  Action: %s (%u), Label type: %u", indent,
                        tok2str(rsvp_obj_label_set_action_values, "Unknown", action),
-                       action, ((EXTRACT_BE_U_4(obj_tptr) & 0x7F)));
+                       action, (GET_BE_U_4(obj_tptr) & 0x7F));
 
                 switch (action) {
                 case LABEL_SET_INCLUSIVE_RANGE:
 
                 switch (action) {
                 case LABEL_SET_INCLUSIVE_RANGE:
@@ -1789,8 +1790,8 @@ rsvp_obj_print(netdissect_options *ndo,
                    if (obj_tlen < 12)
                        return -1;
                    ND_PRINT("%s  Start range: %u, End range: %u", indent,
                    if (obj_tlen < 12)
                        return -1;
                    ND_PRINT("%s  Start range: %u, End range: %u", indent,
-                           EXTRACT_BE_U_4(obj_tptr + 4),
-                           EXTRACT_BE_U_4(obj_tptr + 8));
+                           GET_BE_U_4(obj_tptr + 4),
+                           GET_BE_U_4(obj_tptr + 8));
                    obj_tlen-=12;
                    obj_tptr+=12;
                     break;
                    obj_tlen-=12;
                    obj_tptr+=12;
                     break;
@@ -1801,7 +1802,7 @@ rsvp_obj_print(netdissect_options *ndo,
                     subchannel = 1;
                     while(obj_tlen >= 4 ) {
                         ND_PRINT("%s  Subchannel #%u: %u", indent, subchannel,
                     subchannel = 1;
                     while(obj_tlen >= 4 ) {
                         ND_PRINT("%s  Subchannel #%u: %u", indent, subchannel,
-                               EXTRACT_BE_U_4(obj_tptr));
+                               GET_BE_U_4(obj_tptr));
                         obj_tptr+=4;
                         obj_tlen-=4;
                         subchannel++;
                         obj_tptr+=4;
                         obj_tlen-=4;
                         subchannel++;
@@ -1863,11 +1864,10 @@ rsvp_obj_print(netdissect_options *ndo,
     }
     return 0;
 invalid:
     }
     return 0;
 invalid:
-    ND_PRINT("%s", istr);
+    nd_print_invalid(ndo);
     return -1;
 trunc:
     return -1;
 trunc:
-    ND_PRINT("\n\t\t");
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
     return -1;
 }
 
     return -1;
 }
 
@@ -1885,7 +1885,7 @@ rsvp_print(netdissect_options *ndo,
 
     rsvp_com_header = (const struct rsvp_common_header *)pptr;
     ND_TCHECK_SIZE(rsvp_com_header);
 
     rsvp_com_header = (const struct rsvp_common_header *)pptr;
     ND_TCHECK_SIZE(rsvp_com_header);
-    version_flags = EXTRACT_U_1(rsvp_com_header->version_flags);
+    version_flags = GET_U_1(rsvp_com_header->version_flags);
 
     /*
      * Sanity checking of the header.
 
     /*
      * Sanity checking of the header.
@@ -1896,7 +1896,7 @@ rsvp_print(netdissect_options *ndo,
        return;
     }
 
        return;
     }
 
-    msg_type = EXTRACT_U_1(rsvp_com_header->msg_type);
+    msg_type = GET_U_1(rsvp_com_header->msg_type);
 
     /* in non-verbose mode just lets print the basic Message Type*/
     if (ndo->ndo_vflag < 1) {
 
     /* in non-verbose mode just lets print the basic Message Type*/
     if (ndo->ndo_vflag < 1) {
@@ -1909,7 +1909,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_BE_U_2(rsvp_com_header->length);
+    plen = tlen = GET_BE_U_2(rsvp_com_header->length);
 
     ND_PRINT("\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
            RSVP_EXTRACT_VERSION(version_flags),
 
     ND_PRINT("\n\tRSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
            RSVP_EXTRACT_VERSION(version_flags),
@@ -1917,8 +1917,8 @@ rsvp_print(netdissect_options *ndo,
            msg_type,
            bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(version_flags)),
            tlen,
            msg_type,
            bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(version_flags)),
            tlen,
-           EXTRACT_U_1(rsvp_com_header->ttl),
-           EXTRACT_BE_U_2(rsvp_com_header->checksum));
+           GET_U_1(rsvp_com_header->ttl),
+           GET_BE_U_2(rsvp_com_header->checksum));
 
     if (tlen < sizeof(struct rsvp_common_header)) {
         ND_PRINT("ERROR: common header too short %u < %lu", tlen,
 
     if (tlen < sizeof(struct rsvp_common_header)) {
         ND_PRINT("ERROR: common header too short %u < %lu", tlen,
@@ -1945,7 +1945,7 @@ rsvp_print(netdissect_options *ndo,
 
             rsvp_com_header = (const struct rsvp_common_header *)subpptr;
             ND_TCHECK_SIZE(rsvp_com_header);
 
             rsvp_com_header = (const struct rsvp_common_header *)subpptr;
             ND_TCHECK_SIZE(rsvp_com_header);
-            version_flags = EXTRACT_U_1(rsvp_com_header->version_flags);
+            version_flags = GET_U_1(rsvp_com_header->version_flags);
 
             /*
              * Sanity checking of the header.
 
             /*
              * Sanity checking of the header.
@@ -1956,17 +1956,17 @@ rsvp_print(netdissect_options *ndo,
                 return;
             }
 
                 return;
             }
 
-            subplen = subtlen = EXTRACT_BE_U_2(rsvp_com_header->length);
+            subplen = subtlen = GET_BE_U_2(rsvp_com_header->length);
 
 
-            msg_type = EXTRACT_U_1(rsvp_com_header->msg_type);
+            msg_type = GET_U_1(rsvp_com_header->msg_type);
             ND_PRINT("\n\t  RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
                    RSVP_EXTRACT_VERSION(version_flags),
                    tok2str(rsvp_msg_type_values, "unknown, type: %u",msg_type),
                    msg_type,
                    bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(version_flags)),
                    subtlen,
             ND_PRINT("\n\t  RSVPv%u %s Message (%u), Flags: [%s], length: %u, ttl: %u, checksum: 0x%04x",
                    RSVP_EXTRACT_VERSION(version_flags),
                    tok2str(rsvp_msg_type_values, "unknown, type: %u",msg_type),
                    msg_type,
                    bittok2str(rsvp_header_flag_values,"none",RSVP_EXTRACT_FLAGS(version_flags)),
                    subtlen,
-                   EXTRACT_U_1(rsvp_com_header->ttl),
-                   EXTRACT_BE_U_2(rsvp_com_header->checksum));
+                   GET_U_1(rsvp_com_header->ttl),
+                   GET_BE_U_2(rsvp_com_header->checksum));
 
             if (subtlen < sizeof(struct rsvp_common_header)) {
                 ND_PRINT("ERROR: common header too short %u < %lu", subtlen,
 
             if (subtlen < sizeof(struct rsvp_common_header)) {
                 ND_PRINT("ERROR: common header too short %u < %lu", subtlen,
@@ -2020,6 +2020,5 @@ rsvp_print(netdissect_options *ndo,
 
     return;
 trunc:
 
     return;
 trunc:
-    ND_PRINT("\n\t\t");
-    ND_PRINT("%s", tstr);
+    nd_print_trunc(ndo);
 }
 }
[mirror] the TCPdump network dissector