Merge pull request #703 from nmap/update-gitignore

[tcpdump] / print-babel.c

diff --git a/print-babel.c b/print-babel.c
index fdba430757768225ae47f85e780338acb1bfe0ee..fb70a7fc51abf925de7e9060abd9459c9d794abd 100644 (file)
--- a/print-babel.c
+++ b/print-babel.c
@@ -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,6 +48,7 @@ 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);


@@ -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


@@ -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


@@ -336,7 +336,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) \


@@ -434,7 +434,7 @@ 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 {
             if (!ndo->ndo_vflag)
                 ND_PRINT(" ihu");
             else {


@@ -443,15 +443,15 @@ babel_print_v2(netdissect_options *ndo,
                 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);
+                rxcost = EXTRACT_BE_U_2(message + 4);

                 interval = EXTRACT_BE_U_2(message + 6);
                 ae = EXTRACT_U_1(message + 2);
                 rc = network_address(ae, message + 8,
                                      len - 6, address);
                 interval = EXTRACT_BE_U_2(message + 6);
                 ae = EXTRACT_U_1(message + 2);
                 rc = network_address(ae, message + 8,
                                      len - 6, address);

-                if(rc < 0) { ND_PRINT("%s", tstr); break; }
-                ND_PRINT("%s txcost %u interval %s",
+                if(rc < 0) { nd_print_trunc(ndo); break; }
+                ND_PRINT("%s rxcost %u interval %s",

                        ae == 0 ? "any" : format_address(ndo, address),
                        ae == 0 ? "any" : format_address(ndo, address),

-                       txcost, format_interval(interval));
+                       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,


@@ -537,13 +537,13 @@ 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;
                 u_char prefix[16], ae, plen;
             else {
                 int rc;
                 u_char prefix[16], ae, plen;

-                ND_PRINT("\n\tRequest ");
+                ND_PRINT("\n\tRoute Request ");

                 if(len < 2) goto invalid;
                 ae = EXTRACT_U_1(message + 2);
                 plen = EXTRACT_U_1(message + 3) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0);
                 if(len < 2) goto invalid;
                 ae = EXTRACT_U_1(message + 2);
                 plen = EXTRACT_U_1(message + 3) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0);


@@ -557,14 +557,14 @@ babel_print_v2(netdissect_options *ndo,
         }
             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;
                 u_char prefix[16], ae, plen;
             else {
                 int rc;
                 u_short seqno;
                 u_char prefix[16], ae, plen;

-                ND_PRINT("\n\tMH-Request ");
+                ND_PRINT("\n\tSeqno Request ");

                 if(len < 14) goto invalid;
                 ae = EXTRACT_U_1(message + 2);
                 seqno = EXTRACT_BE_U_2(message + 4);
                 if(len < 14) goto invalid;
                 ae = EXTRACT_U_1(message + 2);
                 seqno = EXTRACT_BE_U_2(message + 4);


@@ -728,10 +728,10 @@ babel_print_v2(netdissect_options *ndo,
     return;
 
  trunc:
     return;
 
  trunc:

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

     return;
 
  invalid:
     return;
 
  invalid:

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

     return;
 }
     return;
 }