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

[L] Change in osmocom-bb[master]: modem: grr: implement RACH.req retransmission

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34514?usp=email ) Change subject: modem: grr: implement RACH.req retransmission ...................................................................... Patch Set 2: Code-Review+1 (2 comments) File src/host/layer23/src/modem/grr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34514/comment/ca25b113_7d402c9f PS2, Line 470: rr->n_chan_req = GRR_PACKET_ACCESS_MAX_CHAN_REQ; add "pending" word somewhere in the variable field? n_chan_req_pending. https://gerrit.osmocom.org/c/osmocom-bb/+/34514/comment/ff53a191_4ba95595 PS2, Line 659: static void grr_st_packet_access_action(struct osmo_fsm_inst *fi, I think it's the first place I see we add the "action" keyword, I was first confused about what was this. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34514?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iab6d9147f6e0aeb99239affacf318a3897fd6ffe Gerrit-Change-Number: 34514 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Sep 2023 23:12:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: deal with RACH retransmissions (drop rach_req_ra)

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34512?usp=email ) Change subject: rlcmac: deal with RACH retransmissions (drop rach_req_ra) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34512?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80 Gerrit-Change-Number: 34512 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Sep 2023 21:20:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmocom-bb[master]: modem: grr: clarify a comment in forward_to_rlcmac()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34513?usp=email ) Change subject: modem: grr: clarify a comment in forward_to_rlcmac() ...................................................................... modem: grr: clarify a comment in forward_to_rlcmac() Change-Id: I11286777c70c776c9f6990be988401ebd5b84f0f --- M src/host/layer23/src/modem/grr.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/modem/grr.c b/src/host/layer23/src/modem/grr.c index 1f4a3d7..af773a3 100644 --- a/src/host/layer23/src/modem/grr.c +++ b/src/host/layer23/src/modem/grr.c @@ -97,7 +97,7 @@ struct osmo_gprs_rlcmac_prim *rlcmac_prim; const uint32_t fn = *(uint32_t *)(&msg->cb[0]); - /* Forward SI13 to RLC/MAC layer */ + /* Forward a CCCH/BCCH block to the RLC/MAC layer */ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(fn, msgb_l3(msg)); return osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34513?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I11286777c70c776c9f6990be988401ebd5b84f0f Gerrit-Change-Number: 34513 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmocom-bb[master]: modem: grr: clarify a comment in forward_to_rlcmac()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34513?usp=email ) Change subject: modem: grr: clarify a comment in forward_to_rlcmac() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34513?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I11286777c70c776c9f6990be988401ebd5b84f0f Gerrit-Change-Number: 34513 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Sep 2023 21:17:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-hlr[master]: SMS over GSUP: handle READY-FOR-SM.req from MSCs

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34451?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: SMS over GSUP: handle READY-FOR-SM.req from MSCs ...................................................................... SMS over GSUP: handle READY-FOR-SM.req from MSCs When an MS indicates that it is ready to receive MT SMS, the MSC will send us a READY-FOR-SM.req message. Handle it by sending copies of the same message to all connected SMSCs and returning OK result to the MS that indicates its ready status. Related: OS#6135 Change-Id: I731545a3a0d0804289e24a7769e13bfd3f645132 --- M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 3 files changed, 75 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/hlr/hlr_sms.h b/include/osmocom/hlr/hlr_sms.h index e6e476e..01fc231 100644 --- a/include/osmocom/hlr/hlr_sms.h +++ b/include/osmocom/hlr/hlr_sms.h @@ -30,3 +30,4 @@ void forward_mo_sms(struct osmo_gsup_req *req); void forward_mt_sms(struct osmo_gsup_req *req); +void rx_ready_for_sm_req(struct osmo_gsup_req *req); diff --git a/src/hlr.c b/src/hlr.c index eae9e84..8ad3dfc 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -563,6 +563,9 @@ case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST: forward_mt_sms(req); break; + case OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST: + rx_ready_for_sm_req(req); + break; default: LOGP(DMAIN, LOGL_DEBUG, "Unhandled GSUP message type %s\n", osmo_gsup_message_type_name(req->gsup.message_type)); diff --git a/src/hlr_sms.c b/src/hlr_sms.c index c8c8e49..d923e90 100644 --- a/src/hlr_sms.c +++ b/src/hlr_sms.c @@ -218,3 +218,59 @@ strlen(subscr.vlr_number) + 1); osmo_gsup_forward_to_local_peer(req->cb_data, &dest_peer, req, NULL); } + +/*********************************************************************** + * READY-FOR-SM handling + * + * An MSC indicates that an MS is ready to receive messages. If one + * or more SMSCs have previously tried to send MT SMS to this MS and + * failed, we should pass this READY-FOR-SM message to them so they + * can resend their queued SMS right away. But which SMSC do we + * forward the message to? 3GPP specs call for a complicated system + * where the HLR remembers which SMSCs have tried and failed to deliver + * MT SMS, and those SMSCs then get notified - but that design is too + * much complexity for the current state of Osmocom. So we keep it + * simple: we iterate over all configured SMSCs and forward a copy + * of the READY-FOR-SM.req message to each. + * + * Routing of responses is another problem: the MSC that sent + * READY-FOR-SM.req expects only one response, and one can even argue + * that the operation is a "success" from the perspective of the MS + * irrespective of whether each given SMSC handled the notification + * successfully or not. Hence our approach: we always return success + * to the MS, and when we forward copies of READY-FOR-SM.req to SMSCs, + * we list the HLR as the message source - this way SMSC responses + * will terminate at this HLR and won't be forwarded to the MSC. + ***********************************************************************/ + +static void forward_req_copy_to_smsc(const struct osmo_gsup_req *req, + const struct hlr_smsc *smsc) +{ + const char *my_ipa_name = g_hlr->gsup_unit_name.serno; + struct osmo_gsup_message forward = req->gsup; + struct osmo_ipa_name smsc_ipa_name; + + /* set the source to this HLR */ + forward.source_name = (const uint8_t *) my_ipa_name; + forward.source_name_len = strlen(my_ipa_name) + 1; + + /* send it off */ + LOG_GSUP_REQ(req, LOGL_INFO, "Forwarding source-reset copy to %s\n", + smsc->name); + osmo_ipa_name_set(&smsc_ipa_name, (const uint8_t *) smsc->name, + strlen(smsc->name) + 1); + osmo_gsup_enc_send_to_ipa_name(g_hlr->gs, &smsc_ipa_name, &forward); +} + +void rx_ready_for_sm_req(struct osmo_gsup_req *req) +{ + struct hlr_smsc *smsc; + + /* fan request msg out to all SMSCs */ + llist_for_each_entry(smsc, &g_hlr->smsc_list, list) + forward_req_copy_to_smsc(req, smsc); + + /* send OK response to the MSC and the MS */ + osmo_gsup_req_respond_msgt(req, OSMO_GSUP_MSGT_READY_FOR_SM_RESULT, + true); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34451?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I731545a3a0d0804289e24a7769e13bfd3f645132 Gerrit-Change-Number: 34451 Gerrit-PatchSet: 4 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MT SMS

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34450?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: SMS over GSUP: implement forwarding of MT SMS ...................................................................... SMS over GSUP: implement forwarding of MT SMS When an SMSC tries to deliver an SM to a subscriber, it will send us an MT-forwardSM.req GSUP message. We look up the subscriber by IMSI and see if they are attached to a VLR. If the subscriber is attached, we forward the message to the MSC/VLR, otherwise return an error to the SMSC. Related: OS#6135 Change-Id: Ib3551bf7839690606c677461758c5cfef5f0aa7b --- M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 3 files changed, 48 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/hlr/hlr_sms.h b/include/osmocom/hlr/hlr_sms.h index 727e408..e6e476e 100644 --- a/include/osmocom/hlr/hlr_sms.h +++ b/include/osmocom/hlr/hlr_sms.h @@ -29,3 +29,4 @@ void smsc_route_free(struct hlr_smsc_route *rt); void forward_mo_sms(struct osmo_gsup_req *req); +void forward_mt_sms(struct osmo_gsup_req *req); diff --git a/src/hlr.c b/src/hlr.c index 501eabc..eae9e84 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -560,6 +560,9 @@ case OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST: forward_mo_sms(req); break; + case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST: + forward_mt_sms(req); + break; default: LOGP(DMAIN, LOGL_DEBUG, "Unhandled GSUP message type %s\n", osmo_gsup_message_type_name(req->gsup.message_type)); diff --git a/src/hlr_sms.c b/src/hlr_sms.c index 672d6c9..c8c8e49 100644 --- a/src/hlr_sms.c +++ b/src/hlr_sms.c @@ -190,3 +190,31 @@ strlen(smsc->name) + 1); osmo_gsup_forward_to_local_peer(req->cb_data, &dest_peer, req, NULL); } + +/*********************************************************************** + * forwarding of MT SMS from SMSCs to MSC/VLR based on IMSI + ***********************************************************************/ + +void forward_mt_sms(struct osmo_gsup_req *req) +{ + struct hlr_subscriber subscr; + struct osmo_cni_peer_id dest_peer; + int rc; + + rc = db_subscr_get_by_imsi(g_hlr->dbc, req->gsup.imsi, &subscr); + if (rc < 0) { + osmo_gsup_req_respond_err(req, GMM_CAUSE_IMSI_UNKNOWN, + "IMSI unknown"); + return; + } + /* is this subscriber currently attached to a VLR? */ + if (!subscr.vlr_number[0]) { + osmo_gsup_req_respond_err(req, GMM_CAUSE_IMPL_DETACHED, + "subscriber not attached to a VLR"); + return; + } + osmo_cni_peer_id_set(&dest_peer, OSMO_CNI_PEER_ID_IPA_NAME, + (const uint8_t *) subscr.vlr_number, + strlen(subscr.vlr_number) + 1); + osmo_gsup_forward_to_local_peer(req->cb_data, &dest_peer, req, NULL); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34450?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib3551bf7839690606c677461758c5cfef5f0aa7b Gerrit-Change-Number: 34450 Gerrit-PatchSet: 4 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MO SMS

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email ) Change subject: SMS over GSUP: implement forwarding of MO SMS ...................................................................... SMS over GSUP: implement forwarding of MO SMS MO-forwardSM.req messages are now forwarded to a connected SMSC based on the SMSC address (SM-RP-DA) in the MO SM and the vty-defined mapping from SMSC numeric addresses to IPA names. Related: OS#6135 Depends: Iea5c29909c5be80f81dbbc2873656ff5cf590a5d (libosmocore) Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 --- M TODO-RELEASE M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 4 files changed, 111 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index cbfda24..d8e3568 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmogsm >1.9.0 <osmocom/gsm/protocol/gsm_04_11.h> additions diff --git a/include/osmocom/hlr/hlr_sms.h b/include/osmocom/hlr/hlr_sms.h index 0570aca..727e408 100644 --- a/include/osmocom/hlr/hlr_sms.h +++ b/include/osmocom/hlr/hlr_sms.h @@ -27,3 +27,5 @@ struct hlr_smsc_route *smsc_route_alloc(struct hlr *hlr, const char *num_addr, struct hlr_smsc *smsc); void smsc_route_free(struct hlr_smsc_route *rt); + +void forward_mo_sms(struct osmo_gsup_req *req); diff --git a/src/hlr.c b/src/hlr.c index 17acdab..501eabc 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -49,6 +49,7 @@ #include <osmocom/hlr/rand.h> #include <osmocom/hlr/hlr_vty.h> #include <osmocom/hlr/hlr_ussd.h> +#include <osmocom/hlr/hlr_sms.h> #include <osmocom/hlr/dgsm.h> #include <osmocom/hlr/proxy.h> #include <osmocom/hlr/lu_fsm.h> @@ -556,6 +557,9 @@ case OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: rx_check_imei_req(req); break; + case OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST: + forward_mo_sms(req); + break; default: LOGP(DMAIN, LOGL_DEBUG, "Unhandled GSUP message type %s\n", osmo_gsup_message_type_name(req->gsup.message_type)); diff --git a/src/hlr_sms.c b/src/hlr_sms.c index 5866afa..672d6c9 100644 --- a/src/hlr_sms.c +++ b/src/hlr_sms.c @@ -26,6 +26,8 @@ #include <osmocom/core/talloc.h> #include <osmocom/gsm/gsup.h> +#include <osmocom/gsm/gsm48_ie.h> +#include <osmocom/gsm/protocol/gsm_04_11.h> #include <osmocom/hlr/hlr.h> #include <osmocom/hlr/hlr_sms.h> @@ -101,3 +103,90 @@ llist_del(&rt->list); talloc_free(rt); } + +/*********************************************************************** + * forwarding of MO SMS to SMSCs based on SM-RP-DA + ***********************************************************************/ + +static const struct hlr_smsc *find_smsc_route(const char *smsc_addr) +{ + const struct hlr_smsc_route *rt; + + rt = smsc_route_find(g_hlr, smsc_addr); + if (rt) + return rt->smsc; + return g_hlr->smsc_default; +} + +static void respond_with_sm_rp_cause(struct osmo_gsup_req *req, + uint8_t sm_rp_cause) +{ + struct osmo_gsup_message rsp_msg = { }; + + rsp_msg.sm_rp_cause = &sm_rp_cause; + osmo_gsup_req_respond(req, &rsp_msg, true, true); +} + +/* Short Message from MSC/VLR towards SMSC */ +void forward_mo_sms(struct osmo_gsup_req *req) +{ + uint8_t gsm48_decode_buffer[GSM411_SMSC_ADDR_MAX_OCTETS]; + char smsc_addr[GSM411_SMSC_ADDR_MAX_DIGITS+1]; + const struct hlr_smsc *smsc; + struct osmo_cni_peer_id dest_peer; + + /* Make sure SM-RP-DA (SMSC address) is present */ + if (req->gsup.sm_rp_da == NULL || !req->gsup.sm_rp_da_len) { + osmo_gsup_req_respond_err(req, GMM_CAUSE_INV_MAND_INFO, + "missing SM-RP-DA"); + return; + } + + if (req->gsup.sm_rp_da_type != OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR) { + osmo_gsup_req_respond_err(req, GMM_CAUSE_INV_MAND_INFO, + "SM-RP-DA type is not SMSC"); + return; + } + + /* Enforce the length constrainst on SM-RP-DA, as specified in + * GSM 04.11 section 8.2.5.2. Also enforce absence of ToN/NPI + * extension octets at the same time. */ + if (req->gsup.sm_rp_da_len < GSM411_SMSC_ADDR_MIN_OCTETS || + req->gsup.sm_rp_da_len > GSM411_SMSC_ADDR_MAX_OCTETS || + !(req->gsup.sm_rp_da[0] & 0x80)) { + /* This form of bogosity originates from the MS, + * not from OsmoMSC or any other Osmocom network elements! */ + LOGP(DLSMS, LOGL_NOTICE, + "Rx '%s' (IMSI-%s) contains invalid SM-RP-DA from MS\n", + osmo_gsup_message_type_name(req->gsup.message_type), + req->gsup.imsi); + respond_with_sm_rp_cause(req, GSM411_RP_CAUSE_SEMANT_INC_MSG); + return; + } + + /* Decode SMSC address from SM-RP-DA */ + gsm48_decode_buffer[0] = req->gsup.sm_rp_da_len - 1; + memcpy(gsm48_decode_buffer + 1, req->gsup.sm_rp_da + 1, + req->gsup.sm_rp_da_len - 1); + gsm48_decode_bcd_number2(smsc_addr, sizeof(smsc_addr), + gsm48_decode_buffer, + req->gsup.sm_rp_da_len, 0); + + /* Look for a route to this SMSC */ + smsc = find_smsc_route(smsc_addr); + if (smsc == NULL) { + LOGP(DLSMS, LOGL_NOTICE, + "Failed to find a route for '%s' (IMSI-%s, SMSC-Addr-%s)\n", + osmo_gsup_message_type_name(req->gsup.message_type), + req->gsup.imsi, smsc_addr); + respond_with_sm_rp_cause(req, + GSM411_RP_CAUSE_MO_NUM_UNASSIGNED); + return; + } + + /* We got the IPA name of our SMSC - forward the message */ + osmo_cni_peer_id_set(&dest_peer, OSMO_CNI_PEER_ID_IPA_NAME, + (const uint8_t *) smsc->name, + strlen(smsc->name) + 1); + osmo_gsup_forward_to_local_peer(req->cb_data, &dest_peer, req, NULL); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 Gerrit-Change-Number: 34449 Gerrit-PatchSet: 4 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[L] Change in osmo-hlr[master]: SMS over GSUP: implement vty config of SMSC routing

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email ) Change subject: SMS over GSUP: implement vty config of SMSC routing ...................................................................... SMS over GSUP: implement vty config of SMSC routing At the user-visible level (advanced settings menus on phones, GSM 07.05 AT commands, SIM programming) each SMSC is identified by a numeric address that looks like a phone number, originally meant to be a Global Title. OsmoMSC passes these SMSC addresses through as-is to MO-forwardSM.req GSUP message - however, SMSCs that connect to OsmoHLR via GSUP identify themselves by their IPA names instead. Hence we need a mapping mechanism in OsmoHLR config. To accommodate different styles of network design ranging from strict recreation of classic GSM architecture to guest roaming arrangements, a two-level configuration is implemented, modeled after EUSE/USSD configuration: first one defines which SMSCs exist as entities, identified only by their IPA names, and then one defines which numeric SMSC address (in SM-RP-DA) should go to which configured SMSC, with the additional possibility of a default route. Related: OS#6135 Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/hlr_sms.h M include/osmocom/hlr/hlr_vty.h M src/Makefile.am M src/hlr.c A src/hlr_sms.c M src/hlr_vty.c M tests/test_nodes.vty 9 files changed, 339 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/hlr/Makefile.am b/include/osmocom/hlr/Makefile.am index aceda4a..545ef6f 100644 --- a/include/osmocom/hlr/Makefile.am +++ b/include/osmocom/hlr/Makefile.am @@ -6,6 +6,7 @@ gsup_router.h \ gsup_server.h \ hlr.h \ + hlr_sms.h \ hlr_ussd.h \ hlr_vty.h \ hlr_vty_subscr.h \ diff --git a/include/osmocom/hlr/hlr.h b/include/osmocom/hlr/hlr.h index dc0c77e..278a85a 100644 --- a/include/osmocom/hlr/hlr.h +++ b/include/osmocom/hlr/hlr.h @@ -74,6 +74,10 @@ struct llist_head ss_sessions; + struct llist_head smsc_list; + struct llist_head smsc_routes; + struct hlr_smsc *smsc_default; + bool store_imei; bool subscr_create_on_demand; diff --git a/include/osmocom/hlr/hlr_sms.h b/include/osmocom/hlr/hlr_sms.h new file mode 100644 index 0000000..0570aca --- /dev/null +++ b/include/osmocom/hlr/hlr_sms.h @@ -0,0 +1,29 @@ +#pragma once + +#include <osmocom/core/linuxlist.h> + +struct hlr_smsc { + /* g_hlr->smsc_list */ + struct llist_head list; + struct hlr *hlr; + /* name (must match the IPA ID tag) */ + const char *name; + /* human-readable description */ + const char *description; +}; + +struct hlr_smsc *smsc_find(struct hlr *hlr, const char *name); +struct hlr_smsc *smsc_alloc(struct hlr *hlr, const char *name); +void smsc_free(struct hlr_smsc *smsc); + +struct hlr_smsc_route { + /* g_hlr->smsc_routes */ + struct llist_head list; + const char *num_addr; + struct hlr_smsc *smsc; +}; + +struct hlr_smsc_route *smsc_route_find(struct hlr *hlr, const char *num_addr); +struct hlr_smsc_route *smsc_route_alloc(struct hlr *hlr, const char *num_addr, + struct hlr_smsc *smsc); +void smsc_route_free(struct hlr_smsc_route *rt); diff --git a/include/osmocom/hlr/hlr_vty.h b/include/osmocom/hlr/hlr_vty.h index 43b6566..8601590 100644 --- a/include/osmocom/hlr/hlr_vty.h +++ b/include/osmocom/hlr/hlr_vty.h @@ -31,6 +31,7 @@ HLR_NODE = _LAST_OSMOVTY_NODE + 1, GSUP_NODE, EUSE_NODE, + SMSC_NODE, MSLOOKUP_NODE, MSLOOKUP_SERVER_NODE, MSLOOKUP_SERVER_MSC_NODE, diff --git a/src/Makefile.am b/src/Makefile.am index 380e34a..6a3bb3f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,7 @@ hlr_vty.c \ hlr_vty_subscr.c \ gsup_send.c \ + hlr_sms.c \ hlr_ussd.c \ proxy.c \ dgsm.c \ diff --git a/src/hlr.c b/src/hlr.c index 457850e..17acdab 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -750,8 +750,10 @@ g_hlr = talloc_zero(hlr_ctx, struct hlr); INIT_LLIST_HEAD(&g_hlr->euse_list); + INIT_LLIST_HEAD(&g_hlr->smsc_list); INIT_LLIST_HEAD(&g_hlr->ss_sessions); INIT_LLIST_HEAD(&g_hlr->ussd_routes); + INIT_LLIST_HEAD(&g_hlr->smsc_routes); INIT_LLIST_HEAD(&g_hlr->mslookup.server.local_site_services); g_hlr->db_file_path = talloc_strdup(g_hlr, HLR_DEFAULT_DB_FILE_PATH); g_hlr->mslookup.server.mdns.domain_suffix = talloc_strdup(g_hlr, OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT); diff --git a/src/hlr_sms.c b/src/hlr_sms.c new file mode 100644 index 0000000..5866afa --- /dev/null +++ b/src/hlr_sms.c @@ -0,0 +1,103 @@ +/* OsmoHLR SMS-over-GSUP routing implementation */ + +/* Author: Mychaela N. Falconia <falcon(a)freecalypso.org>, 2023 - however, + * Mother Mychaela's contributions are NOT subject to copyright. + * No rights reserved, all rights relinquished. + * + * Based on earlier unmerged work by Vadim Yanitskiy, 2019. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdint.h> +#include <string.h> +#include <errno.h> + +#include <osmocom/core/talloc.h> +#include <osmocom/gsm/gsup.h> + +#include <osmocom/hlr/hlr.h> +#include <osmocom/hlr/hlr_sms.h> +#include <osmocom/hlr/gsup_server.h> +#include <osmocom/hlr/gsup_router.h> +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/db.h> + +/*********************************************************************** + * core data structures expressing config from VTY + ***********************************************************************/ + +struct hlr_smsc *smsc_find(struct hlr *hlr, const char *name) +{ + struct hlr_smsc *smsc; + + llist_for_each_entry(smsc, &hlr->smsc_list, list) { + if (!strcmp(smsc->name, name)) + return smsc; + } + return NULL; +} + +struct hlr_smsc *smsc_alloc(struct hlr *hlr, const char *name) +{ + struct hlr_smsc *smsc = smsc_find(hlr, name); + if (smsc) + return NULL; + + smsc = talloc_zero(hlr, struct hlr_smsc); + smsc->name = talloc_strdup(smsc, name); + smsc->hlr = hlr; + llist_add_tail(&smsc->list, &hlr->smsc_list); + + return smsc; +} + +void smsc_free(struct hlr_smsc *smsc) +{ + llist_del(&smsc->list); + talloc_free(smsc); +} + +struct hlr_smsc_route *smsc_route_find(struct hlr *hlr, const char *num_addr) +{ + struct hlr_smsc_route *rt; + + llist_for_each_entry(rt, &hlr->smsc_routes, list) { + if (!strcmp(rt->num_addr, num_addr)) + return rt; + } + return NULL; +} + +struct hlr_smsc_route *smsc_route_alloc(struct hlr *hlr, const char *num_addr, + struct hlr_smsc *smsc) +{ + struct hlr_smsc_route *rt; + + if (smsc_route_find(hlr, num_addr)) + return NULL; + + rt = talloc_zero(hlr, struct hlr_smsc_route); + rt->num_addr = talloc_strdup(rt, num_addr); + rt->smsc = smsc; + llist_add_tail(&rt->list, &hlr->smsc_routes); + + return rt; +} + +void smsc_route_free(struct hlr_smsc_route *rt) +{ + llist_del(&rt->list); + talloc_free(rt); +} diff --git a/src/hlr_vty.c b/src/hlr_vty.c index f8cf852..c4e99e2 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -44,6 +44,7 @@ #include <osmocom/hlr/hlr_vty.h> #include <osmocom/hlr/hlr_vty_subscr.h> #include <osmocom/hlr/hlr_ussd.h> +#include <osmocom/hlr/hlr_sms.h> #include <osmocom/hlr/gsup_server.h> static const struct value_string gsm48_gmm_cause_vty_names[] = { @@ -608,6 +609,160 @@ return CMD_SUCCESS; } +/*********************************************************************** + * Routing of SM-RL to GSUP-attached SMSCs + ***********************************************************************/ + +#define SMSC_STR "Configuration of GSUP routing to SMSCs\n" + +struct cmd_node smsc_node = { + SMSC_NODE, + "%s(config-hlr-smsc)# ", + 1, +}; + +DEFUN(cfg_smsc_entity, cfg_smsc_entity_cmd, + "smsc entity NAME", + SMSC_STR + "Configure a particular external SMSC\n" + "IPA name of the external SMSC\n") +{ + struct hlr_smsc *smsc; + const char *id = argv[0]; + + smsc = smsc_find(g_hlr, id); + if (!smsc) { + smsc = smsc_alloc(g_hlr, id); + if (!smsc) + return CMD_WARNING; + } + vty->index = smsc; + vty->index_sub = &smsc->description; + vty->node = SMSC_NODE; + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_smsc_entity, cfg_no_smsc_entity_cmd, + "no smsc entity NAME", + NO_STR SMSC_STR "Remove a particular external SMSC\n" + "IPA name of the external SMSC\n") +{ + struct hlr_smsc *smsc = smsc_find(g_hlr, argv[0]); + if (!smsc) { + vty_out(vty, "%% Cannot remove non-existent SMSC %s%s", + argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + if (g_hlr->smsc_default == smsc) { + vty_out(vty, + "%% Cannot remove SMSC %s, it is the default route%s", + argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + smsc_free(smsc); + return CMD_SUCCESS; +} + +DEFUN(cfg_smsc_route, cfg_smsc_route_cmd, + "smsc route NUMBER NAME", + SMSC_STR + "Configure GSUP route to a particular SMSC\n" + "Numeric address of this SMSC, must match EF.SMSP programming in SIMs\n" + "IPA name of the external SMSC\n") +{ + struct hlr_smsc *smsc = smsc_find(g_hlr, argv[1]); + struct hlr_smsc_route *rt = smsc_route_find(g_hlr, argv[0]); + if (rt) { + vty_out(vty, + "%% Cannot add [another?] route for SMSC address %s%s", + argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + if (!smsc) { + vty_out(vty, "%% Cannot find SMSC '%s'%s", argv[1], + VTY_NEWLINE); + return CMD_WARNING; + } + smsc_route_alloc(g_hlr, argv[0], smsc); + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_smsc_route, cfg_no_smsc_route_cmd, + "no smsc route NUMBER", + NO_STR SMSC_STR "Remove GSUP route to a particular SMSC\n" + "Numeric address of the SMSC\n") +{ + struct hlr_smsc_route *rt = smsc_route_find(g_hlr, argv[0]); + if (!rt) { + vty_out(vty, "%% Cannot find route for SMSC address %s%s", + argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + smsc_route_free(rt); + + return CMD_SUCCESS; +} + +DEFUN(cfg_smsc_defroute, cfg_smsc_defroute_cmd, + "smsc default-route NAME", + SMSC_STR + "Configure default SMSC route for unknown SMSC numeric addresses\n" + "IPA name of the external SMSC\n") +{ + struct hlr_smsc *smsc; + + smsc = smsc_find(g_hlr, argv[0]); + if (!smsc) { + vty_out(vty, "%% Cannot find SMSC %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + if (g_hlr->smsc_default != smsc) { + vty_out(vty, "Switching default route from %s to %s%s", + g_hlr->smsc_default ? g_hlr->smsc_default->name : "<none>", + smsc->name, VTY_NEWLINE); + g_hlr->smsc_default = smsc; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_smsc_defroute, cfg_no_smsc_defroute_cmd, + "no smsc default-route", + NO_STR SMSC_STR + "Remove default SMSC route for unknown SMSC numeric addresses\n") +{ + g_hlr->smsc_default = NULL; + + return CMD_SUCCESS; +} + +static void dump_one_smsc(struct vty *vty, struct hlr_smsc *smsc) +{ + vty_out(vty, " smsc entity %s%s", smsc->name, VTY_NEWLINE); +} + +static int config_write_smsc(struct vty *vty) +{ + struct hlr_smsc *smsc; + struct hlr_smsc_route *rt; + + llist_for_each_entry(smsc, &g_hlr->smsc_list, list) + dump_one_smsc(vty, smsc); + + llist_for_each_entry(rt, &g_hlr->smsc_routes, list) { + vty_out(vty, " smsc route %s %s%s", rt->num_addr, + rt->smsc->name, VTY_NEWLINE); + } + + if (g_hlr->smsc_default) + vty_out(vty, " smsc default-route %s%s", + g_hlr->smsc_default->name, VTY_NEWLINE); + + return 0; +} DEFUN(cfg_reject_cause, cfg_reject_cause_cmd, "reject-cause TYPE CAUSE", "") /* Dynamically Generated */ @@ -771,6 +926,15 @@ install_element(HLR_NODE, &cfg_ussd_defaultroute_cmd); install_element(HLR_NODE, &cfg_ussd_no_defaultroute_cmd); install_element(HLR_NODE, &cfg_ncss_guard_timeout_cmd); + + install_node(&smsc_node, config_write_smsc); + install_element(HLR_NODE, &cfg_smsc_entity_cmd); + install_element(HLR_NODE, &cfg_no_smsc_entity_cmd); + install_element(HLR_NODE, &cfg_smsc_route_cmd); + install_element(HLR_NODE, &cfg_no_smsc_route_cmd); + install_element(HLR_NODE, &cfg_smsc_defroute_cmd); + install_element(HLR_NODE, &cfg_no_smsc_defroute_cmd); + install_element(HLR_NODE, &cfg_reject_cause_cmd); install_element(HLR_NODE, &cfg_store_imei_cmd); install_element(HLR_NODE, &cfg_no_store_imei_cmd); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 8c7e95d..4aea638 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -47,6 +47,7 @@ no Negate a command or set its defaults ussd USSD Configuration ncss-guard-timeout Set guard timer for NCSS (call independent SS) session activity + smsc Configuration of GSUP routing to SMSCs reject-cause GSUP/GMM cause to be sent store-imei Save the IMEI in the database when receiving Check IMEI requests. Note that an MSC does not necessarily send Check IMEI requests (for OsmoMSC, you may want to set 'check-imei-rqd 1'). subscriber-create-on-demand Make a new record when a subscriber is first seen. @@ -63,6 +64,12 @@ ussd default-route external EUSE no ussd default-route ncss-guard-timeout <0-255> + smsc entity NAME + no smsc entity NAME + smsc route NUMBER NAME + no smsc route NUMBER + smsc default-route NAME + no smsc default-route reject-cause (not-found|no-proxy) (imsi-unknown|illegal-ms|plmn-not-allowed|la-not-allowed|roaming-not-allowed|no-suitable-cell-in-la|net-fail|congestion|auth-unacceptable|proto-error-unspec) store-imei no store-imei -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c Gerrit-Change-Number: 34448 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: deal with RACH retransmissions (drop rach_req_ra)

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34512?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: rlcmac: deal with RACH retransmissions (drop rach_req_ra) ...................................................................... rlcmac: deal with RACH retransmissions (drop rach_req_ra) The RA value does change during RACH retransmissions, so we cannot expect a specific value in gprs_rlcmac_handle_ccch_imm_ass_ul_tbf() anymore. Offload checking it to the lower layers. * Rename submit_rach_req() to submit_packet_access_req(). * Get rid of gen_chan_req(), indicate only the access cause. Ideally, we should also rename the OSMO_GPRS_RLCMAC_L1CTL_RACH to something like OSMO_GPRS_RLCMAC_L1CTL_PKT_CHAN_ACCESS, but let's better do this separately. Change-Id: If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80 Related: osmocom-bb.git Iab6d9147f6e0aeb99239affacf318a3897fd6ffe Related: OS#5500, OS#6131 --- M include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h M src/rlcmac/rlcmac.c M src/rlcmac/tbf_ul_ass_fsm.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 5 files changed, 71 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/12/34512/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34512?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80 Gerrit-Change-Number: 34512 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[L] Change in osmo-hlr[master]: SMS over GSUP: implement vty config of SMSC routing

by fixeria

Attention is currently required from: falconia, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email ) Change subject: SMS over GSUP: implement vty config of SMSC routing ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c Gerrit-Change-Number: 34448 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 22 Sep 2023 20:26:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023