osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Register Ericsson P-GSL + TFP as GSM LAPD SAPI 

The use of LAPD SAPI 10/11/12 for TFP + P-GSL is of course not
any official standard, but it's a decade-old defacto usage of said
SAPIs when using an A-bis Superchannel either over TDM/E1 or over
L2TP/IP.

As there never were any official/specified users of LAPD SAPI 10/11/12,
and it's virtually impossible for anyone add them due to the historic
nature of GSM, I believe it's safe to add them simply as default.

Change-Id: I0622e486013c7287f967e6b3ab09c9f211edbd71
Reviewed-on: https://code.wireshark.org/review/35836
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Harald Welte 2020-01-15 23:19:38 +01:00 committed by Alexis La Goutte
parent dab167cb9f
commit 16ebca009a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ enum {
SUB_MAX
};
static dissector_handle_t pgsl_handle;
static dissector_handle_t sub_handles[SUB_MAX];
/* initialize the protocol and registered fields */
@ -690,7 +691,7 @@ proto_register_abis_pgsl(void)
proto_register_field_array(proto_abis_pgsl, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
register_dissector("gsm_abis_pgsl", dissect_abis_pgsl, proto_abis_pgsl);
pgsl_handle = register_dissector("gsm_abis_pgsl", dissect_abis_pgsl, proto_abis_pgsl);
}
/* This function is called once at startup and every time the user hits
@ -698,6 +699,10 @@ proto_register_abis_pgsl(void)
void
proto_reg_handoff_abis_pgsl(void)
{
/* The SAPI value 12 is a non-standard values, not specified by
* ETSI/3GPP, just like this very same protocol. */
dissector_add_uint("lapd.gsm.sapi", 12, pgsl_handle);
sub_handles[SUB_RLCMAC_UL] = find_dissector("gsm_rlcmac_ul");
sub_handles[SUB_RLCMAC_DL] = find_dissector("gsm_rlcmac_dl");
}

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

@ -29,6 +29,7 @@ enum {
SUB_MAX
};
static dissector_handle_t tfp_handle;
static dissector_handle_t sub_handles[SUB_MAX];
/* initialize the protocol and registered fields */
@ -219,7 +220,7 @@ proto_register_abis_tfp(void)
proto_register_field_array(proto_abis_tfp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
register_dissector("gsm_abis_tfp", dissect_abis_tfp, proto_abis_tfp);
tfp_handle = register_dissector("gsm_abis_tfp", dissect_abis_tfp, proto_abis_tfp);
}
/* This function is called once at startup and every time the user hits
@ -227,6 +228,10 @@ proto_register_abis_tfp(void)
void
proto_reg_handoff_abis_tfp(void)
{
/* Those two SAPI values 10/11 are non-standard values, not specified by
* ETSI/3GPP, just like this very same protocol. */
dissector_add_uint("lapd.gsm.sapi", 10, tfp_handle);
dissector_add_uint("lapd.gsm.sapi", 11, tfp_handle);
sub_handles[SUB_DATA] = find_dissector("data");
}