Update .gitignore for other configurations

[tcpdump] / print-aodv.c

diff --git a/print-aodv.c b/print-aodv.c
index cd4084b326bd836b693f0903235cd763145709e9..17942bcecf135944b5ed1789da0ebfb9fee0d9da 100644 (file)
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -51,9 +51,9 @@ struct aodv_rreq {
        nd_uint8_t      rreq_zero0;     /* reserved, set to zero */
        nd_uint8_t      rreq_hops;      /* number of hops from originator */
        nd_uint32_t     rreq_id;        /* request ID */
-       nd_uint32_t     rreq_da;        /* destination IPv4 address */
+       nd_ipv4         rreq_da;        /* destination IPv4 address */
        nd_uint32_t     rreq_ds;        /* destination sequence number */
-       nd_uint32_t     rreq_oa;        /* originator IPv4 address */
+       nd_ipv4         rreq_oa;        /* originator IPv4 address */
        nd_uint32_t     rreq_os;        /* originator sequence number */
 };
 struct aodv_rreq6 {
@@ -91,9 +91,9 @@ struct aodv_rrep {
        nd_uint8_t      rrep_flags;     /* various flags */
        nd_uint8_t      rrep_ps;        /* prefix size */
        nd_uint8_t      rrep_hops;      /* number of hops from o to d */
-       nd_uint32_t     rrep_da;        /* destination IPv4 address */
+       nd_ipv4         rrep_da;        /* destination IPv4 address */
        nd_uint32_t     rrep_ds;        /* destination sequence number */
-       nd_uint32_t     rrep_oa;        /* originator IPv4 address */
+       nd_ipv4         rrep_oa;        /* originator IPv4 address */
        nd_uint32_t     rrep_life;      /* lifetime of this route */
 };
 struct aodv_rrep6 {
@@ -123,7 +123,7 @@ struct aodv_rrep6_draft_01 {
 #define        RREP_PREFIX_MASK        0x1F    /* mask for prefix size */
 
 struct rerr_unreach {
-       nd_uint32_t     u_da;   /* IPv4 address */
+       nd_ipv4         u_da;   /* IPv4 address */
        nd_uint32_t     u_ds;   /* sequence number */
 };
 struct rerr_unreach6 {
@@ -202,7 +202,7 @@ aodv_extension(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT(" [|hello]");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -233,7 +233,7 @@ aodv_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
 trunc:
-       ND_PRINT(" [|rreq");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -261,7 +261,7 @@ aodv_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
 trunc:
-       ND_PRINT(" [|rreq");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -291,7 +291,7 @@ aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
 trunc:
-       ND_PRINT("[|rerr]");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -322,7 +322,7 @@ aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
 trunc:
-       ND_PRINT(" [|rreq");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -350,7 +350,7 @@ aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
 trunc:
-       ND_PRINT(" [|rreq");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -380,7 +380,7 @@ aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
 trunc:
-       ND_PRINT("[|rerr]");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -411,7 +411,7 @@ aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
 trunc:
-       ND_PRINT(" [|rreq");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -439,7 +439,7 @@ aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
 trunc:
-       ND_PRINT(" [|rreq");
+       nd_print_trunc(ndo);
 }
 
 static void
@@ -469,7 +469,7 @@ aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
        return;
 
 trunc:
-       ND_PRINT("[|rerr]");
+       nd_print_trunc(ndo);
 }
 
 void
@@ -478,6 +478,7 @@ aodv_print(netdissect_options *ndo,
 {
        uint8_t msg_type;
 
+       ndo->ndo_protocol = "aodv";
        /*
         * The message type is the first byte; make sure we have it
         * and then fetch it.
@@ -535,5 +536,5 @@ aodv_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT(" [|aodv]");
+       nd_print_trunc(ndo);
 }