NTP: Use tstr for truncation indicator.

[tcpdump] / print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index b50b0814be860068c4cf3102e5bef91911fc3dc6..25e9bbca085d9b96afb62e98a6187d13836c8b9f 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -19,16 +19,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: IPv6 Routing Information Protocol (RIPng) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef INET6
-
-#include <tcpdump-stdinc.h>
-#include <stdio.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -67,15 +66,15 @@
 
 struct netinfo6 {
        struct in6_addr rip6_dest;
-       u_int16_t       rip6_tag;
-       u_int8_t        rip6_plen;
-       u_int8_t        rip6_metric;
+       uint16_t        rip6_tag;
+       uint8_t         rip6_plen;
+       uint8_t         rip6_metric;
 };
 
 struct rip6 {
-       u_int8_t        rip6_cmd;
-       u_int8_t        rip6_vers;
-       u_int8_t        rip6_res1[2];
+       uint8_t         rip6_cmd;
+       uint8_t         rip6_vers;
+       uint8_t         rip6_res1[2];
        union {
                struct  netinfo6        ru6_nets[1];
                char    ru6_tracefile[1];
@@ -86,8 +85,6 @@ struct        rip6 {
 
 #define        HOPCNT_INFINITY6        16
 
-#define        RIP6_PORT               521
-
 #if !defined(IN6_IS_ADDR_UNSPECIFIED) && !defined(_MSC_VER) /* MSVC inline */
 static int IN6_IS_ADDR_UNSPECIFIED(const struct in6_addr *addr)
 {
@@ -97,30 +94,30 @@ static int IN6_IS_ADDR_UNSPECIFIED(const struct in6_addr *addr)
 #endif
 
 static int
-rip6_entry_print(register const struct netinfo6 *ni, int metric)
+rip6_entry_print(netdissect_options *ndo, register const struct netinfo6 *ni, int metric)
 {
        int l;
-       l = printf("%s/%d", ip6addr_string(&ni->rip6_dest), ni->rip6_plen);
+       l = ND_PRINT((ndo, "%s/%d", ip6addr_string(ndo, &ni->rip6_dest), ni->rip6_plen));
        if (ni->rip6_tag)
-               l += printf(" [%d]", EXTRACT_16BITS(&ni->rip6_tag));
+               l += ND_PRINT((ndo, " [%d]", EXTRACT_16BITS(&ni->rip6_tag)));
        if (metric)
-               l += printf(" (%d)", ni->rip6_metric);
+               l += ND_PRINT((ndo, " (%d)", ni->rip6_metric));
        return l;
 }
 
 void
-ripng_print(const u_char *dat, unsigned int length)
+ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 {
-       register const struct rip6 *rp = (struct rip6 *)dat;
+       register const struct rip6 *rp = (const struct rip6 *)dat;
        register const struct netinfo6 *ni;
        register u_int amt;
        register u_int i;
        int j;
        int trunc;
 
-       if (snapend < dat)
+       if (ndo->ndo_snapend < dat)
                return;
-       amt = snapend - dat;
+       amt = ndo->ndo_snapend - dat;
        i = min(length, amt);
        if (i < (sizeof(struct rip6) - sizeof(struct netinfo6)))
                return;
@@ -133,46 +130,45 @@ ripng_print(const u_char *dat, unsigned int length)
                if (j == 1
                    &&  rp->rip6_nets->rip6_metric == HOPCNT_INFINITY6
                    &&  IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
-                       printf(" ripng-req dump");
+                       ND_PRINT((ndo, " ripng-req dump"));
                        break;
                }
                if (j * sizeof(*ni) != length - 4)
-                       printf(" ripng-req %d[%u]:", j, length);
+                       ND_PRINT((ndo, " ripng-req %d[%u]:", j, length));
                else
-                       printf(" ripng-req %d:", j);
+                       ND_PRINT((ndo, " ripng-req %d:", j));
                trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
                for (ni = rp->rip6_nets; i >= sizeof(*ni);
                    i -= sizeof(*ni), ++ni) {
-                       if (vflag > 1)
-                               printf("\n\t");
+                       if (ndo->ndo_vflag > 1)
+                               ND_PRINT((ndo, "\n\t"));
                        else
-                               printf(" ");
-                       rip6_entry_print(ni, 0);
+                               ND_PRINT((ndo, " "));
+                       rip6_entry_print(ndo, ni, 0);
                }
                break;
        case RIP6_RESPONSE:
                j = length / sizeof(*ni);
                if (j * sizeof(*ni) != length - 4)
-                       printf(" ripng-resp %d[%u]:", j, length);
+                       ND_PRINT((ndo, " ripng-resp %d[%u]:", j, length));
                else
-                       printf(" ripng-resp %d:", j);
+                       ND_PRINT((ndo, " ripng-resp %d:", j));
                trunc = ((i / sizeof(*ni)) * sizeof(*ni) != i);
                for (ni = rp->rip6_nets; i >= sizeof(*ni);
                    i -= sizeof(*ni), ++ni) {
-                       if (vflag > 1)
-                               printf("\n\t");
+                       if (ndo->ndo_vflag > 1)
+                               ND_PRINT((ndo, "\n\t"));
                        else
-                               printf(" ");
-                       rip6_entry_print(ni, ni->rip6_metric);
+                               ND_PRINT((ndo, " "));
+                       rip6_entry_print(ndo, ni, ni->rip6_metric);
                }
                if (trunc)
-                       printf("[|ripng]");
+                       ND_PRINT((ndo, "[|ripng]"));
                break;
        default:
-               printf(" ripng-%d ?? %u", rp->rip6_cmd, length);
+               ND_PRINT((ndo, " ripng-%d ?? %u", rp->rip6_cmd, length));
                break;
        }
        if (rp->rip6_vers != RIP6_VERSION)
-               printf(" [vers %d]", rp->rip6_vers);
+               ND_PRINT((ndo, " [vers %d]", rp->rip6_vers));
 }
-#endif /* INET6 */