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

From Sylvain Munaut: Call the new dissector from the GSMTap dissector for GMR-1 channels using LAPSat 

svn path=/trunk/; revision=41405
This commit is contained in:
Anders Broman 2012-03-07 20:09:48 +00:00
parent 85f62ed29e
commit 8bcc324c83
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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_LAPSAT,
GSMTAP_SUB_MAX
};
@ -603,6 +604,12 @@ 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_SDCCH:
case GSMTAP_GMR1_TCH3 | GSMTAP_GMR1_FACCH:
case GSMTAP_GMR1_TCH6 | GSMTAP_GMR1_FACCH:
case GSMTAP_GMR1_TCH9 | GSMTAP_GMR1_FACCH:
sub_handle = GSMTAP_SUB_GMR1_LAPSAT;
break;
default:
sub_handle = GSMTAP_SUB_DATA;
break;
@ -697,6 +704,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_LAPSAT] = find_dissector("lapsat");
gsmtap_handle = create_dissector_handle(dissect_gsmtap, proto_gsmtap);
dissector_add_uint("udp.port", GSMTAP_UDP_PORT, gsmtap_handle);
}