diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-10-22 08:53:07 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-10-28 07:11:26 +0000 |
| commit | 3d359da2b54d7e6c3ade4434894cd7f6207083fc (patch) | |
| tree | 56b53030b03309fab4a6b711de47c955fb328e09 /asn1/h245 | |
| parent | 09957ca41875abda6e9ea24f35eb15f93dacb618 (diff) | |
Refactor pinfo->circuit_id from H.223 dissector.
Change-Id: Id63e0088047c7948fd190ba4dd5fbcb536e0cc6b
Reviewed-on: https://code.wireshark.org/review/4921
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1/h245')
| -rw-r--r-- | asn1/h245/h245.cnf | 6 | ||||
| -rw-r--r-- | asn1/h245/packet-h245-template.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 62a4c67667..713a51cd1b 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -55,7 +55,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format h223_mc = 0; %(DEFAULT_BODY)s if(h223_set_mc_handle) - (*h223_set_mc_handle)(%(ACTX)s->pinfo, h223_mc, h223_me); + (*h223_set_mc_handle)(%(ACTX)s->pinfo, h223_mc, h223_me, %(ACTX)s->pinfo->ctype, %(ACTX)s->pinfo->circuit_id); /* stuff */ #.END #---------------------------------------------------------------------------------------- @@ -240,9 +240,9 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format 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)s->pinfo, h223_fw_lc_num, pend->fw_channel_params ); + (*h223_add_lc_handle)( %(ACTX)s->pinfo, h223_fw_lc_num, pend->fw_channel_params, %(ACTX)s->pinfo->ctype, %(ACTX)s->pinfo->circuit_id ); if(h223_rev_lc_num) - (*h223_add_lc_handle)( %(ACTX)s->pinfo, h223_rev_lc_num, pend->rev_channel_params ); + (*h223_add_lc_handle)( %(ACTX)s->pinfo, h223_rev_lc_num, pend->rev_channel_params, %(ACTX)s->pinfo->ctype, %(ACTX)s->pinfo->circuit_id ); } } else { /* we missed the OpenLogicalChannel packet */ diff --git a/asn1/h245/packet-h245-template.h b/asn1/h245/packet-h245-template.h index 8042d84a71..e83ee44505 100644 --- a/asn1/h245/packet-h245-template.h +++ b/asn1/h245/packet-h245-template.h @@ -116,10 +116,10 @@ struct _h223_mux_element { #include <epan/packet_info.h> #include <epan/dissectors/packet-per.h> -typedef void (*h223_set_mc_handle_t) ( packet_info* pinfo, guint8 mc, h223_mux_element* me ); +typedef void (*h223_set_mc_handle_t) ( packet_info* pinfo, guint8 mc, h223_mux_element* me, circuit_type ctype, guint32 circuit_id ); WS_DLL_PUBLIC void h245_set_h223_set_mc_handle( h223_set_mc_handle_t handle ); -typedef void (*h223_add_lc_handle_t) ( packet_info* pinfo, guint16 lc, h223_lc_params* params ); +typedef void (*h223_add_lc_handle_t) ( packet_info* pinfo, guint16 lc, h223_lc_params* params, circuit_type ctype, guint32 circuit_id ); WS_DLL_PUBLIC void h245_set_h223_add_lc_handle( h223_add_lc_handle_t handle ); #include "packet-h245-exp.h" |