diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-07-31 15:52:46 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-07-31 22:53:27 +0000 |
| commit | ba202ef36225b59eb797c5a48b8d4a4665b479c7 (patch) | |
| tree | 050e449f76d3cf248e64b9260a7c2438db028768 /epan/dissectors/packet-isdn.c | |
| parent | 137bbb2d146a89b42c8173c2b7e9a867df14ecae (diff) | |
Have find_or_create_conversation() use pinfo->conv_endpoint if present.
Add conversation_new_pinfo(), which uses the endpoint if present, and
have find_or_create_conversation() use it rather than
conversation_new().
Remove find_or_create_conversation_by_id() - it's no longer needed.
Bug: 15018
Change-Id: Ib13e539751af0f071aede4ee0ed751d0cb72ba3f
Reviewed-on: https://code.wireshark.org/review/28908
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-isdn.c')
| -rw-r--r-- | epan/dissectors/packet-isdn.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index a2171eed83..846996b278 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -96,6 +96,8 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "Network"); } + conversation_create_endpoint_by_id(pinfo, ENDPOINT_ISDN, pinfo->pseudo_header->isdn.channel, 0); + if (tree) { ti = proto_tree_add_item(tree, proto_isdn, tvb, 0, 0, ENC_NA); isdn_tree = proto_item_add_subtree(ti, ett_isdn); @@ -107,8 +109,7 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* * Set up a circuit for this channel, and assign it a dissector. */ - conv = find_or_create_conversation_by_id(pinfo, ENDPOINT_ISDN, - pinfo->pseudo_header->isdn.channel); + conv = find_or_create_conversation(pinfo); if (conversation_get_dissector(conv, 0) == NULL) { /* |