diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-13 18:28:34 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-13 18:28:34 +0000 |
| commit | 3dbfe3bb913477a70091b2440b199dccfe74c197 (patch) | |
| tree | 5eb52f5028c6a0ff45e0e6c0501b28f827d62600 /epan/dissectors/packet-afp.c | |
| parent | 9e5388ff1f5ae33a39dcc1cf2c1616bc30200fa0 (diff) | |
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32790 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-afp.c')
| -rw-r--r-- | epan/dissectors/packet-afp.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index b87ee37e8f..4ebeb74717 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -4095,14 +4095,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFP"); col_clear(pinfo->cinfo, COL_INFO); - 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); request_key.conversation = conversation->index; request_key.seq = aspinfo->seq; |