Don't define value_string arrays in a .h file (included in multiple places).

Also:
 - don't use val_to_str_const() with a "format" default string;
 - rename 'opt_len_type' enumeration  identifiers to be less generic.

svn path=/trunk/; revision=43210

1 files changed, 26 insertions, 28 deletions

diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index e0d0df73e6..4b214a5c50 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -2833,8 +2833,6 @@ dissect_tcpopt_cc(const ip_tcp_opt *optp, tvbuff_t *tvb,
     tcp_info_append_uint(pinfo, "CC", cc);
 }
 
-static value_string_ext qs_rate_vals_ext = VALUE_STRING_EXT_INIT(qs_rate_vals);
-
 static void
 dissect_tcpopt_qs(const ip_tcp_opt *optp, tvbuff_t *tvb,
     int offset, guint optlen, packet_info *pinfo, proto_tree *opt_tree)
@@ -2856,9 +2854,9 @@ dissect_tcpopt_qs(const ip_tcp_opt *optp, tvbuff_t *tvb,
     PROTO_ITEM_SET_HIDDEN(hidden_item);
     proto_tree_add_text(opt_tree, tvb, offset,      optlen,
                         "%s: Rate response, %s, TTL diff %u ", optp->name,
-                        val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown"),
+                        val_to_str_ext_const(rate, &qs_rate_vals_ext, "Unknown"),
                         tvb_get_guint8(tvb, offset + 3));
-    col_append_fstr(pinfo->cinfo, COL_INFO, " QSresp=%s", val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown"));
+    col_append_fstr(pinfo->cinfo, COL_INFO, " QSresp=%s", val_to_str_ext_const(rate, &qs_rate_vals_ext, "Unknown"));
 }
 
 
@@ -3576,7 +3574,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_EOL,
         "End of Option List (EOL)",
         NULL,
-        NO_LENGTH,
+        OPT_LEN_NO_LENGTH,
         0,
         NULL,
     },
@@ -3584,7 +3582,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_NOP,
         "No-Operation (NOP)",
         NULL,
-        NO_LENGTH,
+        OPT_LEN_NO_LENGTH,
         0,
         NULL,
     },
@@ -3592,7 +3590,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_MSS,
         "Maximum segment size",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_MSS,
         dissect_tcpopt_mss
     },
@@ -3600,7 +3598,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_WINDOW,
         "Window scale",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_WINDOW,
         dissect_tcpopt_wscale
     },
@@ -3608,7 +3606,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_SACK_PERM,
         "SACK permitted",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_SACK_PERM,
         dissect_tcpopt_sack_perm,
     },
@@ -3616,7 +3614,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_SACK,
         "SACK",
         &ett_tcp_option_sack,
-        VARIABLE_LENGTH,
+        OPT_LEN_VARIABLE_LENGTH,
         TCPOLEN_SACK_MIN,
         dissect_tcpopt_sack
     },
@@ -3624,7 +3622,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_ECHO,
         "Echo",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_ECHO,
         dissect_tcpopt_echo
     },
@@ -3632,7 +3630,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_ECHOREPLY,
         "Echo reply",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_ECHOREPLY,
         dissect_tcpopt_echo
     },
@@ -3640,7 +3638,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_TIMESTAMP,
         "Timestamps",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_TIMESTAMP,
         dissect_tcpopt_timestamp
     },
@@ -3648,7 +3646,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_MPTCP,
         "Multipath TCP",
         NULL,
-        VARIABLE_LENGTH,
+        OPT_LEN_VARIABLE_LENGTH,
         TCPOLEN_MPTCP_MIN,
         dissect_tcpopt_mptcp
     },
@@ -3656,7 +3654,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_CC,
         "CC",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_CC,
         dissect_tcpopt_cc
     },
@@ -3664,7 +3662,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_CCNEW,
         "CC.NEW",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_CCNEW,
         dissect_tcpopt_cc
     },
@@ -3672,7 +3670,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_CCECHO,
         "CC.ECHO",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_CCECHO,
         dissect_tcpopt_cc
     },
@@ -3680,7 +3678,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_MD5,
         "TCP MD5 signature",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_MD5,
         NULL
     },
@@ -3688,7 +3686,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_SCPS,
         "SCPS capabilities",
         &ett_tcp_option_scps,
-        VARIABLE_LENGTH,
+        OPT_LEN_VARIABLE_LENGTH,
         TCPOLEN_SCPS,
         dissect_tcpopt_scps
     },
@@ -3696,7 +3694,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_SNACK,
         "Selective Negative Acknowledgment",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_SNACK,
         dissect_tcpopt_snack
     },
@@ -3704,7 +3702,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_RECBOUND,
         "SCPS record boundary",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_RECBOUND,
         NULL
     },
@@ -3712,7 +3710,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_CORREXP,
         "SCPS corruption experienced",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_CORREXP,
         NULL
     },
@@ -3720,7 +3718,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_QS,
         "Quick-Start",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_QS,
         dissect_tcpopt_qs
     },
@@ -3728,7 +3726,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_USER_TO,
         "User Timeout",
         &ett_tcp_option_user_to,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_USER_TO,
         dissect_tcpopt_user_to
   },
@@ -3736,7 +3734,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_RVBD_PROBE,
         "Riverbed Probe",
         NULL,
-        VARIABLE_LENGTH,
+        OPT_LEN_VARIABLE_LENGTH,
         TCPOLEN_RVBD_PROBE_MIN,
         dissect_tcpopt_rvbd_probe
   },
@@ -3744,7 +3742,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_RVBD_TRPY,
         "Riverbed Transparency",
         NULL,
-        FIXED_LENGTH,
+        OPT_LEN_FIXED_LENGTH,
         TCPOLEN_RVBD_TRPY_MIN,
         dissect_tcpopt_rvbd_trpy
   },
@@ -3752,7 +3750,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_EXP_FD,
         "Experimental",
         NULL,
-        VARIABLE_LENGTH,
+        OPT_LEN_VARIABLE_LENGTH,
         TCPOLEN_EXP_MIN,
         dissect_tcpopt_exp
   },
@@ -3760,7 +3758,7 @@ static const ip_tcp_opt tcpopts[] = {
         TCPOPT_EXP_FE,
         "Experimental",
         NULL,
-        VARIABLE_LENGTH,
+        OPT_LEN_VARIABLE_LENGTH,
         TCPOLEN_EXP_MIN,
         dissect_tcpopt_exp
   }