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

Change in libosmocore[master]: Introduce netns API

by pespin

Attention is currently required from: osmith, laforge, pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/31024 to look at the new patch set (#4). Change subject: Introduce netns API ...................................................................... Introduce netns API Write a new API and implementation to manage network namespace related operations. This will be used by the upcoming tundev module. Change-Id: I0f2fba2fa42250a07211a7b7f479498f27c529da --- M TODO-RELEASE M include/osmocom/core/Makefile.am A include/osmocom/core/netns.h M src/core/Makefile.am A src/core/netns.c 5 files changed, 235 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/31024/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0f2fba2fa42250a07211a7b7f479498f27c529da Gerrit-Change-Number: 31024 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Introduce netns API

by Jenkins Builder

Attention is currently required from: osmith, laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31024 ) Change subject: Introduce netns API ...................................................................... Patch Set 3: (1 comment) File src/core/netns.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2889): https://gerrit.osmocom.org/c/libosmocore/+/31024/comment/edca8c6f_01fa567b PS3, Line 122: rc = mkdir(NETNS_PREFIX_PATH, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH); Symbolic permissions 'S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH' are not preferred. Consider using octal permissions '0755'. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0f2fba2fa42250a07211a7b7f479498f27c529da Gerrit-Change-Number: 31024 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 20 Jan 2023 19:33:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Introduce netns API

by pespin

Attention is currently required from: osmith, laforge. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/31024 to look at the new patch set (#3). Change subject: Introduce netns API ...................................................................... Introduce netns API Write a new API and implementation to manage network namespace related operations. This will be used by the upcoming tundev module. Change-Id: I0f2fba2fa42250a07211a7b7f479498f27c529da --- M TODO-RELEASE M include/osmocom/core/Makefile.am A include/osmocom/core/netns.h M src/core/Makefile.am A src/core/netns.c 5 files changed, 235 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/31024/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0f2fba2fa42250a07211a7b7f479498f27c529da Gerrit-Change-Number: 31024 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Introduce tundev API

by pespin

Attention is currently required from: laforge, pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/31025 to look at the new patch set (#5). Change subject: Introduce tundev API ...................................................................... Introduce tundev API The data structre is held private so that it can be easily extended in the future. Change-Id: I3463271666df1e85746fb7b06ec45a17024b8c53 --- M TODO-RELEASE M include/osmocom/core/Makefile.am A include/osmocom/core/tun.h M src/core/Makefile.am A src/core/tun.c 5 files changed, 861 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/31025/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3463271666df1e85746fb7b06ec45a17024b8c53 Gerrit-Change-Number: 31025 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in osmo-hnbgw[master]: mark two possible asn1c leaks with FIXME

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31027 ) Change subject: mark two possible asn1c leaks with FIXME ...................................................................... Abandoned accidental push -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic13ca13bf3c95eb7ab20fad508d03bc899f34f15 Gerrit-Change-Number: 31027 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

2 years, 5 months

1
0
0 0

Change in osmo-hnbgw[master]: mark two possible asn1c leaks with FIXME

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31027 ) Change subject: mark two possible asn1c leaks with FIXME ...................................................................... mark two possible asn1c leaks with FIXME Change-Id: Ic13ca13bf3c95eb7ab20fad508d03bc899f34f15 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/27/31027/1 diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 4aefe2b..07612c7 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -147,6 +147,7 @@ memset(&accept_out, 0, sizeof(accept_out)); rc = hnbap_encode_ueregisteraccepties(&accept_out, &accept); if (rc < 0) { + // FIXME: leaking 'accept' return rc; } @@ -343,6 +344,8 @@ * never be a UE DE-REGISTER for this UE from the HNB, and the ue_context would linger forever. */ if (ue_allocated) ue_context_free(ue_allocated); + + // FIXME: leaking 'accept' return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic13ca13bf3c95eb7ab20fad508d03bc899f34f15 Gerrit-Change-Number: 31027 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-hnbgw[master]: fix SCCP conn leak on non-graceful HNB shutdown

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/31028 ) Change subject: fix SCCP conn leak on non-graceful HNB shutdown ...................................................................... fix SCCP conn leak on non-graceful HNB shutdown Clean up SCCP connections when a HNB disconnects. When a HNB disconnects, we clean up all RUA <-> SCCP connection state for that HNB. In that cleanup, discarding the SCCP connection is so far missing. Add a flag indicating true between SCCP CC and DISCONNECT. Hence we can tell during context_map_deactivate() whether the cleanup is graceful (DISCONNECT already sent) or non-graceful (need to DISCONNECT). Change-Id: Icc2db9f6c0b2d0a814ff1110ffbe5e8f7f629222 --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_rua.c 4 files changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/28/31028/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 99efe8a..fe09da0 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -43,6 +43,10 @@ bool is_ps; /* SCCP User SAP connection ID */ uint32_t scu_conn_id; + /* Set to true on SCCP Conn Conf, set to false when an OSMO_SCU_PRIM_N_DISCONNECT has been sent for the SCCP + * User SAP conn. Useful to avoid leaking SCCP connections: guarantee that an OSMO_SCU_PRIM_N_DISCONNECT gets + * sent, even when RUA fails to gracefully disconnect. */ + bool scu_conn_active; /* Pending data to be sent: when we send an "empty" SCCP CR first, the initial RANAP message will be sent in a * separate DT once the CR is confirmed. This caches the initial RANAP message. */ struct msgb *cached_msg; diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index 98dffad..31ba032 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -26,6 +26,8 @@ #include <osmocom/core/timer.h> +#include <osmocom/sigtran/sccp_helpers.h> + #include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/hnbgw_rua.h> #include <osmocom/hnbgw/context_map.h> @@ -174,6 +176,12 @@ if (map->state != MAP_S_RESERVED2) map->state = MAP_S_RESERVED1; + /* Is SCCP still active and needs to be disconnected ungracefully? */ + if (map->scu_conn_active) { + osmo_sccp_tx_disconn(map->hnb_ctx->gw->sccp.cnlink->sccp_user, map->scu_conn_id, NULL, 0); + map->scu_conn_active = false; + } + /* a possibly still existing MGW FSM must be terminated when the context * map is deactivated. (this is a cornercase) */ if (map->mgw_fi) { diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 7cbfcec..c4189e8 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -337,6 +337,8 @@ struct osmo_prim_hdr *oph) { struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(cnlink->gw->sccp.client); + struct hnbgw_context_map *map; + LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s calling=%s responding=%s\n", param->conn_id, osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, &param->called_addr), @@ -346,9 +348,17 @@ /* Nothing needs to happen for RUA, RUA towards the HNB doesn't seem to know any confirmations to its CONNECT * operation. */ + map = context_map_by_cn(cnlink, param->conn_id); + if (!map) + return 0; + + /* SCCP connection is confirmed. Mark conn as active, i.e. requires a DISCONNECT to clean up the SCCP + * connection. */ + map->scu_conn_active = true; + /* If our initial SCCP CR was sent without data payload, then the initial RANAP message is cached and waiting to * be sent as soon as the SCCP connection is confirmed. See if that is the case, send cached data. */ - context_map_send_cached_msg(context_map_by_cn(cnlink, param->conn_id)); + context_map_send_cached_msg(map); return 0; } diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index f4e24d7..215379a 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -252,6 +252,9 @@ prim->u.disconnect.conn_id = map->scu_conn_id; prim->u.disconnect.cause = cause; release_context_map = true; + /* Mark SCCP conn as gracefully disconnected */ + if (map) + map->scu_conn_active = false; break; case OSMO_SCU_PRIM_N_UNITDATA: prim->u.unitdata.called_addr = *remote_addr; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/31028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icc2db9f6c0b2d0a814ff1110ffbe5e8f7f629222 Gerrit-Change-Number: 31028 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: Add osmo_io with initial poll backend

by laforge

Attention is currently required from: osmith, Hoernchen, neels, pespin, fixeria, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend ...................................................................... Patch Set 4: (6 comments) File src/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/6d24eba8_18c9e1a3 PS3, Line 356: unsigned int size, unsigned int headroom, : int fd > I guess we could even have defaults for msgb size/headroom and have osmo_iofd_set_alloc_info() avail […] yes, we could go for that. https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/c2d9f460_4318f3f3 PS3, Line 414: talloc_free(iofd); > The close callback return value indicates whether the free() should be deferred or not, it does not […] I think Pau's comment was related to the ops.close == NULL case, where you don't free the iofd at all. So I guess talloc_free should be called if (close == NULL || (close && close(iofd)) File src/osmo_io_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/ea5723dc_ec22fb88 PS3, Line 87: // TODO: SCTP_* > I wanted to keep this patch as-is and add sctp support in a separate one. […] Ack File src/osmo_io_poll.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/3c922bdc_5f9c8cd9 PS3, Line 40: what > In socket.c it's called what in the callback, when in the ofd and flags in the internal code. […] Ack https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/06a0b455_8e16eca4 PS3, Line 71: rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); > There is no iofd->flags, did you mean msghdr->flags? […] the normal "read/write" case might be worth a dedicated function as we don't need a serialized msgheader heap allocation for those, right? https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/0f9dbbd6_88b2d852 PS3, Line 104: socklen_t addrlen = sizeof(struct sockaddr); > I'd use sizeof(saddr) since that most accurately describes the size recvfrom is allowed to write to. Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Jan 2023 16:35:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-hlr[master]: Add vty `reject-cause` to set the reject cause

by keith

keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `reject-cause` to set the reject cause ...................................................................... Add vty `reject-cause` to set the reject cause Allow to set the LU reject cause independently for both of the following cases; either when an IMSI is unknown to the HLR or when the mslookup client does not a receive a timely response to a GSUP request for the remote home HLR. Original patchset modified by <keith(a)rhizomatica.org> Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a --- M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M src/hlr.c M src/hlr_vty.c M src/lu_fsm.c M src/proxy.c M tests/test_nodes.vty 7 files changed, 98 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hlr/hlr.h b/include/osmocom/hlr/hlr.h index 3acb3c5..b27fb3d 100644 --- a/include/osmocom/hlr/hlr.h +++ b/include/osmocom/hlr/hlr.h @@ -23,6 +23,7 @@ #pragma once #include <stdbool.h> +#include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/core/linuxlist.h> #include <osmocom/gsm/ipa.h> #include <osmocom/core/tdef.h> @@ -55,6 +56,8 @@ struct llist_head euse_list; struct hlr_euse *euse_default; + enum gsm48_gmm_cause reject_cause; + enum gsm48_gmm_cause no_proxy_reject_cause; /* NCSS (call independent) session guard timeout value */ int ncss_guard_timeout; diff --git a/include/osmocom/hlr/hlr_vty.h b/include/osmocom/hlr/hlr_vty.h index 10eddc3..83691b8 100644 --- a/include/osmocom/hlr/hlr_vty.h +++ b/include/osmocom/hlr/hlr_vty.h @@ -45,5 +45,5 @@ int hlr_vty_is_config_node(struct vty *vty, int node); int hlr_vty_go_parent(struct vty *vty); -void hlr_vty_init(void); +void hlr_vty_init(void *hlr_ctx); void dgsm_vty_init(void); diff --git a/src/hlr.c b/src/hlr.c index c6ae4fc..8183d9b 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -324,7 +324,7 @@ " Returning slightly inaccurate cause 'IMSI Unknown' via GSUP"); return rc; case -ENOENT: - osmo_gsup_req_respond_err(req, GMM_CAUSE_IMSI_UNKNOWN, "IMSI unknown"); + osmo_gsup_req_respond_err(req, g_hlr->reject_cause, "IMSI unknown"); return rc; default: osmo_gsup_req_respond_err(req, GMM_CAUSE_NET_FAIL, "failure to look up IMSI in db"); @@ -759,6 +759,8 @@ 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); g_hlr->mslookup.client.mdns.domain_suffix = talloc_strdup(g_hlr, OSMO_MDNS_DOMAIN_SUFFIX_DEFAULT); + g_hlr->reject_cause = GMM_CAUSE_IMSI_UNKNOWN; + g_hlr->no_proxy_reject_cause = GMM_CAUSE_IMSI_UNKNOWN; /* Init default (call independent) SS session guard timeout value */ g_hlr->ncss_guard_timeout = NCSS_GUARD_TIMEOUT_DEFAULT; @@ -775,7 +777,7 @@ osmo_stats_init(hlr_ctx); vty_init(&vty_info); ctrl_vty_init(hlr_ctx); - hlr_vty_init(); + hlr_vty_init(hlr_ctx); dgsm_vty_init(); osmo_cpu_sched_vty_init(hlr_ctx); handle_options(argc, argv); diff --git a/src/hlr_vty.c b/src/hlr_vty.c index a440c42..02e0cde 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -25,7 +25,10 @@ * */ +#include <errno.h> + #include <osmocom/core/talloc.h> +#include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/stats.h> #include <osmocom/vty/command.h> @@ -40,6 +43,36 @@ #include <osmocom/hlr/hlr_ussd.h> #include <osmocom/hlr/gsup_server.h> +static const struct value_string gsm48_gmm_cause_vty_names[] = { + { GMM_CAUSE_IMSI_UNKNOWN, "imsi-unknown" }, + { GMM_CAUSE_ILLEGAL_MS, "illegal-ms" }, + { GMM_CAUSE_PLMN_NOTALLOWED, "plmn-not-allowed" }, + { GMM_CAUSE_LA_NOTALLOWED, "la-not-allowed" }, + { GMM_CAUSE_ROAMING_NOTALLOWED, "roaming-not-allowed" }, + { GMM_CAUSE_NO_SUIT_CELL_IN_LA, "no-suitable-cell-in-la" }, + { GMM_CAUSE_NET_FAIL, "net-fail" }, + { GMM_CAUSE_CONGESTION, "congestion" }, + { GMM_CAUSE_GSM_AUTH_UNACCEPT, "auth-unacceptable" }, + { GMM_CAUSE_PROTO_ERR_UNSPEC, "proto-error-unspec" }, + { 0, NULL }, +}; + +/* TS 24.008 4.4.4.7 */ +static const struct value_string gsm48_gmm_cause_vty_descs[] = { + { GMM_CAUSE_IMSI_UNKNOWN, " #02: (IMSI unknown in HLR)" }, + { GMM_CAUSE_ILLEGAL_MS, " #03 (Illegal MS)" }, + { GMM_CAUSE_PLMN_NOTALLOWED, " #11: (PLMN not allowed)" }, + { GMM_CAUSE_LA_NOTALLOWED, " #12: (Location Area not allowed)" }, + { GMM_CAUSE_ROAMING_NOTALLOWED, " #13: (Roaming not allowed in this location area)" }, + { GMM_CAUSE_NO_SUIT_CELL_IN_LA, " #15: (No Suitable Cells In Location Area [continue search in PLMN])." }, + { GMM_CAUSE_NET_FAIL, " #17: (Network Failure)" }, + { GMM_CAUSE_CONGESTION, " #22: (Congestion)" }, + { GMM_CAUSE_GSM_AUTH_UNACCEPT, " #23: (GSM authentication unacceptable [UMTS])" }, + { GMM_CAUSE_PROTO_ERR_UNSPEC, "#111: (Protocol error, unspecified)" }, + { 0, NULL }, +}; + + struct cmd_node hlr_node = { HLR_NODE, "%s(config-hlr)# ", @@ -73,6 +106,15 @@ static int config_write_hlr(struct vty *vty) { vty_out(vty, "hlr%s", VTY_NEWLINE); + + if (g_hlr->reject_cause != GMM_CAUSE_IMSI_UNKNOWN) + vty_out(vty, " reject-cause not-found %s%s", + get_value_string_or_null(gsm48_gmm_cause_vty_names, + (uint32_t) g_hlr->reject_cause), VTY_NEWLINE); + if (g_hlr->no_proxy_reject_cause != GMM_CAUSE_IMSI_UNKNOWN) + vty_out(vty, " reject-cause no-proxy %s%s", + get_value_string_or_null(gsm48_gmm_cause_vty_names, + (uint32_t) g_hlr->no_proxy_reject_cause), VTY_NEWLINE); if (g_hlr->store_imei) vty_out(vty, " store-imei%s", VTY_NEWLINE); if (g_hlr->db_file_path && strcmp(g_hlr->db_file_path, HLR_DEFAULT_DB_FILE_PATH)) @@ -358,6 +400,21 @@ return CMD_SUCCESS; } + +DEFUN(cfg_reject_cause, cfg_reject_cause_cmd, + "reject-cause TYPE CAUSE", "") /* Dynamically Generated */ +{ + int cause_code = get_string_value(gsm48_gmm_cause_vty_names, argv[1]); + OSMO_ASSERT(cause_code >= 0); + + if (strcmp(argv[0], "not-found") == 0) + g_hlr->reject_cause = (enum gsm48_gmm_cause) cause_code; + if (strcmp(argv[0], "no-proxy") == 0) + g_hlr->no_proxy_reject_cause = (enum gsm48_gmm_cause) cause_code; + + return CMD_SUCCESS; +} + DEFUN(cfg_store_imei, cfg_store_imei_cmd, "store-imei", "Save the IMEI in the database when receiving Check IMEI requests. Note that an MSC does not necessarily send" @@ -450,8 +507,22 @@ } } -void hlr_vty_init(void) +void hlr_vty_init(void *hlr_ctx) { + cfg_reject_cause_cmd.string = + vty_cmd_string_from_valstr(hlr_ctx, + gsm48_gmm_cause_vty_names, + "reject-cause (not-found|no-proxy) (", "|", ")", + VTY_DO_LOWER); + + cfg_reject_cause_cmd.doc = + vty_cmd_string_from_valstr(hlr_ctx, + gsm48_gmm_cause_vty_descs, + "GSUP/GMM cause to be sent\n" + "in the case the IMSI could not be found in the database\n" + "in the case no remote HLR reponded to mslookup GSUP request\n", + "\n", "", 0); + logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds(); @@ -478,6 +549,7 @@ 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_element(HLR_NODE, &cfg_reject_cause_cmd); install_element(HLR_NODE, &cfg_store_imei_cmd); install_element(HLR_NODE, &cfg_no_store_imei_cmd); install_element(HLR_NODE, &cfg_subscr_create_on_demand_cmd); diff --git a/src/lu_fsm.c b/src/lu_fsm.c index 8f02f5a..deb180b 100644 --- a/src/lu_fsm.c +++ b/src/lu_fsm.c @@ -136,7 +136,7 @@ } if (db_subscr_get_by_imsi(g_hlr->dbc, update_location_req->gsup.imsi, &lu->subscr) < 0) { - lu_failure(lu, GMM_CAUSE_IMSI_UNKNOWN, "Subscriber does not exist"); + lu_failure(lu, g_hlr->reject_cause, "Subscriber does not exist"); return; } diff --git a/src/proxy.c b/src/proxy.c index 152fce8..e909d5a 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -29,6 +29,7 @@ #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/gsupclient/gsup_req.h> +#include <osmocom/hlr/hlr.h> #include <osmocom/hlr/logging.h> #include <osmocom/hlr/proxy.h> #include <osmocom/hlr/remote_hlr.h> @@ -80,7 +81,19 @@ static void proxy_pending_req_remote_hlr_connect_result(struct osmo_gsup_req *req, struct remote_hlr *remote_hlr) { if (!remote_hlr || !remote_hlr_is_up(remote_hlr)) { - osmo_gsup_req_respond_err(req, GMM_CAUSE_IMSI_UNKNOWN, "Proxy: Failed to connect to home HLR"); + /* Do not respond with an error to a CHECK_IMEI_REQUEST as osmo-msc will send a LU Reject Cause #6 + * Just respond ACK and deal with the IMSI check that comes next. */ + if (req->gsup.message_type == OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST) { + /* Accept all IMEIs */ + struct osmo_gsup_message gsup_reply = (struct osmo_gsup_message){ + .message_type = OSMO_GSUP_MSGT_CHECK_IMEI_RESULT, + .imei_result = OSMO_GSUP_IMEI_RESULT_ACK, + }; + osmo_gsup_req_respond(req, &gsup_reply, false, true); + return; + } + osmo_gsup_req_respond_err(req, g_hlr->no_proxy_reject_cause, + "Proxy: Failed to connect to home HLR"); return; } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 0f02f22..ac5d88d 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 + 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. OsmoHLR(config-hlr)# list @@ -61,6 +62,7 @@ ussd default-route external EUSE no ussd default-route ncss-guard-timeout <0-255> + 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 subscriber-create-on-demand (no-msisdn|<3-15>) (none|cs|ps|cs+ps) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-hlr[master]: Add vty `reject-cause` to set the reject cause

by keith

Attention is currently required from: neels, pespin, daniel, lynxis lazus. keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16808 ) Change subject: Add vty `reject-cause` to set the reject cause ...................................................................... Patch Set 11: (1 comment) Patchset: PS11: > Hi, […] I created a feature request https://osmocom.org/issues/5865 It's not that I don't think this issue could be refined, but I don't think this patch does anything badly, per se, and can be built upon if anyway wants further functionality. So merging. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icea39020c23fbbea9e92847df76af8986fdbf48a Gerrit-Change-Number: 16808 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 20 Jan 2023 14:02:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: keith <keith(a)rhizomatica.org> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023