osmocom
/
libosmo-gprs
mirror of https://gerrit.osmocom.org/libosmo-gprs
11
0
Fork 0
Code Releases Wiki Activity

sm: Use & forward to upper layers the PTMSI & TLLI received from GMM 

App and SM itself may need access to PTMSI or TLLI.

PTMSI:
- App may want to store it somewhere in order to reuse it next time
  it wants to GMM Attach.
TLLI:
- App will need the TLLI to identify the MS when sending/receiving
  primitives over SN SAP (app<->SNDCP).
- SM layer will need the TLLI to communicate over SNSM SAP (SM<->SNDCP),
  as well as relay the information to the app if the GMM Attach happens
  implicitly over SMREG-Act_Pdp_Ctx.req -> GMMSM-Establish-Req.

Change-Id: I7b1b8ac414474652b438f15b7f07961032a0f56d
This commit is contained in:
Pau Espin 2023-05-05 14:44:54 +02:00
parent 6979b511fb
commit 4c2f0ced47
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osmocom/gprs/sm/sm_prim.h
View File

@ -85,6 +85,10 @@ struct osmo_gprs_sm_smreg_prim {
uint8_t radio_prio; /* TS 24.008 10.5.7.2 */
uint8_t qos[OSMO_GPRS_SM_QOS_MAXLEN];
uint8_t qos_len;
struct {
uint32_t allocated_ptmsi;
uint32_t allocated_tlli;
} gmm;
} acc;
struct {
uint8_t cause;

1
include/osmocom/gprs/sm/sm_private.h
View File

@ -127,6 +127,7 @@ struct gprs_sm_ms {
struct {
uint32_t ptmsi;
uint32_t tlli;
char imsi[OSMO_IMSI_BUF_SIZE];
char imei[GSM23003_IMEI_NUM_DIGITS + 1];
char imeisv[GSM23003_IMEISV_NUM_DIGITS+1];

6
src/sm/sm.c
View File

@ -128,7 +128,7 @@ struct gprs_sm_ms *gprs_sm_find_ms_by_tlli(uint32_t tlli)
struct gprs_sm_ms *ms;
llist_for_each_entry(ms, &g_sm_ctx->ms_list, list) {
if (ms->gmm.ptmsi == tlli)
if (ms->gmm.tlli == tlli)
return ms;
}
return NULL;
@ -222,6 +222,8 @@ int gprs_sm_submit_smreg_pdp_act_cnf(const struct gprs_sm_entity *sme, enum gsm4
sm_prim_tx->smreg.pdp_act_cnf.acc.qos_len = sme->qos_len;
if (sme->qos_len)
memcpy(sm_prim_tx->smreg.pdp_act_cnf.acc.qos, &sme->qos, sme->qos_len);
sm_prim_tx->smreg.pdp_act_cnf.acc.gmm.allocated_ptmsi = sme->ms->gmm.ptmsi;
sm_prim_tx->smreg.pdp_act_cnf.acc.gmm.allocated_tlli = sme->ms->gmm.tlli;
} else {
sm_prim_tx->smreg.pdp_act_cnf.rej.cause = cause;
}
@ -237,7 +239,7 @@ int gprs_sm_submit_snsm_act_ind(const struct gprs_sm_entity *sme)
int rc;
sndcp_prim_tx = osmo_gprs_sndcp_prim_alloc_snsm_activate_ind(
sme->ms->gmm.ptmsi,
sme->ms->gmm.tlli,
sme->nsapi,
sme->llc_sapi);
//sndcp_prim_tx->snsm.activat_ind.qos_params = ; /* TODO */

17
src/sm/sm_prim.c
View File

@ -25,6 +25,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/core/utils.h>
#include <osmocom/core/logging.h>
#include <osmocom/gsm/gsm48.h>
#include <osmocom/gprs/sm/sm.h>
#include <osmocom/gprs/sm/sm_prim.h>
@ -466,17 +467,23 @@ static int gprs_sm_prim_handle_gmmsm_establish_cnf(struct osmo_gprs_gmm_prim *gm
{
struct osmo_gprs_gmm_gmmsm_prim *gmmsm = &gmm_prim->gmmsm;
struct gprs_sm_entity *sme;
int rc, ev;
int rc;
sme = gprs_sm_find_sme_by_sess_id(gmmsm->sess_id);
if (!sme) {
LOGSM(LOGL_ERROR, "Rx GMMSM-ESTABLISH.cnf for non existing SM Entity\n");
return -EINVAL;
}
ev = gmmsm->establish_cnf.accepted ?
GPRS_SM_MS_EV_RX_GMM_ESTABLISH_CNF : GPRS_SM_MS_EV_RX_GMM_ESTABLISH_REJ;
rc = osmo_fsm_inst_dispatch(sme->ms_fsm.fi, ev, NULL);
if (gmmsm->establish_cnf.accepted) {
/* Update allocated PTMSI: */
if (gmm_prim->gmmsm.establish_cnf.acc.allocated_ptmsi != GSM_RESERVED_TMSI)
sme->ms->gmm.ptmsi = gmm_prim->gmmsm.establish_cnf.acc.allocated_ptmsi;
/* Set allocated TLLI: */
sme->ms->gmm.tlli = gmm_prim->gmmsm.establish_cnf.acc.allocated_tlli;
rc = osmo_fsm_inst_dispatch(sme->ms_fsm.fi, GPRS_SM_MS_EV_RX_GMM_ESTABLISH_CNF, NULL);
} else {
rc = osmo_fsm_inst_dispatch(sme->ms_fsm.fi, GPRS_SM_MS_EV_RX_GMM_ESTABLISH_REJ, NULL);
}
return rc;
}