diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-06-19 20:47:56 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-06-19 20:02:07 +0000 |
| commit | 2d96da9b7f00b6c3a3339784b7716c54a831cdf3 (patch) | |
| tree | 5df2c364e12d41257ec1322c84a79d2572fa8bbc /epan/dissectors/packet-gsm_a_bssmap.c | |
| parent | 830bd41771b8cdf2ffc973beeff6f68908e150e0 (diff) | |
BSSMAP: Use correct IE number for Selected PLMN ID
Since IE number used to match during parsing is implied from enum
position, having those enum values commented out make
BE_SELECTED_PLMN_ID fall in the wrong position (expected 0x94), and thus
not matching it correctly during parse.
Enabling the not-yet fully supported IEs which were under "ifdef 0"
doesn't make the current situation worse than before, so let's simply
enable it and pass NULL as a function for those.
Change-Id: I70063e653acf588f3d07bb8900afa3a48e124d6d
Reviewed-on: https://code.wireshark.org/review/33667
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-gsm_a_bssmap.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_a_bssmap.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 7ba12becf0..d893515e07 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -332,12 +332,10 @@ static const value_string gsm_bssmap_elem_strings[] = { { BE_LCLS_BSS_STATUS, "LCLS-BSS-Status" }, /* 3.2.2.119 */ { BE_LCLS_BREAK_REQ, "LCLS-Break-Request" }, /* 3.2.2.120 */ { BE_CSFB_IND, "CSFB Indication" }, /* 3.2.2.121 */ -#if 0 { BE_CS_TO_PS_SRVCC, "CS to PS SRVCC" }, /* 3.2.2.122 */ - { BE_SRC_ENB_2_TGT_ENB_TRANSP_INF, "Source eNB to target eNB transparent information (E-UTRAN)" }, /*3.2.2.123 */ + { BE_SRC_ENB_2_TGT_ENB_TRANSP_INF, "Source eNB to target eNB transparent information (E-UTRAN)" }, /* 3.2.2.123 */ { BE_CS_TO_PS_SRVCC_IND, "CS to PS SRVCC Indication" }, /* 3.2.2.124 */ { BE_CN_TO_MS_TRANSP, "CN to MS transparent information" }, /* 3.2.2.125 */ -#endif { BE_SELECTED_PLMN_ID, "Selected PLMN ID" }, /* 3.2.2.126 */ { 0, NULL } }; @@ -4521,12 +4519,10 @@ guint16 (*bssmap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo be_lcls_bss_status, /* LCLS-BSS-Status 3.2.2.119 */ NULL, /* LCLS-Break-Request 3.2.2.120 No data */ NULL, /* CSFB Indication 3.2.2.121 No data */ -#if 0 - BE_CS_TO_PS_SRVCC, /* CS to PS SRVCC 3.2.2.122 */ - BE_SRC_ENB_2_TGT_ENB_TRANSP_INF, /* Source eNB to target eNB transparent information (E-UTRAN)" 3.2.2.123 */ - BE_CS_TO_PS_SRVCC_IND, /* CS to PS SRVCC Indication 3.2.2.124 */ - BE_CN_TO_MS_TRANSP, /* CN to MS transparent information 3.2.2.125 */ -#endif + NULL, /* CS to PS SRVCC 3.2.2.122 */ + NULL, /* Source eNB to target eNB transparent information (E-UTRAN)" 3.2.2.123 */ + NULL, /* CS to PS SRVCC Indication 3.2.2.124 */ + NULL, /* CN to MS transparent information 3.2.2.125 */ be_selected_plmn_id, /* Selected PLMN ID 3.2.2.126 */ NULL /* NONE */ |