May 2023 - gerrit-log - lists.osmocom.org

[L] Change in osmo-bsc[master]: ctrl: drop deprecated neighbor resolution interface

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32277 ) Change subject: ctrl: drop deprecated neighbor resolution interface ...................................................................... Patch Set 9: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I93e25856eede4b2f5aa36d8a16714b43d37b4fd0 Gerrit-Change-Number: 32277 Gerrit-PatchSet: 9 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 14:37:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: deps/Makefile: Change remote gerrit->gitea for titan.ProtocolModules....

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32601 ) Change subject: deps/Makefile: Change remote gerrit->gitea for titan.ProtocolModules.BSSMAP ...................................................................... deps/Makefile: Change remote gerrit->gitea for titan.ProtocolModules.BSSMAP It was decided that the preferred way to maintain our eclipse titan forked repos is through gitea, not through gerrit. Hence, update the remote to point to the gitea repo. The gerrit one will probably be removed at some point. Related: OS#6011 Change-Id: I69f8e207a28b8ea424d8fa4f23bdcaa3ba2e1345 --- M deps/Makefile 1 file changed, 18 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/deps/Makefile b/deps/Makefile index b8b072e..d4f209a 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -67,10 +67,10 @@ titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.BSSGP_v13.0.0 -OSMOGERRIT_REPOS= titan.ProtocolModules.BSSMAP \ - osmo-uecups +OSMOGERRIT_REPOS= osmo-uecups -OSMOGITEA_REPOS= titan.ProtocolModules.MAP \ +OSMOGITEA_REPOS= titan.ProtocolModules.BSSMAP \ + titan.ProtocolModules.MAP \ titan.TestPorts.USB \ titan.TestPorts.AF_PACKET -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I69f8e207a28b8ea424d8fa4f23bdcaa3ba2e1345 Gerrit-Change-Number: 32601 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: deps/Makefile: Change remote gerrit->gitea for titan.ProtocolModules....

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32601 ) Change subject: deps/Makefile: Change remote gerrit->gitea for titan.ProtocolModules.BSSMAP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I69f8e207a28b8ea424d8fa4f23bdcaa3ba2e1345 Gerrit-Change-Number: 32601 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 14:34:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: bbtransc/rcarrier: Fix statechg done twice upon NM_EV_RX_OPSTART

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32603 ) Change subject: bbtransc/rcarrier: Fix statechg done twice upon NM_EV_RX_OPSTART ...................................................................... bbtransc/rcarrier: Fix statechg done twice upon NM_EV_RX_OPSTART When the NM_EV_RX_OPSTART event is received, it will call bts model specific function bts_model_opstart(), which is responisble for answering back with NM_EV_OPSTART_ACK or NM_EV_OPSTART_NACK. Since that answer could be done sequentially in same callback code path, we could end up twice at the end of the st_op_disabled_offline() function checking for statechg (due to reentring that function). As a result, one can see the following message appear during OML bring up: nm_bb_transc_fsm.c:185 NM_BBTRANSC_OP(bts0-trx0){ENABLED}: transition to state ENABLED not permitted! Fix the issue by avoiding ending up at the end of the function in code paths which should not be triggering any change. The case of bbtransc is a bit different than that of rcarrier for NM_EV_RX_SETATTR, since the former really doesn't receive any such message from the BSC yet, so if we checked for that one before continuing, it would never go on. Change-Id: I5184a33dd8da9244e8aacf3ab8bb8930f732a136 --- M src/common/nm_bb_transc_fsm.c M src/common/nm_radio_carrier_fsm.c 2 files changed, 30 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index d42130a..57ccdfa 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -136,7 +136,7 @@ &bb_transc->mo, bb_transc); bb_transc->mo.setattr_success = rc == 0; oml_fom_ack_nack_copy_msg(setattr_data->msg, rc); - break; + return; case NM_EV_RX_OPSTART: #if 0 /* Disabled because osmo-bsc doesn't send SetAttr on BB_TRANSC object */ @@ -146,7 +146,7 @@ } #endif bts_model_opstart(trx->bts, &bb_transc->mo, bb_transc); - break; + return; case NM_EV_OPSTART_ACK: bb_transc->mo.opstart_success = true; oml_mo_opstart_ack(&bb_transc->mo); diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index d7590bc..851f71c 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -120,14 +120,14 @@ &trx->mo, trx); trx->mo.setattr_success = rc == 0; oml_fom_ack_nack_copy_msg(setattr_data->msg, rc); - break; + break; /* check statechg below */ case NM_EV_RX_OPSTART: if (!trx->mo.setattr_success) { oml_mo_opstart_nack(&trx->mo, NM_NACK_CANT_PERFORM); return; } bts_model_opstart(trx->bts, &trx->mo, trx); - break; + return; case NM_EV_OPSTART_ACK: trx->mo.opstart_success = true; oml_mo_opstart_ack(&trx->mo); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5184a33dd8da9244e8aacf3ab8bb8930f732a136 Gerrit-Change-Number: 32603 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: bbtransc/rcarrier: Fix statechg done twice upon NM_EV_RX_OPSTART

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32603 ) Change subject: bbtransc/rcarrier: Fix statechg done twice upon NM_EV_RX_OPSTART ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5184a33dd8da9244e8aacf3ab8bb8930f732a136 Gerrit-Change-Number: 32603 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 14:33:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Use in SN SAP the TLLI retrieved from GMM

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32637 ) Change subject: layer23: modem: Use in SN SAP the TLLI retrieved from GMM ...................................................................... layer23: modem: Use in SN SAP the TLLI retrieved from GMM Depends: libosmo-gprs.git Change-Id I7b1b8ac414474652b438f15b7f07961032a0f56d Change-Id: Icac16626a6b89489b7f1ee2ab8ffbaca04e8bacc --- M src/host/layer23/include/osmocom/bb/common/ms.h M src/host/layer23/src/common/ms.c M src/host/layer23/src/modem/gmm.c M src/host/layer23/src/modem/sm.c M src/host/layer23/src/modem/sndcp.c 5 files changed, 37 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/32637/1 diff --git a/src/host/layer23/include/osmocom/bb/common/ms.h b/src/host/layer23/include/osmocom/bb/common/ms.h index d9c6255..bfbf879 100644 --- a/src/host/layer23/include/osmocom/bb/common/ms.h +++ b/src/host/layer23/include/osmocom/bb/common/ms.h @@ -24,6 +24,7 @@ uint8_t ac_ref_nr; uint8_t key_seq; uint8_t rand[16]; + uint32_t tlli; }; struct osmosap_entity { diff --git a/src/host/layer23/src/common/ms.c b/src/host/layer23/src/common/ms.c index 4b1440e..f03427c 100644 --- a/src/host/layer23/src/common/ms.c +++ b/src/host/layer23/src/common/ms.c @@ -16,6 +16,7 @@ * GNU General Public License for more details. * */ +#include <osmocom/gsm/gsm48.h> #include <osmocom/bb/common/ms.h> @@ -54,6 +55,8 @@ ms->l2_wq.bfd.fd = -1; ms->sap_wq.bfd.fd = -1; + ms->gmmlayer.tlli = GSM_RESERVED_TMSI; + /* Register a new MS */ llist_add_tail(&ms->entity, &ms_list); diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index b95f15a..b283192 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -62,6 +62,7 @@ LOGP(DGMM, LOGL_NOTICE, "%s(): Rx %s: Attach success P-TMSI=0x%08x\n", __func__, pdu_name, gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi); ms->subscr.ptmsi = gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi; + ms->gmmlayer.tlli = gmm_prim->gmmreg.attach_cnf.acc.allocated_tlli; app_data.modem_state = MODEM_ST_ATTACHED; /* Activate APN if not yet already: */ llist_for_each_entry(apn, &ms->gprs.apn_list, list) { diff --git a/src/host/layer23/src/modem/sm.c b/src/host/layer23/src/modem/sm.c index 03982c6..63f922a 100644 --- a/src/host/layer23/src/modem/sm.c +++ b/src/host/layer23/src/modem/sm.c @@ -76,6 +76,9 @@ return 0; } + ms->subscr.ptmsi = sm_prim->smreg.pdp_act_cnf.acc.gmm.allocated_ptmsi; + ms->gmmlayer.tlli = sm_prim->smreg.pdp_act_cnf.acc.gmm.allocated_tlli; + netdev = osmo_tundev_get_netdev(apn->tun); switch (sm_prim->smreg.pdp_act_cnf.acc.pdp_addr_ietf_type) { case OSMO_GPRS_SM_PDP_ADDR_IETF_IPV4: diff --git a/src/host/layer23/src/modem/sndcp.c b/src/host/layer23/src/modem/sndcp.c index 7814e50..34b85af 100644 --- a/src/host/layer23/src/modem/sndcp.c +++ b/src/host/layer23/src/modem/sndcp.c @@ -75,7 +75,7 @@ static int modem_sndcp_prim_up_cb(struct osmo_gprs_sndcp_prim *sndcp_prim, void *user_data) { struct osmocom_ms *ms = user_data; - struct osmobb_apn *apn; + struct osmobb_apn *apn = NULL, *apn_it; const char *npdu_name = osmo_gprs_sndcp_prim_name(sndcp_prim); int rc = 0; @@ -84,8 +84,17 @@ OSMO_ASSERT(0); } - /* TODO: properly retrieve APN/PDP based on TLLI/SAPI/NSAPI: */ - apn = llist_first_entry_or_null(&ms->gprs.apn_list, struct osmobb_apn, list); + if (ms->gmmlayer.tlli != sndcp_prim->sn.tlli) { + LOGP(DSNDCP, LOGL_ERROR, "%s(): Rx %s: MS has no TLLI=0x%08x\n", __func__, npdu_name, sndcp_prim->sn.tlli); + return -ENOENT; + } + + llist_for_each_entry(apn_it, &ms->gprs.apn_list, list) { + if (apn_it->pdp.nsapi != sndcp_prim->sn.unitdata_ind.nsapi) + continue; + apn = apn_it; + break; + } if (!apn) { LOGP(DSNDCP, LOGL_NOTICE, "Unable to find destination APN: Rx %s\n", npdu_name); return -ENODEV; @@ -179,10 +188,9 @@ struct osmocom_ms *ms = apn->ms; struct gprs_settings *set = &ms->gprs; - /* TODO: look up PDP context IDs from ms once we have GMM layer. */ - uint32_t tlli = 0xe1c5d364; - - sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_xid_req(tlli, apn->pdp.llc_sapi, apn->pdp.nsapi); + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_xid_req(ms->gmmlayer.tlli, + apn->pdp.llc_sapi, + apn->pdp.nsapi); OSMO_ASSERT(sndcp_prim); sndcp_prim->sn.xid_req.pcomp_rfc1144.active = set->pcomp_rfc1144.active; sndcp_prim->sn.xid_req.pcomp_rfc1144.s01 = set->pcomp_rfc1144.s01; @@ -199,10 +207,10 @@ struct osmo_gprs_sndcp_prim *sndcp_prim; int rc; - /* TODO: look up PDP context IDs from apn->ms once we have GMM layer. */ - uint32_t tlli = 0xe1c5d364; - - sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_unitdata_req(tlli, apn->pdp.llc_sapi, apn->pdp.nsapi, npdu, npdu_len); + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_unitdata_req(apn->ms->gmmlayer.tlli, + apn->pdp.llc_sapi, + apn->pdp.nsapi, + npdu, npdu_len); OSMO_ASSERT(sndcp_prim); rc = osmo_gprs_sndcp_prim_upper_down(sndcp_prim); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icac16626a6b89489b7f1ee2ab8ffbaca04e8bacc Gerrit-Change-Number: 32637 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Provide allocated PTMSI & TLLI to upper layers

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32635 ) Change subject: gmm: Provide allocated PTMSI & TLLI to upper layers ...................................................................... gmm: Provide allocated PTMSI & TLLI to upper layers Upper layers (SM or app) 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: I552c43c55409773e2d13b72cba45a866165f203f --- M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c M src/gmm/gmm_prim.c 5 files changed, 35 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/35/32635/1 diff --git a/include/osmocom/gprs/gmm/gmm_prim.h b/include/osmocom/gprs/gmm/gmm_prim.h index 7e50c58..42dc90a 100644 --- a/include/osmocom/gprs/gmm/gmm_prim.h +++ b/include/osmocom/gprs/gmm/gmm_prim.h @@ -117,6 +117,7 @@ struct { /* PLMNs MT-caps, attach-type. */ uint32_t allocated_ptmsi; + uint32_t allocated_tlli; } acc; struct { uint8_t cause; /* See enum gsm48_gsm_cause */ @@ -219,6 +220,8 @@ union { struct { /* PLMNs MT-caps, attach-type. */ + uint32_t allocated_ptmsi; + uint32_t allocated_tlli; } acc; struct { uint8_t cause; diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h index df97e1d..57658e9 100644 --- a/include/osmocom/gprs/gmm/gmm_private.h +++ b/include/osmocom/gprs/gmm/gmm_private.h @@ -118,7 +118,7 @@ int gprs_gmm_tx_ciph_auth_resp(const struct gprs_gmm_entity *gmme, const uint8_t *sres); int gprs_gmm_submit_gmmreg_attach_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause); -int gprs_gmm_submit_gmmsm_establish_cnf(struct gprs_gmm_entity *gmme, uint32_t sess_id, bool accepted, uint8_t cause); +int gprs_gmm_submit_gmmsm_establish_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause); int gprs_gmm_submit_llgmm_assing_req(const struct gprs_gmm_entity *gmme); #define LOGGMME(gmme, level, fmt, args...) \ diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 0070dda..faba983 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -288,6 +288,7 @@ gmm_prim_tx->gmmreg.attach_cnf.accepted = accepted; if (accepted) { gmm_prim_tx->gmmreg.attach_cnf.acc.allocated_ptmsi = gmme->ptmsi; + gmm_prim_tx->gmmreg.attach_cnf.acc.allocated_tlli = gmme->tlli; } else { gmm_prim_tx->gmmreg.attach_cnf.rej.cause = cause; } @@ -323,12 +324,16 @@ return rc; } -int gprs_gmm_submit_gmmsm_establish_cnf(struct gprs_gmm_entity *gmme, uint32_t sess_id, bool accepted, uint8_t cause) +int gprs_gmm_submit_gmmsm_establish_cnf(struct gprs_gmm_entity *gmme, bool accepted, uint8_t cause) { struct osmo_gprs_gmm_prim *gmm_prim_tx; int rc; - gmm_prim_tx = gprs_gmm_prim_alloc_gmmsm_establish_cnf(sess_id, cause); + gmm_prim_tx = gprs_gmm_prim_alloc_gmmsm_establish_cnf(gmme->sess_id, cause); + if (accepted) { + gmm_prim_tx->gmmsm.establish_cnf.acc.allocated_ptmsi = gmme->ptmsi; + gmm_prim_tx->gmmsm.establish_cnf.acc.allocated_tlli = gmme->tlli; + } rc = gprs_gmm_prim_call_up_cb(gmm_prim_tx); return rc; diff --git a/src/gmm/gmm_ms_fsm.c b/src/gmm/gmm_ms_fsm.c index f553ad3..053f8fc 100644 --- a/src/gmm/gmm_ms_fsm.c +++ b/src/gmm/gmm_ms_fsm.c @@ -129,9 +129,7 @@ if (att.implicit_att) { /* Submit GMMSM-ESTABLISH-CNF as per TS 24.007 Annex C.3 */ - rc = gprs_gmm_submit_gmmsm_establish_cnf(ctx->gmme, - ctx->gmme->sess_id, - false, cause); + rc = gprs_gmm_submit_gmmsm_establish_cnf(ctx->gmme, false, cause); if (rc < 0) return; } @@ -147,7 +145,7 @@ } if (ctx->attach.implicit_att) { /* Submit GMMSM-ESTABLISH-CNF as per TS 24.007 Annex C.3 */ - rc = gprs_gmm_submit_gmmsm_establish_cnf(ctx->gmme, ctx->gmme->sess_id, true, 0); + rc = gprs_gmm_submit_gmmsm_establish_cnf(ctx->gmme, true, 0); if (rc < 0) return; } diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index 573b568..ed8fed6 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -489,7 +489,7 @@ gmme->sess_id = gmm_prim->gmmsm.sess_id; if (gmme->ms_fsm.fi->state == GPRS_GMM_MS_ST_REGISTERED) { - rc = gprs_gmm_submit_gmmsm_establish_cnf(gmme, gmm_prim->gmmsm.sess_id, true, 0); + rc = gprs_gmm_submit_gmmsm_establish_cnf(gmme, true, 0); return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I552c43c55409773e2d13b72cba45a866165f203f Gerrit-Change-Number: 32635 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: sm: Use & forward to upper layers the PTMSI & TLLI received from GMM

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32636 ) Change subject: sm: Use & forward to upper layers the PTMSI & TLLI received from GMM ...................................................................... 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 --- M include/osmocom/gprs/sm/sm_prim.h M include/osmocom/gprs/sm/sm_private.h M src/sm/sm.c M src/sm/sm_prim.c 4 files changed, 42 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/36/32636/1 diff --git a/include/osmocom/gprs/sm/sm_prim.h b/include/osmocom/gprs/sm/sm_prim.h index 86a36d2..baa85ed 100644 --- a/include/osmocom/gprs/sm/sm_prim.h +++ b/include/osmocom/gprs/sm/sm_prim.h @@ -85,6 +85,10 @@ 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; diff --git a/include/osmocom/gprs/sm/sm_private.h b/include/osmocom/gprs/sm/sm_private.h index 163014e..99beaeb 100644 --- a/include/osmocom/gprs/sm/sm_private.h +++ b/include/osmocom/gprs/sm/sm_private.h @@ -127,6 +127,7 @@ 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]; diff --git a/src/sm/sm.c b/src/sm/sm.c index 1f87f4e..3cddb58 100644 --- a/src/sm/sm.c +++ b/src/sm/sm.c @@ -128,7 +128,7 @@ 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 @@ 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 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 */ diff --git a/src/sm/sm_prim.c b/src/sm/sm_prim.c index c0fbca4..bb5653e 100644 --- a/src/sm/sm_prim.c +++ b/src/sm/sm_prim.c @@ -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 @@ { 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; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7b1b8ac414474652b438f15b7f07961032a0f56d Gerrit-Change-Number: 32636 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in libosmocore[master]: tests: Add initial osmo_io tests

by daniel

Attention is currently required from: laforge, fixeria, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32181 ) Change subject: tests: Add initial osmo_io tests ...................................................................... Patch Set 10: (1 comment) File tests/osmo_io/osmo_io_test.c: https://gerrit.osmocom.org/c/libosmocore/+/32181/comment/3ba1e750_b3c9ef04 PS9, Line 95: for (int i = 0; i < 128; i++) > Huh? Not sure about "we". I think we don't since we bumped the `-std` to `gnu11`. […] I would like to keep those as is tbh. I was happy once we moved to a c std that supports those and I think it has other advantages as not cluttering the surrounding scope, you can't forget to remove the variable if you remove the loop. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia67629e53f4d2e5784177250d58e268fdfcaa0c2 Gerrit-Change-Number: 32181 Gerrit-PatchSet: 10 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 14:03:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in libosmocore[master]: gpsr_ns2_udp: Use osmo_io_fd instead of osmo_fd

by daniel

Attention is currently required from: laforge, pespin, lynxis lazus. Hello Jenkins Builder, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/30936 to look at the new patch set (#13). Change subject: gpsr_ns2_udp: Use osmo_io_fd instead of osmo_fd ...................................................................... gpsr_ns2_udp: Use osmo_io_fd instead of osmo_fd Depends: I8109cee07f157ebf1806f82a071f58de3a2dcc9c (libosmocore.git) Change-Id: Id776d2d9f35c304620f3d5b94492148dd987f5a0 --- M src/gb/gprs_ns2_udp.c 1 file changed, 59 insertions(+), 75 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/30936/13 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id776d2d9f35c304620f3d5b94492148dd987f5a0 Gerrit-Change-Number: 30936 Gerrit-PatchSet: 13 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023