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-x224.c | |
| parent | 1c18115bd3e8a0b1a56ab8effcf5843240bde0c6 (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.
svn path=/trunk/; revision=32790
Diffstat (limited to 'epan/dissectors/packet-x224.c')
| -rw-r--r-- | epan/dissectors/packet-x224.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c index 4c059215f7..1676e91bbd 100644 --- a/epan/dissectors/packet-x224.c +++ b/epan/dissectors/packet-x224.c @@ -164,7 +164,7 @@ dissect_x224_dt(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int off item = proto_tree_add_uint(tree, hf_x224_class, tvb, 0, 0, x224_info->class); PROTO_ITEM_SET_GENERATED(item); - + /* EOT / NR */ proto_tree_add_item(tree, hf_x224_eot, tvb, offset, 1, FALSE); @@ -219,20 +219,8 @@ dissect_x224(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) * We need to track some state for this protocol on a per conversation * basis so we can do neat things like request/response tracking */ - /* - * Do we have a conversation for this connection? - */ - conversation = find_conversation(pinfo->fd->num, - &pinfo->src, &pinfo->dst, - pinfo->ptype, - pinfo->srcport, pinfo->destport, 0); - if (conversation == NULL) { - /* We don't yet have a conversation, so create one. */ - conversation = conversation_new(pinfo->fd->num, - &pinfo->src, &pinfo->dst, - pinfo->ptype, - pinfo->srcport, pinfo->destport, 0); - } + conversation = find_or_create_conversation(pinfo); + /* * Do we already have a state structure for this conv */ |