diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2011-07-23 16:31:10 +0000 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2011-07-23 16:31:10 +0000 |
commit | 20aefe36c7794659346973e91c9c38de5a82fb83 (patch) | |
tree | 51a6c26777f1700b2a5852b974218a4c2903ccab /epan/dissectors/packet-tcp.c | |
parent | a880ea378d45643195acd1891623c3cf52fb1113 (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
svn path=/trunk/; revision=38176
Diffstat (limited to 'epan/dissectors/packet-tcp.c')
-rw-r--r-- | epan/dissectors/packet-tcp.c | 22 |
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) |