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

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

by falconia

falconia has uploaded this change for review. ( 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 Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 --- M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 3 files changed, 110 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/49/34449/1 diff --git a/include/osmocom/hlr/hlr_sms.h b/include/osmocom/hlr/hlr_sms.h index e6e0d8a..6e68a85 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_del(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 bd5c85b..ebf4099 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,91 @@ 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) +{ + /* The length limit on the SMSC address is 20 digits, stated + * indirectly in GSM 04.11 section 8.2.5.2. */ + uint8_t gsm48_decode_buffer[11]; + char smsc_addr[21]; + 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 < 2 || req->gsup.sm_rp_da_len > 11 || + !(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: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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 8 files changed, 332 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/48/34448/1 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..e6e0d8a --- /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_del(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_del(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..bd5c85b --- /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_del(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_del(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..6a66f75 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_del(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_del(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); -- 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: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-bts[master]: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34446?usp=email ) Change subject: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind ...................................................................... l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind It was reported that osmo-bts-sysmo is crashing due to a TCH.ind primitive being received by l1sap_tch_ind() for an lchan, which is operating neither in speech nor data, but in signalling mode. It's not clear which scenario is causing this situation. My best guess is that one or more TCH.ind primitive(s) remain waiting in the lower layers and bob up right after the channel mode change. This can happen, for instance, when a dynamic timeslot gets switched from TCH/F or TCH/H to PDCH or SDCCH/8. Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Fixes: d1f8f3429 "l1sap: proper rate adaptation for CSD" Closes: OS#6180 --- M src/common/l1sap.c 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/34446/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 13d271e..9814f86 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1979,6 +1979,7 @@ send_ul_rtp_packet_data(lchan, fn, msg->data, msg->len); break; case RSL_CMOD_SPD_SIGN: + return 0; /* drop stale TCH.ind */ default: /* shall not happen */ OSMO_ASSERT(0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Gerrit-Change-Number: 34446 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by fixeria

Attention is currently required from: arehbein, daniel, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule ...................................................................... Patch Set 1: Code-Review-2 (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/b9fba789_6ac8e46d PS1, Line 21: osmo_ipa_msgb_cb You cannot remove public API (which is part of the latest v1.4.0 release). -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Sep 2023 20:56:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by arehbein

Attention is currently required from: daniel, fixeria, laforge, osmith. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 21: (1 comment) Patchset: PS21: > (type punning was one of the changes added right before I left, and this timestamp issue never appea […] Patch to take care of type punning: https://gerrit.osmocom.org/c/libosmo-netif/+/34445 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 21 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Sep 2023 20:54:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule ...................................................................... ipa: Don't break strict aliasing rule Somehow gcc doesn't always warn about this rule being broken. We are breaking the strict aliasing rule here and libosmo-netif currently does not make use of the '-fno-strict-aliasing' flag. It's possible that this has also been causing nondeterministic timestamps in libosmo-netif stream tests every once in a while. Related: OS#6164, OS#5753 Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 --- M include/osmocom/netif/ipa.h 1 file changed, 19 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/45/34445/1 diff --git a/include/osmocom/netif/ipa.h b/include/osmocom/netif/ipa.h index 1923253..920f0c9 100644 --- a/include/osmocom/netif/ipa.h +++ b/include/osmocom/netif/ipa.h @@ -18,14 +18,8 @@ uint8_t data[0]; } __attribute__ ((packed)); -struct osmo_ipa_msgb_cb { - uint8_t proto; - uint8_t proto_ext; -} __attribute__ ((packed)); - -#define OSMO_IPA_MSGB_CB(__msg) ((struct osmo_ipa_msgb_cb *)&((__msg)->cb[0])) -#define osmo_ipa_msgb_cb_proto(__x) OSMO_IPA_MSGB_CB(__x)->proto -#define osmo_ipa_msgb_cb_proto_ext(__x) OSMO_IPA_MSGB_CB(__x)->proto_ext +#define osmo_ipa_msgb_cb_proto(STRUCT_MSGB_PTR) (STRUCT_MSGB_PTR)->cb[0] +#define osmo_ipa_msgb_cb_proto_ext(STRUCT_MSGB_PTR) (STRUCT_MSGB_PTR)->cb[1] struct msgb *osmo_ipa_msg_alloc(int headroom); struct msgb *osmo_ipa_ext_msg_alloc(size_t headroom); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-msc[master]: CC: don't start guard timer on mid-call MNCC messages

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33472?usp=email ) Change subject: CC: don't start guard timer on mid-call MNCC messages ...................................................................... CC: don't start guard timer on mid-call MNCC messages The intent of the guard timer is to clear hung or stuck states during call setup or teardown. However, there are some MNCC messages that will be exchanged between OsmoMSC (passing CC messages to and from the MS) and the external MNCC agent during the active call state, not related to setup or teardown: DTMF start and stop, plus call hold and retrieve operations for call waiting. Unpatched OsmoMSC restarts the guard timer on every received MNCC message, even those that pass through to CC without affecting any state, and the result is breakage for users. Consider the case of an IVR where you have to press some DTMF keys before you can be transferred to a human operator. You press the needed keys, get the human operator, and start talking. Then 3 minutes into your conversion (default guard timer duration) your call unceremoniously disconnects without any warning. Fix: look at the MNCC message type, and skip the call to start the guard timer for known-benign MNCC messages. Change-Id: Ibe2dd53f8e9e06d175b64df67d2a2e3e2d4155aa --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 49 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 6148bbd..1e2c5af 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -2383,7 +2383,27 @@ log_mncc_rx_tx(trans, "rx", msg); - gsm48_start_guard_timer(trans); + /* + * The step of gsm48_start_guard_timer() needs to be done for + * major state-impacting MNCC messages, but not for those + * that are a mere pass-through to CC messages to MS. + */ + switch (msg->msg_type) { + case MNCC_PROGRESS_REQ: + case MNCC_NOTIFY_REQ: + case MNCC_FACILITY_REQ: + case MNCC_START_DTMF_RSP: + case MNCC_START_DTMF_REJ: + case MNCC_STOP_DTMF_RSP: + case MNCC_HOLD_CNF: + case MNCC_HOLD_REJ: + case MNCC_RETRIEVE_CNF: + case MNCC_RETRIEVE_REJ: + case MNCC_USERINFO_REQ: + break; + default: + gsm48_start_guard_timer(trans); + } trans->cc.mncc_initiated = true; if (trans->msc_a) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33472?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibe2dd53f8e9e06d175b64df67d2a2e3e2d4155aa Gerrit-Change-Number: 33472 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in libosmocore[master]: write_queue: Enable updating max_length field

by arehbein

Attention is currently required from: dexter, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email ) Change subject: write_queue: Enable updating max_length field ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: For reference, this patch was created so this problem here can be tackled: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/cca3c42d_b9504858/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 Gerrit-Change-Number: 34444 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Sep 2023 19:31:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: bsc: Make socket queue max. length configurable

by arehbein

Attention is currently required from: laforge, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email ) Change subject: bsc: Make socket queue max. length configurable ...................................................................... Patch Set 5: (1 comment) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/ac7cfa48_c4fb42c1 PS1, Line 2491: } > If you set a maximum len on a queue, you definettly don't want your queue to be in a state where the […] I have added a patch so that the write queue length can be updated and any excess messages are dropped (dequeued and freed): https://gerrit.osmocom.org/c/libosmocore/+/34444 I would use that patch here to take care of that problem (and I can add a patch for osmo-bts, too) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Sep 2023 19:28:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmocore[master]: write_queue: Enable updating max_length field

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email ) Change subject: write_queue: Enable updating max_length field ...................................................................... write_queue: Enable updating max_length field Dequeue and free any excess messages, in case the new queue length is shorter than the old. Related: OS#5774 Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 --- M include/osmocom/core/write_queue.h M src/core/libosmocore.map M src/core/write_queue.c M tests/write_queue/wqueue_test.c 4 files changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/34444/1 diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h index 6cb0a6b..0d658af 100644 --- a/include/osmocom/core/write_queue.h +++ b/include/osmocom/core/write_queue.h @@ -50,6 +50,7 @@ void osmo_wqueue_clear(struct osmo_wqueue *queue); int osmo_wqueue_enqueue(struct osmo_wqueue *queue, struct msgb *data); int osmo_wqueue_enqueue_quiet(struct osmo_wqueue *queue, struct msgb *data); +size_t osmo_wqueue_update_maxlen(struct osmo_wqueue *queue, size_t len); int osmo_wqueue_bfd_cb(struct osmo_fd *fd, unsigned int what); /*! @} */ diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index c0e164b..4a9d7bc 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -565,6 +565,7 @@ osmo_wqueue_clear; osmo_wqueue_enqueue; osmo_wqueue_enqueue_quiet; +osmo_wqueue_update_maxlen; osmo_wqueue_init; rate_ctr_add; rate_ctr_difference; diff --git a/src/core/write_queue.c b/src/core/write_queue.c index 884cebd..7557c7b 100644 --- a/src/core/write_queue.c +++ b/src/core/write_queue.c @@ -147,4 +147,22 @@ queue->bfd.when &= ~OSMO_FD_WRITE; } +/* Update write queue length & drop excess messages. + * \param[in] queue linked list header of message queue + * \param[in] len new max. wqueue length + * \returns Number of messages dropped. + * + * Messages beyond the new maximum message queue size will be dropped. + */ +size_t osmo_wqueue_update_maxlen(struct osmo_wqueue *queue, size_t len) +{ + size_t dropped_msgs; + struct llist_head *q = &queue->msg_queue; + int diff = queue->max_length - len; + queue->max_length = len; + for (dropped_msgs = 0; dropped_msgs < diff && !llist_empty(q); dropped_msgs++) + msgb_free(msgb_dequeue(q)); + return dropped_msgs; +} + /*! @} */ diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c index 3823ef5..f82a34a 100644 --- a/tests/write_queue/wqueue_test.c +++ b/tests/write_queue/wqueue_test.c @@ -15,6 +15,7 @@ struct msgb *msg; struct osmo_wqueue wqueue; int rc; + size_t dropped_msgs; osmo_wqueue_init(&wqueue, 0); OSMO_ASSERT(wqueue.max_length == 0); @@ -63,6 +64,28 @@ OSMO_ASSERT(wqueue.current_length == 2); msgb_free(msg); osmo_wqueue_clear(&wqueue); + + /* Update limit */ + OSMO_ASSERT(osmo_wqueue_update_maxlen(&wqueue, 5) == 0); + OSMO_ASSERT(osmo_wqueue_update_maxlen(&wqueue, 1) == 0); + OSMO_ASSERT(osmo_wqueue_update_maxlen(&wqueue, 4) == 0); + + /* Add three, update limit to 1 */ + OSMO_ASSERT(wqueue.max_length == 4); + msg = msgb_alloc(4096, "msg6"); + rc = osmo_wqueue_enqueue(&wqueue, msg); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(wqueue.current_length == 1); + msg = msgb_alloc(4096, "msg7"); + rc = osmo_wqueue_enqueue(&wqueue, msg); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(wqueue.current_length == 2); + msg = msgb_alloc(4096, "msg8"); + rc = osmo_wqueue_enqueue(&wqueue, msg); + OSMO_ASSERT(wqueue.current_length == 3); + dropped_msgs = osmo_wqueue_update_maxlen(&wqueue, 1); + OSMO_ASSERT(dropped_msgs = 2); + osmo_wqueue_clear(&wqueue); } int main(int argc, char **argv) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 Gerrit-Change-Number: 34444 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023