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

gsm_a_bssmap: Add LCLS specific PDU dissection 

LCLS information element decoding had been added to the gsm_a_bssmap
dissector before.  Hoewver, they were only parsed in the existing
PDU types such as ASSIGNMENT REQ / COMPLETE.

LCLS introduced the three new LCLS specific PDUs, which we must also
handle from the dissector.  Let's do that.

Change-Id: I6a57b1eaf326fa12438639418f1255b733c10d36
Signed-off-by: Harald Welte <laforge@gnumonks.org>
Reviewed-on: https://code.wireshark.org/review/27941
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Harald Welte 2018-06-01 14:36:23 +02:00 committed by Anders Broman
parent b5f36fed86
commit 2235c89e0c
1 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
epan/dissectors/packet-gsm_a_bssmap.c
View File

@ -6956,31 +6956,69 @@ bssmap_reroute_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_gsm_a_bssmap_extraneous_data);
}
#if 0
/*
* 3.2.1.91 LCLS-CONNECT-CONTROL
*/
static void
bssmap_lcls_conn_ctrl(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len)
{
guint32 curr_offset;
guint32 consumed;
guint curr_len;
curr_offset = offset;
curr_len = len;
/* LCLS-Configuration 3.2.2.116 MSC-BSS O (note1) 2 */
/* ELEM_OPT_TV(BE_LCLS_CONF, GSM_A_PDU_TYPE_BSSMAP, BE_LCLS_CONF, NULL); */
ELEM_OPT_TV(BE_LCLS_CONF, GSM_A_PDU_TYPE_BSSMAP, BE_LCLS_CONF, NULL);
/* LCLS-Connection-Status-Control 3.2.2.117 MSC-BSS O (note1) 2 */
/* ELEM_OPT_TV(BE_LCLS_CON_STATUS_CONTROL, GSM_A_PDU_TYPE_BSSMAP, BE_LCLS_CON_STATUS_CONTROL, NULL); */
ELEM_OPT_TV(BE_LCLS_CON_STATUS_CONTROL, GSM_A_PDU_TYPE_BSSMAP, BE_LCLS_CON_STATUS_CONTROL, NULL);
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_gsm_a_bssmap_extraneous_data);
}
/*
* 3.2.1.92 LCLS-CONNECT-CONTROL-ACK
*/
static void
bssmap_lcls_conn_ctrl_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len)
{
guint32 curr_offset;
guint32 consumed;
guint curr_len;
curr_offset = offset;
curr_len = len;
/* LCLS-BSS-Status 3.2.2.119 BSS-MSC M 2 */
ELEM_OPT_TV(BE_LCLS_BSS_STATUS, GSM_A_PDU_TYPE_BSSMAP, BE_LCLS_BSS_STATUS, NULL);
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_gsm_a_bssmap_extraneous_data);
}
/*
*
* 3.2.1.93 LCLS-NOTIFICATION
*/
static void
bssmap_lcls_notif(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len)
{
guint32 curr_offset;
guint32 consumed;
guint curr_len;
curr_offset = offset;
curr_len = len;
/* LCLS-BSS-Status 3.2.2.119 BSS-MSC O (note 1) 2 */
/* ELEM_OPT_TV(BE_LCLS_BSS_STATUS, GSM_A_PDU_TYPE_BSSMAP, BE_LCLS_BSS_STATUS, NULL);*/
ELEM_OPT_TV(BE_LCLS_BSS_STATUS, GSM_A_PDU_TYPE_BSSMAP, BE_LCLS_BSS_STATUS, NULL);
/* LCLS-Break-Request 3.2.2.120 BSS-MSC O (note 1) 1 */
ELEM_OPT_T(BE_LCLS_BREAK_REQ, GSM_A_PDU_TYPE_BSSMAP, BE_LCLS_BREAK_REQ, NULL);
EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_gsm_a_bssmap_extraneous_data);
}
#if 0
/*
* 3.2.1.94 MS REGISTRATION ENQUIRY
*/
@ -7120,9 +7158,9 @@ static void (*bssmap_msg_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pi
bssmap_int_ho_cmd, /* 0x72 Internal Handover Command */
bssmap_int_ho_enq, /* 0x73 Internal Handover Enquiry */
NULL, /* 0x74 LCLS-Connect-Control */
NULL, /* 0x75 LCLS-Connect-Control-Ack */
NULL, /* 0x76 LCLS-Notification */
bssmap_lcls_conn_ctrl, /* 0x74 LCLS-Connect-Control */
bssmap_lcls_conn_ctrl_ack, /* 0x75 LCLS-Connect-Control-Ack */
bssmap_lcls_notif, /* 0x76 LCLS-Notification */
NULL, /* 0x77 Unallocated */
bssmap_reroute_cmd, /* 0x78 Reroute Command */
bssmap_reroute_complete, /* 0x79 Reroute Complete */