diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2016-01-26 16:53:39 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-01-27 11:35:00 +0000 |
| commit | 9d71ca229390ce2de3b323978bcc5ea51f9e02e2 (patch) | |
| tree | ce983707ae26beccf6f4044c5f4ac1deeff8146c | |
| parent | adb731c1cd69855b1655a0f23001655392a07340 (diff) | |
Use find_or_create_conversation().
Change-Id: I4344a0ebdd6eb4c8cf2a54d3bd48056ecadef4a2
Reviewed-on: https://code.wireshark.org/review/13551
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-atalk.c | 9 | ||||
| -rw-r--r-- | epan/dissectors/packet-rtmpt.c | 22 |
2 files changed, 8 insertions, 23 deletions
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 2b9add2fcf..5c1b11174b 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -994,14 +994,7 @@ get_transaction(tvbuff_t *tvb, packet_info *pinfo, struct aspinfo *aspinfo) asp_request_val *request_val; guint8 fn; - conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, - pinfo->srcport, pinfo->destport, 0); - - if (conversation == NULL) - { - conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - } + conversation = find_or_create_conversation(pinfo); request_key.conversation = conversation->index; memcpy(request_key.src, (!aspinfo->reply)?pinfo->src.data:pinfo->dst.data, 4); diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 813a53a660..c675b450b9 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -2295,10 +2295,7 @@ dissect_rtmpt_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat } tcpinfo = (struct tcpinfo*)data; - conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - if (!conv) { - conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - } + conv = find_or_create_conversation(pinfo); rconv = (rtmpt_conv_t*)conversation_get_proto_data(conv, proto_rtmpt); if (!rconv) { @@ -2446,18 +2443,13 @@ dissect_rtmpt_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da && tcpinfo->seq == RTMPT_HANDSHAKE_OFFSET_1 && tvb_get_guint8(tvb, 0) == RTMPT_MAGIC) { - /* Register this dissector for this conversation */ - conversation = NULL; - conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - if (conversation == NULL) - { - conversation = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - } - conversation_set_dissector(conversation, rtmpt_tcp_handle); + /* Register this dissector for this conversation */ + conversation = find_or_create_conversation(pinfo); + conversation_set_dissector(conversation, rtmpt_tcp_handle); - /* Dissect the packet */ - dissect_rtmpt_tcp(tvb, pinfo, tree, data); - return TRUE; + /* Dissect the packet */ + dissect_rtmpt_tcp(tvb, pinfo, tree, data); + return TRUE; } } return FALSE; |