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-h245.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-h245.c')
| -rw-r--r-- | epan/dissectors/packet-h245.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index cd39bdc171..a489278dcb 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -9084,7 +9084,7 @@ dissect_h245_MultiplexEntryDescriptor(tvbuff_t *tvb _U_, int offset _U_, asn1_ct ett_h245_MultiplexEntryDescriptor, MultiplexEntryDescriptor_sequence); if(h223_set_mc_handle) - (*h223_set_mc_handle)(actx->pinfo, h223_mc, h223_me, actx->pinfo->ctype, actx->pinfo->circuit_id); + (*h223_set_mc_handle)(actx->pinfo, h223_mc, h223_me); /* stuff */ @@ -11114,9 +11114,9 @@ dissect_h245_OpenLogicalChannelAck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t DISSECTOR_ASSERT( ( h223_rev_lc_num && pend->rev_channel_params) || (!h223_rev_lc_num && !pend->rev_channel_params) ); if(h223_add_lc_handle) { - (*h223_add_lc_handle)( actx->pinfo, h223_fw_lc_num, pend->fw_channel_params, actx->pinfo->ctype, actx->pinfo->circuit_id ); + (*h223_add_lc_handle)( actx->pinfo, h223_fw_lc_num, pend->fw_channel_params); if(h223_rev_lc_num) - (*h223_add_lc_handle)( actx->pinfo, h223_rev_lc_num, pend->rev_channel_params, actx->pinfo->ctype, actx->pinfo->circuit_id ); + (*h223_add_lc_handle)( actx->pinfo, h223_rev_lc_num, pend->rev_channel_params); } } else { /* we missed the OpenLogicalChannel packet */ |