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

GSUP/SMS: add READY-FOR-SM message decoding 

According to 3GPP TS 29.002, section 12.4, MAP-READY-FOR-SM is
used between the MSC and VLR as well as between the VLR and the
HLR to indicate that a subscriber has memory available for SMS.

This change replicates this service in GSUP as READY_FOR_SM_*.
The only mandatory IE for this service (excluding Invoke ID) is
'Alert Reason' that is replicated by OSMO_GSUP_SM_ALERT_RSN_IE.

For more information, please see:

https://git.osmocom.org/libosmocore/commit/?id=f9ee8da0cda6a8989c706e618915d09c9cffd0f4
https://git.osmocom.org/osmo-gsm-manuals/commit/?id=d1596fe75aba94e485b1dfcee32328086bf54e22

Change-Id: Ie7591066af7446b2df8bfdb03ef790b4478d2bc9
Reviewed-on: https://code.wireshark.org/review/30587
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:
Vadim Yanitskiy 2018-11-13 02:45:15 +07:00 committed by Anders Broman
parent d749beafb9
commit 9b882af449
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
epan/dissectors/packet-gsm_gsup.c
View File

@ -95,6 +95,7 @@ enum osmo_gsup_iei {
OSMO_GSUP_SM_RP_UI_IE = 0x43,
OSMO_GSUP_SM_RP_CAUSE_IE = 0x44,
OSMO_GSUP_SM_RP_MMS_IE = 0x45,
OSMO_GSUP_SM_ALERT_RSN_IE = 0x46,
};
/*! GSUP message type */
@ -136,6 +137,10 @@ enum osmo_gsup_message_type {
OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST = 0x28,
OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR = 0x29,
OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT = 0x2a,
OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST = 0x2c,
OSMO_GSUP_MSGT_READY_FOR_SM_ERROR = 0x2d,
OSMO_GSUP_MSGT_READY_FOR_SM_RESULT = 0x2e,
};
#define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00)
@ -169,6 +174,13 @@ enum osmo_gsup_sms_sm_rp_oda_type {
OSMO_GSUP_SMS_SM_RP_ODA_NULL = 0xff,
};
/* SM Alert Reason values */
enum osmo_gsup_sms_sm_alert_rsn_t {
OSMO_GSUP_SMS_SM_ALERT_RSN_NONE = 0x00,
OSMO_GSUP_SMS_SM_ALERT_RSN_MS_PRESENT = 0x01,
OSMO_GSUP_SMS_SM_ALERT_RSN_MEM_AVAIL = 0x02,
};
/***********************************************************************
* Wireshark Dissector Implementation
***********************************************************************/
@ -205,6 +217,7 @@ static int hf_gsup_sm_rp_da_id_type = -1;
static int hf_gsup_sm_rp_oa_id_type = -1;
static int hf_gsup_sm_rp_cause = -1;
static int hf_gsup_sm_rp_mms = -1;
static int hf_gsup_sm_alert_rsn = -1;
static gint ett_gsup = -1;
static gint ett_gsup_ie = -1;
@ -248,6 +261,7 @@ static const value_string gsup_iei_types[] = {
{ OSMO_GSUP_SM_RP_UI_IE, "SM-RP-UI (SMS TPDU)" },
{ OSMO_GSUP_SM_RP_CAUSE_IE, "SM-RP-Cause" },
{ OSMO_GSUP_SM_RP_MMS_IE, "SM-RP-MMS (More Messages to Send)" },
{ OSMO_GSUP_SM_ALERT_RSN_IE, "SM Alert Reason" },
{ 0, NULL }
};
@ -280,6 +294,9 @@ static const value_string gsup_msg_types[] = {
{ OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST, "MT-forwardSM Request" },
{ OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, "MT-forwardSM Error" },
{ OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, "MT-forwardSM Result" },
{ OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST, "Ready for SM Request"},
{ OSMO_GSUP_MSGT_READY_FOR_SM_ERROR, "Ready for SM Error"},
{ OSMO_GSUP_MSGT_READY_FOR_SM_RESULT, "Ready for SM Result"},
{ 0, NULL }
};
@ -312,6 +329,13 @@ static const value_string osmo_gsup_sms_sm_rp_oda_types[] = {
{ 0, NULL }
};
static const value_string osmo_gsup_sms_sm_alert_rsn_types[] = {
{ OSMO_GSUP_SMS_SM_ALERT_RSN_NONE, "NONE" },
{ OSMO_GSUP_SMS_SM_ALERT_RSN_MS_PRESENT, "MS Present" },
{ OSMO_GSUP_SMS_SM_ALERT_RSN_MEM_AVAIL, "Memory Available (SMMA)" },
{ 0, NULL }
};
static void dissect_ss_info_ie(tvbuff_t *tvb, packet_info *pinfo, guint offset, guint len, proto_tree *tree)
{
guint saved_offset;
@ -586,6 +610,9 @@ dissect_gsup_tlvs(tvbuff_t *tvb, int base_offs, int length, packet_info *pinfo,
case OSMO_GSUP_SM_RP_MMS_IE:
proto_tree_add_item(att_tree, hf_gsup_sm_rp_mms, tvb, offset, len, ENC_NA);
break;
case OSMO_GSUP_SM_ALERT_RSN_IE:
proto_tree_add_item(att_tree, hf_gsup_sm_alert_rsn, tvb, offset, len, ENC_NA);
break;
case OSMO_GSUP_HLR_NUMBER_IE:
case OSMO_GSUP_PDP_TYPE_IE:
case OSMO_GSUP_PDP_QOS_IE:
@ -695,6 +722,8 @@ proto_register_gsup(void)
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_gsup_sm_rp_mms, { "More Messages to Send", "gsup.sm_rp.mms",
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_gsup_sm_alert_rsn, { "SM Alert Reason", "gsup.sm_alert_rsn",
FT_UINT8, BASE_DEC, VALS(osmo_gsup_sms_sm_alert_rsn_types), 0, NULL, HFILL } },
};
static gint *ett[] = {
&ett_gsup,