diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-11-11 17:16:13 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-11-13 05:21:36 +0000 |
| commit | 800b26edbe34e135cc9be1d4395db2c13ae1213f (patch) | |
| tree | fae0a8da631334bde17966a4e7a6a5c0f4491f71 /epan/dissectors/packet-isup.c | |
| parent | 7c40580584eac67a23633e58810028dddc58781c (diff) | |
Remove circuit API
Replace with conversation API that limits the "endpoint" to a single
uint32 value.
The intention is to eventually have "layered" endpoints, because circuit_id
was used in cases where src/dest port have already been populated (and
are used for layers above). Those src/dest ports should just be treated
as just another endpoint, but we currently only have support for one.
Change-Id: Ic6aa7ef0241275aa4dfde9459194369b48c72960
Reviewed-on: https://code.wireshark.org/review/24369
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-isup.c')
| -rw-r--r-- | epan/dissectors/packet-isup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 71f5718332..79ec8449f9 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -49,6 +49,7 @@ #include <epan/packet.h> #include <epan/expert.h> #include <epan/exceptions.h> +#include <epan/conversation.h> #include <epan/stats_tree.h> #include <epan/asn1.h> #include <epan/prefs.h> @@ -10148,8 +10149,6 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* Extract message type field */ message_type = tvb_get_guint8(tvb, CIC_OFFSET + CIC_LENGTH); - pinfo->ctype = CT_ISUP; - switch (mtp3_standard) { case ANSI_STANDARD: isup_standard = ANSI_STANDARD; @@ -10169,6 +10168,7 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ isup_tree = proto_item_add_subtree(ti, ett_isup); proto_tree_add_uint(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic); } + conversation_create_endpoint_by_id(pinfo, ENDPOINT_ISUP, cic, 0); message_tvb = tvb_new_subset_remaining(tvb, CIC_LENGTH); dissect_ansi_isup_message(message_tvb, pinfo, isup_tree, ISUP_ITU_STANDARD_VARIANT, cic); break; @@ -10217,6 +10217,7 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ isup_tree = proto_item_add_subtree(ti, ett_isup); proto_tree_add_uint(isup_tree, hf_isup_cic, tvb, CIC_OFFSET, CIC_LENGTH, cic); } + conversation_create_endpoint_by_id(pinfo, ENDPOINT_ISUP, cic, 0); message_tvb = tvb_new_subset_remaining(tvb, CIC_LENGTH); dissect_isup_message(message_tvb, pinfo, isup_tree, itu_isup_variant, cic); } @@ -10270,7 +10271,7 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ bicc_cic = tvb_get_letohl(tvb, BICC_CIC_OFFSET); - pinfo->ctype = CT_BICC; + conversation_create_endpoint_by_id(pinfo, ENDPOINT_BICC, bicc_cic, 0); col_clear(pinfo->cinfo, COL_INFO); if (isup_show_cic_in_info) { |