aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tcp.c
diff options
context:
space:
mode:
authoralagoutte <alagoutte@f5534014-38df-0310-8fa8-9805f1628bb7>2011-07-23 16:31:10 +0000
committeralagoutte <alagoutte@f5534014-38df-0310-8fa8-9805f1628bb7>2011-07-23 16:31:10 +0000
commitfded87190e7c412db72801dff4ed09a520f327c7 (patch)
tree51a6c26777f1700b2a5852b974218a4c2903ccab /epan/dissectors/packet-tcp.c
parent49cdf19ce611438a01e78c1320af10153e59566a (diff)
Wrong patch commit in Rev38175...
Fix : packet-tcp.c:3337: error: ‘dissect_tcpopt_maxseg’ undeclared here (not in a function) packet-tcp.c:2264: error: ‘dissec_tcpopt_exp’ defined but not used git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38176 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-tcp.c')
-rw-r--r--epan/dissectors/packet-tcp.c22
1 files changed, 19 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 78bb6c6855..ef4f370974 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -2261,7 +2261,7 @@ tcp_info_append_str(packet_info *pinfo, const char *abbrev, const char *val)
static void
-dissec_tcpopt_exp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
+dissect_tcpopt_exp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb,
int offset, guint optlen, packet_info *pinfo, proto_tree *opt_tree)
{
proto_item *item;
@@ -3334,7 +3334,7 @@ static const ip_tcp_opt tcpopts[] = {
NULL,
FIXED_LENGTH,
TCPOLEN_MSS,
- dissect_tcpopt_maxseg
+ dissect_tcpopt_mss
},
{
TCPOPT_WINDOW,
@@ -3487,7 +3487,23 @@ static const ip_tcp_opt tcpopts[] = {
FIXED_LENGTH,
TCPOLEN_RVBD_TRPY_MIN,
dissect_tcpopt_rvbd_trpy
- }
+ },
+ {
+ TCPOPT_EXP_FD,
+ "Experimental",
+ NULL,
+ VARIABLE_LENGTH,
+ TCPOLEN_EXP_MIN,
+ dissect_tcpopt_exp
+ },
+ {
+ TCPOPT_EXP_FE,
+ "Experimental",
+ NULL,
+ VARIABLE_LENGTH,
+ TCPOLEN_EXP_MIN,
+ dissect_tcpopt_exp
+ }
};
#define N_TCP_OPTS array_length(tcpopts)