osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Sylvain Munaut: 

packet-gsmtap: Call the GMR-1 CCCH dissector when appropriate  (Step 3).

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6921

svn path=/trunk/; revision=41449
This commit is contained in:
Anders Broman 2012-03-09 12:33:16 +00:00
parent 017351556b
commit 2bc1d9f874
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-gsmtap.c
View File

@ -227,6 +227,7 @@ enum {
GSMTAP_SUB_SIM,
/* GMR-1 sub handles */
GSMTAP_SUB_GMR1_BCCH,
GSMTAP_SUB_GMR1_CCCH,
GSMTAP_SUB_GMR1_LAPSAT,
GSMTAP_SUB_MAX
@ -604,6 +605,11 @@ dissect_gsmtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case GSMTAP_GMR1_BCCH:
sub_handle = GSMTAP_SUB_GMR1_BCCH;
break;
case GSMTAP_GMR1_CCCH:
case GSMTAP_GMR1_AGCH:
case GSMTAP_GMR1_PCH:
sub_handle = GSMTAP_SUB_GMR1_CCCH;
break;
case GSMTAP_GMR1_SDCCH:
case GSMTAP_GMR1_TCH3 | GSMTAP_GMR1_FACCH:
case GSMTAP_GMR1_TCH6 | GSMTAP_GMR1_FACCH:
@ -704,6 +710,7 @@ proto_reg_handoff_gsmtap(void)
sub_handles[GSMTAP_SUB_PHY_ATTRIBUTES] = find_dissector("wimax_phy_attributes_burst_handler");
sub_handles[GSMTAP_SUB_CBCH] = find_dissector("gsm_cbch");
sub_handles[GSMTAP_SUB_GMR1_BCCH] = find_dissector("gmr1_bcch");
sub_handles[GSMTAP_SUB_GMR1_CCCH] = find_dissector("gmr1_ccch");
sub_handles[GSMTAP_SUB_GMR1_LAPSAT] = find_dissector("lapsat");
gsmtap_handle = create_dissector_handle(dissect_gsmtap, proto_gsmtap);
dissector_add_uint("udp.port", GSMTAP_UDP_PORT, gsmtap_handle);