diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-05-13 18:28:34 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-05-13 18:28:34 +0000 |
| commit | 729de1a635cd21379db622c93f945a19b9f645b2 (patch) | |
| tree | 5eb52f5028c6a0ff45e0e6c0501b28f827d62600 /epan/dissectors/packet-rtmpt.c | |
| parent | 1c18115bd3e8a0b1a56ab8effcf5843240bde0c6 (diff) | |
| download | wireshark-729de1a635cd21379db622c93f945a19b9f645b2.tar.gz | |
As suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html
(as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 :
Write a new convenience routine for finding a conversation and, if it is not
found, create it. The frame number and addresses are taken from pinfo (as is
the common case).
Use this function in a bunch of dissectors.
svn path=/trunk/; revision=32790
Diffstat (limited to 'epan/dissectors/packet-rtmpt.c')
| -rw-r--r-- | epan/dissectors/packet-rtmpt.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 1eb1956429..198c482630 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -24,7 +24,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* This dissector is called RTMPT to avoid a conflict with +/* This dissector is called RTMPT to avoid a conflict with * the other RTMP protocol (Routing Table Maintenance Protocol) implemented in packet-atalk.c * (RTMPT normally stands for RTMP-Tunnel via http) * @@ -197,7 +197,7 @@ static const value_string rtmpt_type_vals[] = { { 0, NULL } }; -static gint rtmpt_header_length_from_type(gint iHeaderType) +static gint rtmpt_header_length_from_type(gint iHeaderType) { gint iHeaderLength = 0; switch (iHeaderType) { @@ -208,8 +208,8 @@ static gint rtmpt_header_length_from_type(gint iHeaderType) case 4: iHeaderLength = 1; break; /* Handshake */ } return iHeaderLength; -} - +} + static void dissect_rtmpt_amf(tvbuff_t *tvb, proto_tree *rtmpt_tree) @@ -743,11 +743,7 @@ dissect_rtmpt_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #if 0 conversation_t * conversation; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - if (conversation == NULL) - { - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - } + conversation = find_or_create_conversation(pinfo); #endif tcp_dissect_pdus(tvb, pinfo, tree, 1, 1, get_rtmpt_pdu_len, dissect_rtmpt); @@ -792,10 +788,10 @@ proto_register_rtmpt(void) }; static gint *ett[] = { &ett_rtmpt, - &ett_rtmpt_header, - &ett_rtmpt_body, - &ett_rtmpt_object, - &ett_rtmpt_property + &ett_rtmpt_header, + &ett_rtmpt_body, + &ett_rtmpt_object, + &ett_rtmpt_property }; module_t *rtmpt_module; @@ -810,7 +806,7 @@ proto_register_rtmpt(void) "Whether the RTMPT dissector should reassemble messages spanning multiple TCP segments." " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &rtmpt_desegment); - + } void |