the failed/passed count was not kept in the right place

[tcpdump] / print-babel.c

diff --git a/print-babel.c b/print-babel.c
index 1549432a1d20e26e01f76fbbc4451e7b9dae3061..5f1d90f06f57a5dd4021ce8b4d24164d1e6df35e 100644 (file)
--- a/print-babel.c
+++ b/print-babel.c
@@ -29,10 +29,10 @@
 /* \summary: Babel Routing Protocol printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Babel Routing Protocol printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -41,7 +41,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 

-static const char tstr[] = "[|babel]";

 
 static void babel_print_v2(netdissect_options *, const u_char *cp, u_int length);
 
 
 static void babel_print_v2(netdissect_options *, const u_char *cp, u_int length);
 


@@ -49,18 +48,19 @@ void
 babel_print(netdissect_options *ndo,
             const u_char *cp, u_int length)
 {
 babel_print(netdissect_options *ndo,
             const u_char *cp, u_int length)
 {

+    ndo->ndo_protocol = "babel";

     ND_PRINT("babel");
 
     ND_TCHECK_4(cp);
 
     ND_PRINT("babel");
 
     ND_TCHECK_4(cp);
 

-    if(EXTRACT_U_1(cp) != 42) {
+    if(GET_U_1(cp) != 42) {

         ND_PRINT(" invalid header");
         return;
     } else {
         ND_PRINT(" invalid header");
         return;
     } else {

-        ND_PRINT(" %d", EXTRACT_U_1(cp + 1));
+        ND_PRINT(" %u", GET_U_1(cp + 1));

     }
 
     }
 

-    switch(EXTRACT_U_1(cp + 1)) {
+    switch(GET_U_1(cp + 1)) {

     case 2:
         babel_print_v2(ndo, cp, length);
         break;
     case 2:
         babel_print_v2(ndo, cp, length);
         break;


@@ -72,7 +72,7 @@ babel_print(netdissect_options *ndo,
     return;
 
  trunc:
     return;
 
  trunc:

-    ND_PRINT(" %s", tstr);
+    nd_print_trunc(ndo);

     return;
 }
 
     return;
 }
 


@@ -86,13 +86,13 @@ babel_print(netdissect_options *ndo,
 #define MESSAGE_ROUTER_ID 6
 #define MESSAGE_NH 7
 #define MESSAGE_UPDATE 8
 #define MESSAGE_ROUTER_ID 6
 #define MESSAGE_NH 7
 #define MESSAGE_UPDATE 8

-#define MESSAGE_REQUEST 9
-#define MESSAGE_MH_REQUEST 10
+#define MESSAGE_ROUTE_REQUEST 9
+#define MESSAGE_SEQNO_REQUEST 10

 #define MESSAGE_TSPC 11
 #define MESSAGE_HMAC 12
 #define MESSAGE_TSPC 11
 #define MESSAGE_HMAC 12

-#define MESSAGE_UPDATE_SRC_SPECIFIC 13
-#define MESSAGE_REQUEST_SRC_SPECIFIC 14
-#define MESSAGE_MH_REQUEST_SRC_SPECIFIC 15
+#define MESSAGE_UPDATE_SRC_SPECIFIC 13 /* last appearance in draft-boutier-babel-source-specific-01 */
+#define MESSAGE_REQUEST_SRC_SPECIFIC 14 /* idem */
+#define MESSAGE_MH_REQUEST_SRC_SPECIFIC 15 /* idem */

 
 /* sub-TLVs */
 #define MESSAGE_SUB_PAD1 0
 
 /* sub-TLVs */
 #define MESSAGE_SUB_PAD1 0


@@ -108,13 +108,13 @@ static const struct tok diversity_str[] = {
 };
 
 static const char *
 };
 
 static const char *

-format_id(const u_char *id)
+format_id(netdissect_options *ndo, const u_char *id)

 {
     static char buf[25];
     snprintf(buf, 25, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
 {
     static char buf[25];
     snprintf(buf, 25, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",

-             EXTRACT_U_1(id), EXTRACT_U_1(id + 1), EXTRACT_U_1(id + 2),
-             EXTRACT_U_1(id + 3), EXTRACT_U_1(id + 4), EXTRACT_U_1(id + 5),
-             EXTRACT_U_1(id + 6), EXTRACT_U_1(id + 7));
+             GET_U_1(id), GET_U_1(id + 1), GET_U_1(id + 2),
+             GET_U_1(id + 3), GET_U_1(id + 4), GET_U_1(id + 5),
+             GET_U_1(id + 6), GET_U_1(id + 7));

     buf[24] = '\0';
     return buf;
 }
     buf[24] = '\0';
     return buf;
 }


@@ -251,7 +251,7 @@ network_address(int ae, const unsigned char *a, unsigned int len,
  * o Type 1 stands for PadN sub-TLV with the same encoding as the PadN TLV.
  * o Type 2 stands for Diversity sub-TLV, which propagates diversity routing
  *   data. Its body is a variable-length sequence of 8-bit unsigned integers,
  * o Type 1 stands for PadN sub-TLV with the same encoding as the PadN TLV.
  * o Type 2 stands for Diversity sub-TLV, which propagates diversity routing
  *   data. Its body is a variable-length sequence of 8-bit unsigned integers,

- *   each representing per-hop number of interferring radio channel for the
+ *   each representing per-hop number of interfering radio channel for the

  *   prefix. Channel 0 is invalid and must not be used in the sub-TLV, channel
  *   255 interferes with any other channel.
  * o Type 3 stands for Timestamp sub-TLV, used to compute RTT between
  *   prefix. Channel 0 is invalid and must not be used in the sub-TLV, channel
  *   255 interferes with any other channel.
  * o Type 3 stands for Timestamp sub-TLV, used to compute RTT between


@@ -276,7 +276,7 @@ subtlvs_print(netdissect_options *ndo,
     uint32_t t1, t2;
 
     while (cp < ep) {
     uint32_t t1, t2;
 
     while (cp < ep) {

-        subtype = EXTRACT_U_1(cp);
+        subtype = GET_U_1(cp);

         cp++;
         if(subtype == MESSAGE_SUB_PAD1) {
             ND_PRINT(" sub-pad1");
         cp++;
         if(subtype == MESSAGE_SUB_PAD1) {
             ND_PRINT(" sub-pad1");


@@ -284,7 +284,7 @@ subtlvs_print(netdissect_options *ndo,
         }
         if(cp == ep)
             goto invalid;
         }
         if(cp == ep)
             goto invalid;

-        sublen = EXTRACT_U_1(cp);
+        sublen = GET_U_1(cp);

         cp++;
         if(cp + sublen > ep)
             goto invalid;
         cp++;
         if(cp + sublen > ep)
             goto invalid;


@@ -301,10 +301,12 @@ subtlvs_print(netdissect_options *ndo,
                 break;
             }
             sep = " ";
                 break;
             }
             sep = " ";

-            while(sublen--) {
-                ND_PRINT("%s%s", sep, tok2str(diversity_str, "%u", EXTRACT_U_1(cp)));
+            while (sublen) {
+                ND_PRINT("%s%s", sep,
+                         tok2str(diversity_str, "%u", GET_U_1(cp)));

                 cp++;
                 sep = "-";
                 cp++;
                 sep = "-";

+                sublen--;

             }
             if(tlv_type != MESSAGE_UPDATE &&
                tlv_type != MESSAGE_UPDATE_SRC_SPECIFIC)
             }
             if(tlv_type != MESSAGE_UPDATE &&
                tlv_type != MESSAGE_UPDATE_SRC_SPECIFIC)


@@ -315,14 +317,14 @@ subtlvs_print(netdissect_options *ndo,
             if(tlv_type == MESSAGE_HELLO) {
                 if(sublen < 4)
                     goto invalid;
             if(tlv_type == MESSAGE_HELLO) {
                 if(sublen < 4)
                     goto invalid;

-                t1 = EXTRACT_BE_U_4(cp);
+                t1 = GET_BE_U_4(cp);

                 ND_PRINT(" %s", format_timestamp(t1));
             } else if(tlv_type == MESSAGE_IHU) {
                 if(sublen < 8)
                     goto invalid;
                 ND_PRINT(" %s", format_timestamp(t1));
             } else if(tlv_type == MESSAGE_IHU) {
                 if(sublen < 8)
                     goto invalid;

-                t1 = EXTRACT_BE_U_4(cp);
+                t1 = GET_BE_U_4(cp);

                 ND_PRINT(" %s", format_timestamp(t1));
                 ND_PRINT(" %s", format_timestamp(t1));

-                t2 = EXTRACT_BE_U_4(cp + 4);
+                t2 = GET_BE_U_4(cp + 4);

                 ND_PRINT("|%s", format_timestamp(t2));
             } else
                 ND_PRINT(" (bogus)");
                 ND_PRINT("|%s", format_timestamp(t2));
             } else
                 ND_PRINT(" (bogus)");


@@ -336,7 +338,7 @@ subtlvs_print(netdissect_options *ndo,
     return;
 
  invalid:
     return;
 
  invalid:

-    ND_PRINT("%s", istr);
+    nd_print_invalid(ndo);

 }
 
 #define ICHECK(i, l) \
 }
 
 #define ICHECK(i, l) \


@@ -355,19 +357,20 @@ babel_print_v2(netdissect_options *ndo,
     ND_TCHECK_4(cp);
     if (length < 4)
         goto invalid;
     ND_TCHECK_4(cp);
     if (length < 4)
         goto invalid;

-    bodylen = EXTRACT_BE_U_2(cp + 2);
+    bodylen = GET_BE_U_2(cp + 2);

     ND_PRINT(" (%u)", bodylen);
 
     /* Process the TLVs in the body */
     i = 0;
     while(i < bodylen) {
         const u_char *message;
     ND_PRINT(" (%u)", bodylen);
 
     /* Process the TLVs in the body */
     i = 0;
     while(i < bodylen) {
         const u_char *message;

-        u_int type, len;
+        uint8_t type;
+        u_int len;

 
         message = cp + 4 + i;
 
         ND_TCHECK_1(message);
 
         message = cp + 4 + i;
 
         ND_TCHECK_1(message);

-        if((type = EXTRACT_U_1(message)) == MESSAGE_PAD1) {
+        if((type = GET_U_1(message)) == MESSAGE_PAD1) {

             ND_PRINT(ndo->ndo_vflag ? "\n\tPad 1" : " pad1");
             i += 1;
             continue;
             ND_PRINT(ndo->ndo_vflag ? "\n\tPad 1" : " pad1");
             i += 1;
             continue;


@@ -375,7 +378,7 @@ babel_print_v2(netdissect_options *ndo,
 
         ND_TCHECK_2(message);
         ICHECK(i, 2);
 
         ND_TCHECK_2(message);
         ICHECK(i, 2);

-        len = EXTRACT_U_1(message + 1);
+        len = GET_U_1(message + 1);

 
         ND_TCHECK_LEN(message, 2 + len);
         ICHECK(i, 2 + len);
 
         ND_TCHECK_LEN(message, 2 + len);
         ICHECK(i, 2 + len);


@@ -385,7 +388,7 @@ babel_print_v2(netdissect_options *ndo,
             if (!ndo->ndo_vflag)
                 ND_PRINT(" padN");
             else
             if (!ndo->ndo_vflag)
                 ND_PRINT(" padN");
             else

-                ND_PRINT("\n\tPad %d", len + 2);
+                ND_PRINT("\n\tPad %u", len + 2);

         }
             break;
 
         }
             break;
 


@@ -396,8 +399,8 @@ babel_print_v2(netdissect_options *ndo,
             else {
                 ND_PRINT("\n\tAcknowledgment Request ");
                 if(len < 6) goto invalid;
             else {
                 ND_PRINT("\n\tAcknowledgment Request ");
                 if(len < 6) goto invalid;

-                nonce = EXTRACT_BE_U_2(message + 4);
-                interval = EXTRACT_BE_U_2(message + 6);
+                nonce = GET_BE_U_2(message + 4);
+                interval = GET_BE_U_2(message + 6);

                 ND_PRINT("%04x %s", nonce, format_interval(interval));
             }
         }
                 ND_PRINT("%04x %s", nonce, format_interval(interval));
             }
         }


@@ -410,7 +413,7 @@ babel_print_v2(netdissect_options *ndo,
             else {
                 ND_PRINT("\n\tAcknowledgment ");
                 if(len < 2) goto invalid;
             else {
                 ND_PRINT("\n\tAcknowledgment ");
                 if(len < 2) goto invalid;

-                nonce = EXTRACT_BE_U_2(message + 2);
+                nonce = GET_BE_U_2(message + 2);

                 ND_PRINT("%04x", nonce);
             }
         }
                 ND_PRINT("%04x", nonce);
             }
         }


@@ -423,8 +426,8 @@ babel_print_v2(netdissect_options *ndo,
             else {
                 ND_PRINT("\n\tHello ");
                 if(len < 6) goto invalid;
             else {
                 ND_PRINT("\n\tHello ");
                 if(len < 6) goto invalid;

-                seqno = EXTRACT_BE_U_2(message + 4);
-                interval = EXTRACT_BE_U_2(message + 6);
+                seqno = GET_BE_U_2(message + 4);
+                interval = GET_BE_U_2(message + 6);

                 ND_PRINT("seqno %u interval %s", seqno, format_interval(interval));
                 /* Extra data. */
                 if(len > 6)
                 ND_PRINT("seqno %u interval %s", seqno, format_interval(interval));
                 /* Extra data. */
                 if(len > 6)


@@ -434,21 +437,24 @@ babel_print_v2(netdissect_options *ndo,
             break;
 
         case MESSAGE_IHU: {
             break;
 
         case MESSAGE_IHU: {

-            unsigned short txcost, interval;
+            unsigned short rxcost, interval;

             if (!ndo->ndo_vflag)
                 ND_PRINT(" ihu");
             else {
                 u_char address[16];
             if (!ndo->ndo_vflag)
                 ND_PRINT(" ihu");
             else {
                 u_char address[16];

+                u_char ae;

                 int rc;
                 ND_PRINT("\n\tIHU ");
                 if(len < 6) goto invalid;
                 int rc;
                 ND_PRINT("\n\tIHU ");
                 if(len < 6) goto invalid;

-                txcost = EXTRACT_BE_U_2(message + 4);
-                interval = EXTRACT_BE_U_2(message + 6);
-                rc = network_address(EXTRACT_U_1(message + 2), message + 8,
+                rxcost = GET_BE_U_2(message + 4);
+                interval = GET_BE_U_2(message + 6);
+                ae = GET_U_1(message + 2);
+                rc = network_address(ae, message + 8,

                                      len - 6, address);
                                      len - 6, address);

-                if(rc < 0) { ND_PRINT("%s", tstr); break; }
-                ND_PRINT("%s txcost %u interval %s",
-                       format_address(ndo, address), txcost, format_interval(interval));
+                if(rc < 0) { nd_print_trunc(ndo); break; }
+                ND_PRINT("%s rxcost %u interval %s",
+                       ae == 0 ? "any" : format_address(ndo, address),
+                       rxcost, format_interval(interval));

                 /* Extra data. */
                 if((u_int)rc < len - 6)
                     subtlvs_print(ndo, message + 8 + rc, message + 2 + len,
                 /* Extra data. */
                 if((u_int)rc < len - 6)
                     subtlvs_print(ndo, message + 8 + rc, message + 2 + len,


@@ -463,7 +469,7 @@ babel_print_v2(netdissect_options *ndo,
             else {
                 ND_PRINT("\n\tRouter Id");
                 if(len < 10) goto invalid;
             else {
                 ND_PRINT("\n\tRouter Id");
                 if(len < 10) goto invalid;

-                ND_PRINT(" %s", format_id(message + 4));
+                ND_PRINT(" %s", format_id(ndo, message + 4));

             }
         }
             break;
             }
         }
             break;


@@ -473,13 +479,15 @@ babel_print_v2(netdissect_options *ndo,
                 ND_PRINT(" nh");
             else {
                 int rc;
                 ND_PRINT(" nh");
             else {
                 int rc;

+                u_char ae;

                 u_char nh[16];
                 ND_PRINT("\n\tNext Hop");
                 if(len < 2) goto invalid;
                 u_char nh[16];
                 ND_PRINT("\n\tNext Hop");
                 if(len < 2) goto invalid;

-                rc = network_address(EXTRACT_U_1(message + 2), message + 4,
+                ae = GET_U_1(message + 2);
+                rc = network_address(ae, message + 4,

                                      len - 2, nh);
                 if(rc < 0) goto invalid;
                                      len - 2, nh);
                 if(rc < 0) goto invalid;

-                ND_PRINT(" %s", format_address(ndo, nh));
+                ND_PRINT(" %s", ae == 0 ? "invalid AE 0" : format_address(ndo, nh));

             }
         }
             break;
             }
         }
             break;


@@ -491,35 +499,36 @@ babel_print_v2(netdissect_options *ndo,
                     ND_PRINT("/truncated");
                 else
                     ND_PRINT("%s%s%s",
                     ND_PRINT("/truncated");
                 else
                     ND_PRINT("%s%s%s",

-                           (EXTRACT_U_1(message + 3) & 0x80) ? "/prefix": "",
-                           (EXTRACT_U_1(message + 3) & 0x40) ? "/id" : "",
-                           (EXTRACT_U_1(message + 3) & 0x3f) ? "/unknown" : "");
+                           (GET_U_1(message + 3) & 0x80) ? "/prefix": "",
+                           (GET_U_1(message + 3) & 0x40) ? "/id" : "",
+                           (GET_U_1(message + 3) & 0x3f) ? "/unknown" : "");

             } else {
                 u_short interval, seqno, metric;
             } else {
                 u_short interval, seqno, metric;

-                u_char plen;
+                u_char ae, plen;

                 int rc;
                 u_char prefix[16];
                 ND_PRINT("\n\tUpdate");
                 if(len < 10) goto invalid;
                 int rc;
                 u_char prefix[16];
                 ND_PRINT("\n\tUpdate");
                 if(len < 10) goto invalid;

-                plen = EXTRACT_U_1(message + 4) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0);
-                rc = network_prefix(EXTRACT_U_1(message + 2),
-                                    EXTRACT_U_1(message + 4),
-                                    EXTRACT_U_1(message + 5),
+                ae = GET_U_1(message + 2);
+                plen = GET_U_1(message + 4) + (GET_U_1(message + 2) == 1 ? 96 : 0);
+                rc = network_prefix(ae,
+                                    GET_U_1(message + 4),
+                                    GET_U_1(message + 5),

                                     message + 12,
                                     message + 12,

-                                    EXTRACT_U_1(message + 2) == 1 ? v4_prefix : v6_prefix,
+                                    GET_U_1(message + 2) == 1 ? v4_prefix : v6_prefix,

                                     len - 10, prefix);
                 if(rc < 0) goto invalid;
                                     len - 10, prefix);
                 if(rc < 0) goto invalid;

-                interval = EXTRACT_BE_U_2(message + 6);
-                seqno = EXTRACT_BE_U_2(message + 8);
-                metric = EXTRACT_BE_U_2(message + 10);
+                interval = GET_BE_U_2(message + 6);
+                seqno = GET_BE_U_2(message + 8);
+                metric = GET_BE_U_2(message + 10);

                 ND_PRINT("%s%s%s %s metric %u seqno %u interval %s",
                 ND_PRINT("%s%s%s %s metric %u seqno %u interval %s",

-                       (EXTRACT_U_1(message + 3) & 0x80) ? "/prefix": "",
-                       (EXTRACT_U_1(message + 3) & 0x40) ? "/id" : "",
-                       (EXTRACT_U_1(message + 3) & 0x3f) ? "/unknown" : "",
-                       format_prefix(ndo, prefix, plen),
+                       (GET_U_1(message + 3) & 0x80) ? "/prefix": "",
+                       (GET_U_1(message + 3) & 0x40) ? "/id" : "",
+                       (GET_U_1(message + 3) & 0x3f) ? "/unknown" : "",
+                       ae == 0 ? "any" : format_prefix(ndo, prefix, plen),

                        metric, seqno, format_interval_update(interval));
                        metric, seqno, format_interval_update(interval));

-                if(EXTRACT_U_1(message + 3) & 0x80) {
-                    if(EXTRACT_U_1(message + 2) == 1)
+                if(GET_U_1(message + 3) & 0x80) {
+                    if(GET_U_1(message + 2) == 1)

                         memcpy(v4_prefix, prefix, 16);
                     else
                         memcpy(v6_prefix, prefix, 16);
                         memcpy(v4_prefix, prefix, 16);
                     else
                         memcpy(v6_prefix, prefix, 16);


@@ -531,43 +540,46 @@ babel_print_v2(netdissect_options *ndo,
         }
             break;
 
         }
             break;
 

-        case MESSAGE_REQUEST: {
+        case MESSAGE_ROUTE_REQUEST: {

             if (!ndo->ndo_vflag)
             if (!ndo->ndo_vflag)

-                ND_PRINT(" request");
+                ND_PRINT(" route-request");

             else {
                 int rc;
             else {
                 int rc;

-                u_char prefix[16], plen;
-                ND_PRINT("\n\tRequest ");
+                u_char prefix[16], ae, plen;
+                ND_PRINT("\n\tRoute Request ");

                 if(len < 2) goto invalid;
                 if(len < 2) goto invalid;

-                plen = EXTRACT_U_1(message + 3) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0);
-                rc = network_prefix(EXTRACT_U_1(message + 2),
-                                    EXTRACT_U_1(message + 3), 0,
+                ae = GET_U_1(message + 2);
+                plen = GET_U_1(message + 3) + (GET_U_1(message + 2) == 1 ? 96 : 0);
+                rc = network_prefix(ae,
+                                    GET_U_1(message + 3), 0,

                                     message + 4, NULL, len - 2, prefix);
                 if(rc < 0) goto invalid;
                 ND_PRINT("for %s",
                                     message + 4, NULL, len - 2, prefix);
                 if(rc < 0) goto invalid;
                 ND_PRINT("for %s",

-                       EXTRACT_U_1(message + 2) == 0 ? "any" : format_prefix(ndo, prefix, plen));
+                       ae == 0 ? "any" : format_prefix(ndo, prefix, plen));

             }
         }
             break;
 
             }
         }
             break;
 

-        case MESSAGE_MH_REQUEST : {
+        case MESSAGE_SEQNO_REQUEST : {

             if (!ndo->ndo_vflag)
             if (!ndo->ndo_vflag)

-                ND_PRINT(" mh-request");
+                ND_PRINT(" seqno-request");

             else {
                 int rc;
                 u_short seqno;
             else {
                 int rc;
                 u_short seqno;

-                u_char prefix[16], plen;
-                ND_PRINT("\n\tMH-Request ");
+                u_char prefix[16], ae, plen;
+                ND_PRINT("\n\tSeqno Request ");

                 if(len < 14) goto invalid;
                 if(len < 14) goto invalid;

-                seqno = EXTRACT_BE_U_2(message + 4);
-                rc = network_prefix(EXTRACT_U_1(message + 2),
-                                    EXTRACT_U_1(message + 3), 0,
+                ae = GET_U_1(message + 2);
+                seqno = GET_BE_U_2(message + 4);
+                rc = network_prefix(ae,
+                                    GET_U_1(message + 3), 0,

                                     message + 16, NULL, len - 14, prefix);
                 if(rc < 0) goto invalid;
                                     message + 16, NULL, len - 14, prefix);
                 if(rc < 0) goto invalid;

-                plen = EXTRACT_U_1(message + 3) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0);
+                plen = GET_U_1(message + 3) + (GET_U_1(message + 2) == 1 ? 96 : 0);

                 ND_PRINT("(%u hops) for %s seqno %u id %s",
                 ND_PRINT("(%u hops) for %s seqno %u id %s",

-                       EXTRACT_U_1(message + 6), format_prefix(ndo, prefix, plen),
-                       seqno, format_id(message + 8));
+                       GET_U_1(message + 6),
+                       ae == 0 ? "invalid AE 0" : format_prefix(ndo, prefix, plen),
+                       seqno, format_id(ndo, message + 8));

             }
         }
             break;
             }
         }
             break;


@@ -577,8 +589,9 @@ babel_print_v2(netdissect_options *ndo,
             else {
                 ND_PRINT("\n\tTS/PC ");
                 if(len < 6) goto invalid;
             else {
                 ND_PRINT("\n\tTS/PC ");
                 if(len < 6) goto invalid;

-                ND_PRINT("timestamp %u packetcounter %u", EXTRACT_BE_U_4(message + 4),
-                          EXTRACT_BE_U_2(message + 2));
+                ND_PRINT("timestamp %u packetcounter %u",
+                          GET_BE_U_4(message + 4),
+                          GET_BE_U_2(message + 2));

             }
             break;
         case MESSAGE_HMAC : {
             }
             break;
         case MESSAGE_HMAC : {


@@ -588,9 +601,10 @@ babel_print_v2(netdissect_options *ndo,
                 unsigned j;
                 ND_PRINT("\n\tHMAC ");
                 if(len < 18) goto invalid;
                 unsigned j;
                 ND_PRINT("\n\tHMAC ");
                 if(len < 18) goto invalid;

-                ND_PRINT("key-id %u digest-%u ", EXTRACT_BE_U_2(message + 2), len - 2);
+                ND_PRINT("key-id %u digest-%u ", GET_BE_U_2(message + 2),
+                         len - 2);

                 for (j = 0; j < len - 2; j++)
                 for (j = 0; j < len - 2; j++)

-                    ND_PRINT("%02X", EXTRACT_U_1(message + j + 4));
+                    ND_PRINT("%02X", GET_U_1(message + j + 4));

             }
         }
             break;
             }
         }
             break;


@@ -606,13 +620,13 @@ babel_print_v2(netdissect_options *ndo,
                 int parsed_len = 10;
                 ND_PRINT("\n\tSS-Update");
                 if(len < 10) goto invalid;
                 int parsed_len = 10;
                 ND_PRINT("\n\tSS-Update");
                 if(len < 10) goto invalid;

-                ae = EXTRACT_U_1(message + 2);
-                src_plen = EXTRACT_U_1(message + 3);
-                plen = EXTRACT_U_1(message + 4);
-                omitted = EXTRACT_U_1(message + 5);
-                interval = EXTRACT_BE_U_2(message + 6);
-                seqno = EXTRACT_BE_U_2(message + 8);
-                metric = EXTRACT_BE_U_2(message + 10);
+                ae = GET_U_1(message + 2);
+                src_plen = GET_U_1(message + 3);
+                plen = GET_U_1(message + 4);
+                omitted = GET_U_1(message + 5);
+                interval = GET_BE_U_2(message + 6);
+                seqno = GET_BE_U_2(message + 8);
+                metric = GET_BE_U_2(message + 10);

                 rc = network_prefix(ae, plen, omitted, message + 2 + parsed_len,
                                     ae == 1 ? v4_prefix : v6_prefix,
                                     len - parsed_len, prefix);
                 rc = network_prefix(ae, plen, omitted, message + 2 + parsed_len,
                                     ae == 1 ? v4_prefix : v6_prefix,
                                     len - parsed_len, prefix);


@@ -647,9 +661,9 @@ babel_print_v2(netdissect_options *ndo,
                 u_char ae, plen, src_plen, prefix[16], src_prefix[16];
                 ND_PRINT("\n\tSS-Request ");
                 if(len < 3) goto invalid;
                 u_char ae, plen, src_plen, prefix[16], src_prefix[16];
                 ND_PRINT("\n\tSS-Request ");
                 if(len < 3) goto invalid;

-                ae = EXTRACT_U_1(message + 2);
-                plen = EXTRACT_U_1(message + 3);
-                src_plen = EXTRACT_U_1(message + 4);
+                ae = GET_U_1(message + 2);
+                plen = GET_U_1(message + 3);
+                src_plen = GET_U_1(message + 4);

                 rc = network_prefix(ae, plen, 0, message + 2 + parsed_len,
                                     NULL, len - parsed_len, prefix);
                 if(rc < 0) goto invalid;
                 rc = network_prefix(ae, plen, 0, message + 2 + parsed_len,
                                     NULL, len - parsed_len, prefix);
                 if(rc < 0) goto invalid;


@@ -682,11 +696,11 @@ babel_print_v2(netdissect_options *ndo,
                 const u_char *router_id = NULL;
                 ND_PRINT("\n\tSS-MH-Request ");
                 if(len < 14) goto invalid;
                 const u_char *router_id = NULL;
                 ND_PRINT("\n\tSS-MH-Request ");
                 if(len < 14) goto invalid;

-                ae = EXTRACT_U_1(message + 2);
-                plen = EXTRACT_U_1(message + 3);
-                seqno = EXTRACT_BE_U_2(message + 4);
-                hopc = EXTRACT_U_1(message + 6);
-                src_plen = EXTRACT_U_1(message + 7);
+                ae = GET_U_1(message + 2);
+                plen = GET_U_1(message + 3);
+                seqno = GET_BE_U_2(message + 4);
+                hopc = GET_U_1(message + 6);
+                src_plen = GET_U_1(message + 7);

                 router_id = message + 8;
                 rc = network_prefix(ae, plen, 0, message + 2 + parsed_len,
                                     NULL, len - parsed_len, prefix);
                 router_id = message + 8;
                 rc = network_prefix(ae, plen, 0, message + 2 + parsed_len,
                                     NULL, len - parsed_len, prefix);


@@ -703,7 +717,7 @@ babel_print_v2(netdissect_options *ndo,
                           hopc, format_prefix(ndo, prefix, plen));
                 ND_PRINT("%s) seqno %u id %s",
                           format_prefix(ndo, src_prefix, src_plen),
                           hopc, format_prefix(ndo, prefix, plen));
                 ND_PRINT("%s) seqno %u id %s",
                           format_prefix(ndo, src_prefix, src_plen),

-                          seqno, format_id(router_id));
+                          seqno, format_id(ndo, router_id));

             }
         }
             break;
             }
         }
             break;


@@ -712,17 +726,17 @@ babel_print_v2(netdissect_options *ndo,
             if (!ndo->ndo_vflag)
                 ND_PRINT(" unknown");
             else
             if (!ndo->ndo_vflag)
                 ND_PRINT(" unknown");
             else

-                ND_PRINT("\n\tUnknown message type %d", type);
+                ND_PRINT("\n\tUnknown message type %u", type);

         }
         i += len + 2;
     }
     return;
 
  trunc:
         }
         i += len + 2;
     }
     return;
 
  trunc:

-    ND_PRINT(" %s", tstr);
+    nd_print_trunc(ndo);

     return;
 
  invalid:
     return;
 
  invalid:

-    ND_PRINT("%s", istr);
+    nd_print_invalid(ndo);

     return;
 }
     return;
 }