Add more nd_print_trunc() calls

[tcpdump] / print-openflow-1.0.c

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index d8242875b68c1fd7fde7a503005dc802871fca63..0b2e7bbcf4991abf0eb5bd99bb92d6a6ae88695d 100644 (file)
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -59,7 +59,7 @@
 /* \summary: OpenFlow protocol version 1.0 printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "netdissect-stdinc.h"
@@ -72,7 +72,6 @@
 #include "oui.h"
 #include "openflow.h"
 
-static const char tstr[] = " [|openflow]";
 
 #define OFPT_HELLO                    0x00
 #define OFPT_ERROR                    0x01
@@ -703,7 +702,7 @@ vlan_str(const uint16_t vid)
        if (vid == OFP_VLAN_NONE)
                return "NONE";
        fmt = (vid > 0 && vid < 0x0fff) ? "%u" : "%u (bogus)";
-       snprintf(buf, sizeof(buf), fmt, vid);
+       nd_snprintf(buf, sizeof(buf), fmt, vid);
        return buf;
 }
 
@@ -711,7 +710,7 @@ static const char *
 pcp_str(const uint8_t pcp)
 {
        static char buf[sizeof("255 (bogus)")];
-       snprintf(buf, sizeof(buf), pcp <= 7 ? "%u" : "%u (bogus)", pcp);
+       nd_snprintf(buf, sizeof(buf), pcp <= 7 ? "%u" : "%u (bogus)", pcp);
        return buf;
 }
 
@@ -747,7 +746,7 @@ of10_data_print(netdissect_options *ndo,
        return cp + len;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -895,7 +894,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                cp += 4;
                /* data */
                ND_PRINT(", data '");
-               if (fn_printn(ndo, cp, len - 8, ep)) {
+               if (nd_printn(ndo, cp, len - 8, ep)) {
                        ND_PRINT("'");
                        goto trunc;
                }
@@ -916,7 +915,7 @@ of10_bsn_message_print(netdissect_options *ndo,
                /* already checked that len >= 4 */
                /* data */
                ND_PRINT(", data '");
-               if (fn_printn(ndo, cp, len - 4, ep)) {
+               if (nd_printn(ndo, cp, len - 4, ep)) {
                        ND_PRINT("'");
                        goto trunc;
                }
@@ -952,7 +951,7 @@ invalid: /* skip the undersized data */
        ND_TCHECK_LEN(cp0, len);
        return cp0 + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1026,7 +1025,7 @@ invalid:
        ND_TCHECK_LEN(cp0, len);
        return cp0 + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1055,7 +1054,7 @@ invalid: /* skip the undersized data */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1084,7 +1083,7 @@ invalid: /* skip the undersized data */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1110,7 +1109,7 @@ invalid: /* skip the undersized data */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1132,7 +1131,7 @@ of10_packet_data_print(netdissect_options *ndo,
        return cp + len;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1158,7 +1157,7 @@ of10_phy_ports_print(netdissect_options *ndo,
                /* name */
                ND_TCHECK_LEN(cp, OFP_MAX_PORT_NAME_LEN);
                ND_PRINT(", name '");
-               fn_print(ndo, cp, cp + OFP_MAX_PORT_NAME_LEN);
+               nd_print(ndo, cp, cp + OFP_MAX_PORT_NAME_LEN);
                ND_PRINT("'");
                cp += OFP_MAX_PORT_NAME_LEN;
 
@@ -1213,7 +1212,7 @@ invalid: /* skip the undersized trailing data */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1289,7 +1288,7 @@ invalid: /* skip the rest of queue properties */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1337,7 +1336,7 @@ invalid: /* skip the rest of queues */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1441,7 +1440,7 @@ of10_match_print(netdissect_options *ndo,
        return cp + 2;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1608,7 +1607,7 @@ invalid: /* skip the rest of actions */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1647,7 +1646,7 @@ of10_features_reply_print(netdissect_options *ndo,
        return of10_phy_ports_print(ndo, cp, ep, len - OF_SWITCH_FEATURES_LEN);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1705,7 +1704,7 @@ of10_flow_mod_print(netdissect_options *ndo,
        return of10_actions_print(ndo, "\n\t ", cp, ep, len - OF_FLOW_MOD_LEN);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1742,7 +1741,7 @@ of10_port_mod_print(netdissect_options *ndo,
        return cp + 4;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1826,7 +1825,7 @@ invalid: /* skip the message body */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1840,31 +1839,31 @@ of10_desc_stats_reply_print(netdissect_options *ndo,
        /* mfr_desc */
        ND_TCHECK_LEN(cp, DESC_STR_LEN);
        ND_PRINT("\n\t  mfr_desc '");
-       fn_print(ndo, cp, cp + DESC_STR_LEN);
+       nd_print(ndo, cp, cp + DESC_STR_LEN);
        ND_PRINT("'");
        cp += DESC_STR_LEN;
        /* hw_desc */
        ND_TCHECK_LEN(cp, DESC_STR_LEN);
        ND_PRINT("\n\t  hw_desc '");
-       fn_print(ndo, cp, cp + DESC_STR_LEN);
+       nd_print(ndo, cp, cp + DESC_STR_LEN);
        ND_PRINT("'");
        cp += DESC_STR_LEN;
        /* sw_desc */
        ND_TCHECK_LEN(cp, DESC_STR_LEN);
        ND_PRINT("\n\t  sw_desc '");
-       fn_print(ndo, cp, cp + DESC_STR_LEN);
+       nd_print(ndo, cp, cp + DESC_STR_LEN);
        ND_PRINT("'");
        cp += DESC_STR_LEN;
        /* serial_num */
        ND_TCHECK_LEN(cp, SERIAL_NUM_LEN);
        ND_PRINT("\n\t  serial_num '");
-       fn_print(ndo, cp, cp + SERIAL_NUM_LEN);
+       nd_print(ndo, cp, cp + SERIAL_NUM_LEN);
        ND_PRINT("'");
        cp += SERIAL_NUM_LEN;
        /* dp_desc */
        ND_TCHECK_LEN(cp, DESC_STR_LEN);
        ND_PRINT("\n\t  dp_desc '");
-       fn_print(ndo, cp, cp + DESC_STR_LEN);
+       nd_print(ndo, cp, cp + DESC_STR_LEN);
        ND_PRINT("'");
        return cp + DESC_STR_LEN;
 
@@ -1873,7 +1872,7 @@ invalid: /* skip the message body */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1954,7 +1953,7 @@ invalid: /* skip the rest of flow statistics entries */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -1987,7 +1986,7 @@ invalid: /* skip the message body */
        ND_TCHECK_LEN(cp, len);
        return cp + len;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2012,7 +2011,7 @@ of10_table_stats_reply_print(netdissect_options *ndo,
                /* name */
                ND_TCHECK_LEN(cp, OFP_MAX_TABLE_NAME_LEN);
                ND_PRINT(", name '");
-               fn_print(ndo, cp, cp + OFP_MAX_TABLE_NAME_LEN);
+               nd_print(ndo, cp, cp + OFP_MAX_TABLE_NAME_LEN);
                ND_PRINT("'");
                cp += OFP_MAX_TABLE_NAME_LEN;
                /* wildcards */
@@ -2047,7 +2046,7 @@ invalid: /* skip the undersized trailing data */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2132,7 +2131,7 @@ invalid: /* skip the undersized trailing data */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2180,7 +2179,7 @@ invalid: /* skip the undersized trailing data */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2221,7 +2220,7 @@ of10_stats_reply_print(netdissect_options *ndo,
        return cp0 + len;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2259,7 +2258,7 @@ invalid: /* skip the rest of the message body */
        ND_TCHECK_LEN(cp0, len0);
        return cp0 + len0;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2292,7 +2291,7 @@ of10_packet_in_print(netdissect_options *ndo,
        return of10_packet_data_print(ndo, cp, ep, len - (OF_PACKET_IN_LEN - 2));
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2346,7 +2345,7 @@ of10_flow_removed_print(netdissect_options *ndo,
        return cp + 8;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2379,7 +2378,7 @@ of10_error_print(netdissect_options *ndo,
        return of10_data_print(ndo, cp, ep, len - OF_ERROR_MSG_LEN);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -2563,6 +2562,6 @@ next_message:
        ND_TCHECK_LEN(cp0, len0 - OF_HEADER_LEN);
        return cp0 + len0 - OF_HEADER_LEN;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }