diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-22 11:54:54 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-11-26 09:20:44 +0000 |
| commit | ab8cad28160cef32889abdc498f9c657bb31024f (patch) | |
| tree | 66ba08b9079aada6f3d95419cf1681759c4d6493 /asn1/gsm_map/gsm_map.cnf | |
| parent | 7c475037e4b58d75a513f206896db1885cdb9ada (diff) | |
| download | wireshark-ab8cad28160cef32889abdc498f9c657bb31024f.tar.gz | |
Remove sccp_info member from packet_info structure.
sccp_msg_info_t* is now passed from SCCP dissector to its subdissectors through dissector data parameter.
Change-Id: Iab4aae58f8995e844f72e02e9f2de36e83589fc0
Reviewed-on: https://code.wireshark.org/review/5442
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1/gsm_map/gsm_map.cnf')
| -rw-r--r-- | asn1/gsm_map/gsm_map.cnf | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf index 1c4cba9511..55e3de48c9 100644 --- a/asn1/gsm_map/gsm_map.cnf +++ b/asn1/gsm_map/gsm_map.cnf @@ -2,7 +2,7 @@ -b #-d satcom #-s packet-gsm_map-tmp --k +#-k -o gsm_map #.END @@ -315,7 +315,8 @@ MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS" /* Strip off discrimination and length */ proto_tree_add_item(subtree, hf_gsm_map_len, parameter_tvb, 1,1,ENC_BIG_ENDIAN); next_tvb = tvb_new_subset_remaining(parameter_tvb, 2); - dissect_bssmap(next_tvb, actx->pinfo, subtree); + call_dissector_with_data(bssap_handle, next_tvb, actx->pinfo, subtree, + p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_gsm_map, actx->pinfo->curr_layer_num)); }else if(octet==1){ proto_tree_add_item(subtree, hf_gsm_map_dlci, parameter_tvb, 1,1,ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_map_len, parameter_tvb, 2,1,ENC_BIG_ENDIAN); @@ -770,7 +771,8 @@ if (!actx->value_ptr) /* Strip off discrimination and length */ proto_tree_add_item(subtree, hf_gsm_map_len, (tvbuff_t*)actx->value_ptr, 1,1,ENC_BIG_ENDIAN); next_tvb = tvb_new_subset_remaining((tvbuff_t*)actx->value_ptr, 2); - dissect_bssmap(next_tvb, actx->pinfo, subtree); + call_dissector_with_data(bssap_handle, next_tvb, actx->pinfo, subtree, + p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_gsm_map, actx->pinfo->curr_layer_num)); }else if(octet==1){ proto_tree_add_item(subtree, hf_gsm_map_dlci, (tvbuff_t*)actx->value_ptr, 1,1,ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_map_len, (tvbuff_t*)actx->value_ptr, 2,1,ENC_BIG_ENDIAN); @@ -783,7 +785,8 @@ if (!actx->value_ptr) octet = tvb_get_guint8((tvbuff_t*)actx->value_ptr,0); if ( octet == 0) {/* DISCRIMINATION TS 48 006 */ next_tvb = tvb_new_subset_remaining((tvbuff_t*)actx->value_ptr, 2); - dissect_bssmap(next_tvb, actx->pinfo, subtree); + call_dissector_with_data(bssap_handle, next_tvb, actx->pinfo, subtree, + p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_gsm_map, actx->pinfo->curr_layer_num)); } break; /* ets-300102-1 (~Q.931 ) */ @@ -850,7 +853,8 @@ if (!actx->value_ptr) /* Strip off discrimination and length */ proto_tree_add_item(subtree, hf_gsm_map_len, (tvbuff_t*)actx->value_ptr, 1,1,ENC_BIG_ENDIAN); next_tvb = tvb_new_subset_remaining((tvbuff_t*)actx->value_ptr, 2); - dissect_bssmap(next_tvb, actx->pinfo, subtree); + call_dissector_with_data(bssap_handle, next_tvb, actx->pinfo, subtree, + p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_gsm_map, actx->pinfo->curr_layer_num)); }else if(octet==1){ proto_tree_add_item(subtree, hf_gsm_map_dlci, (tvbuff_t*)actx->value_ptr, 1,1,ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_gsm_map_len, (tvbuff_t*)actx->value_ptr, 2,1,ENC_BIG_ENDIAN); @@ -863,7 +867,8 @@ if (!actx->value_ptr) octet = tvb_get_guint8((tvbuff_t*)actx->value_ptr,0); if ( octet == 0) {/* DISCRIMINATION TS 48 006 */ next_tvb = tvb_new_subset_remaining((tvbuff_t*)actx->value_ptr, 2); - dissect_bssmap(next_tvb, actx->pinfo, subtree); + call_dissector_with_data(bssap_handle, next_tvb, actx->pinfo, subtree, + p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_gsm_map, actx->pinfo->curr_layer_num)); } break; /* ets-300102-1 (~Q.931 ) */ |