- gerrit-log - lists.osmocom.org

Change in osmo-hlr[master]: cosmetic: hlr_vty_subscr.c: Fix trailing whitespace
by pespin 20 Jun '22

20 Jun '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/28394 ) Change subject: cosmetic: hlr_vty_subscr.c: Fix trailing whitespace ...................................................................... cosmetic: hlr_vty_subscr.c: Fix trailing whitespace Change-Id: Id751d227a52f39e3a8874d8b78c633b8d3eb9e74 --- M src/hlr_vty_subscr.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/94/28394/1 diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index 82e0043..3813393 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -346,7 +346,7 @@ int rc; struct hlr_subscriber subscr; const char *imsi = argv[0]; - + if (!osmo_imsi_str_valid(imsi)) { vty_out(vty, "%% Not a valid IMSI: %s%s", imsi, VTY_NEWLINE); return CMD_WARNING; @@ -636,7 +636,7 @@ .ind_bitlen = ind_bitlen, }, }; - + if (!auth_algo_parse(alg_type, &aud3g.algo, &minlen, &maxlen)) { vty_out(vty, "%% Unknown auth algorithm: '%s'%s", alg_type, VTY_NEWLINE); return CMD_WARNING; -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/28394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Id751d227a52f39e3a8874d8b78c633b8d3eb9e74 Gerrit-Change-Number: 28394 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bts[master]: bts-sysmo: Replace use of deprecated ipa_client_conn_create API
by fixeria 20 Jun '22

20 Jun '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/28392 ) Change subject: bts-sysmo: Replace use of deprecated ipa_client_conn_create API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief4d629f366e4f69ccd489198302568a919b2f0c Gerrit-Change-Number: 28392 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Jun 2022 17:08:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: lint: ignore test output in .ctrl, .vty files
by osmith 20 Jun '22

20 Jun '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28393 ) Change subject: lint: ignore test output in .ctrl, .vty files ...................................................................... lint: ignore test output in .ctrl, .vty files Change-Id: I7611bb1b26c4abbfb572182a490f289216e7b708 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index 084a7ea..2194caa 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -4,8 +4,8 @@ PROJECT="$(basename "$PROJECT_DIR")" exclude_paths_common() { - # Stdout and stderr of regression tests - echo '--exclude \.(ok|err)$' + # Test output + echo '--exclude \.(ok|err|ctrl|vty)$' # Generated from commit log, which may contain spelling errors (OS#5232) echo '--exclude ^debian/changelog$' # Patch files -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7611bb1b26c4abbfb572182a490f289216e7b708 Gerrit-Change-Number: 28393 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: lint: ignore test output in .ctrl, .vty files
by pespin 20 Jun '22

20 Jun '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28393 ) Change subject: lint: ignore test output in .ctrl, .vty files ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7611bb1b26c4abbfb572182a490f289216e7b708 Gerrit-Change-Number: 28393 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Jun 2022 13:33:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: lint: ignore test output in .ctrl, .vty files
by osmith 20 Jun '22

20 Jun '22

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28393 ) Change subject: lint: ignore test output in .ctrl, .vty files ...................................................................... Patch Set 1: (1 comment) File lint/checkpatch/checkpatch_osmo.sh: https://gerrit.osmocom.org/c/osmo-ci/+/28393/comment/f7572c87_0b804fe6 PS1, Line 8: echo '--exclude \.(ok|err|ctrl)$' > .vty files are probably also needed here, right? Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7611bb1b26c4abbfb572182a490f289216e7b708 Gerrit-Change-Number: 28393 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Jun 2022 13:29:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: lint: ignore test output in .ctrl, .vty files
by osmith 20 Jun '22

20 Jun '22

Attention is currently required from: osmith. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/28393 to look at the new patch set (#2). Change subject: lint: ignore test output in .ctrl, .vty files ...................................................................... lint: ignore test output in .ctrl, .vty files Change-Id: I7611bb1b26c4abbfb572182a490f289216e7b708 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/93/28393/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7611bb1b26c4abbfb572182a490f289216e7b708 Gerrit-Change-Number: 28393 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-bsc[master]: logs: also record which BTS is signaling a SAPI REJECT
by pespin 20 Jun '22

20 Jun '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28390 ) Change subject: logs: also record which BTS is signaling a SAPI REJECT ...................................................................... logs: also record which BTS is signaling a SAPI REJECT Change-Id: I4d25cc4cf55b03c7311ba58cf6feae06c3028a5d --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 6d6f57c..37e00f3 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -71,12 +71,14 @@ { int rc; struct msgb *resp; + struct gsm_bts *bts; if (!msc_connected(conn)) return; - LOGP(DMSC, LOGL_NOTICE, "Tx MSC SAPI N REJECT (dlci=0x%02x, cause='%s')\n", - dlci, gsm0808_cause_name(cause)); + bts = conn_get_bts(conn); + LOG_BTS(bts, DMSC, LOGL_NOTICE, "Tx MSC SAPI N REJECT (dlci=0x%02x, cause='%s')\n", + dlci, gsm0808_cause_name(cause)); resp = gsm0808_create_sapi_reject_cause(dlci, cause); rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_SAPI_N_REJECT)); rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4d25cc4cf55b03c7311ba58cf6feae06c3028a5d Gerrit-Change-Number: 28390 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc[master]: logs: also record which BTS is signaling a SAPI REJECT
by pespin 20 Jun '22

20 Jun '22

Attention is currently required from: iedemam. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28390 ) Change subject: logs: also record which BTS is signaling a SAPI REJECT ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4d25cc4cf55b03c7311ba58cf6feae06c3028a5d Gerrit-Change-Number: 28390 Gerrit-PatchSet: 2 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Mon, 20 Jun 2022 13:28:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: lint: ignore test output in .ctrl files
by pespin 20 Jun '22

20 Jun '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28393 ) Change subject: lint: ignore test output in .ctrl files ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File lint/checkpatch/checkpatch_osmo.sh: https://gerrit.osmocom.org/c/osmo-ci/+/28393/comment/a1a5a190_c03a2da8 PS1, Line 8: echo '--exclude \.(ok|err|ctrl)$' .vty files are probably also needed here, right? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7611bb1b26c4abbfb572182a490f289216e7b708 Gerrit-Change-Number: 28393 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Jun 2022 13:26:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-hlr[master]: ctrl: Introduce CTRL command subscriber.by-*.msisdn
by pespin 20 Jun '22

20 Jun '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/28319 ) Change subject: ctrl: Introduce CTRL command subscriber.by-*.msisdn ...................................................................... ctrl: Introduce CTRL command subscriber.by-*.msisdn This command provides getter and setter to set and retrieve the MSISDN of a subscriber. Related: SYS#5993 Change-Id: I5f2e807859f7e28e0984c8dc37edc69319fd8e10 --- M src/ctrl.c M tests/test_subscriber.ctrl M tests/test_subscriber_errors.ctrl 3 files changed, 101 insertions(+), 0 deletions(-) Approvals: pespin: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/src/ctrl.c b/src/ctrl.c index 5b091f8..aa02a0e 100644 --- a/src/ctrl.c +++ b/src/ctrl.c @@ -388,6 +388,57 @@ return set_subscr_cs_ps_enabled(cmd, data, false); } +CTRL_CMD_DEFINE(subscr_msisdn, "msisdn"); +static int verify_subscr_msisdn(struct ctrl_cmd *cmd, const char *value, void *data) +{ + struct hlr_subscriber subscr; + if (!value) + return 1; + if (strlen(value) > sizeof(subscr.msisdn) - 1) + return 1; + if (strcmp(value, "none") != 0 && !osmo_msisdn_str_valid(value)) + return 1; + return 0; +} +static int get_subscr_msisdn(struct ctrl_cmd *cmd, void *data) +{ + struct hlr_subscriber subscr; + struct hlr *hlr = data; + const char *by_selector = cmd->node; + + if (!get_subscriber(hlr->dbc, by_selector, &subscr, cmd)) + return CTRL_CMD_ERROR; + + if (strlen(subscr.msisdn) == 0) + snprintf(subscr.msisdn, sizeof(subscr.msisdn), "none"); + + cmd->reply = talloc_asprintf(cmd, "%s", subscr.msisdn); + return CTRL_CMD_REPLY; +} +static int set_subscr_msisdn(struct ctrl_cmd *cmd, void *data) +{ + struct hlr_subscriber subscr; + struct hlr *hlr = data; + const char *by_selector = cmd->node; + const char *msisdn; + + if (!get_subscriber(hlr->dbc, by_selector, &subscr, cmd)) + return CTRL_CMD_ERROR; + + if (strcmp(cmd->value, "none") == 0) + msisdn = NULL; + else + msisdn = cmd->value; + + if (db_subscr_update_msisdn_by_imsi(g_hlr->dbc, subscr.imsi, msisdn)) { + cmd->reply = "Update MSISDN failed"; + return CTRL_CMD_ERROR; + } + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + static int hlr_ctrl_node_lookup(void *data, vector vline, int *node_type, void **node_data, int *i) { @@ -424,6 +475,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_info_all); rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_ps_enabled); rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_cs_enabled); + rc |= ctrl_cmd_install(CTRL_NODE_SUBSCR_BY, &cmd_subscr_msisdn); return rc; } diff --git a/tests/test_subscriber.ctrl b/tests/test_subscriber.ctrl index 8d3c9dc..5b49702 100644 --- a/tests/test_subscriber.ctrl +++ b/tests/test_subscriber.ctrl @@ -624,3 +624,49 @@ periodic_lu_timer 0 periodic_rau_tau_timer 0 lmsi 00000000 + +GET 103 subscriber.by-imsi-901991234567891.msisdn +GET_REPLY 103 subscriber.by-imsi-901991234567891.msisdn none + +SET 104 subscriber.by-imsi-901991234567891.msisdn 555666 +SET_REPLY 104 subscriber.by-imsi-901991234567891.msisdn OK + +GET 105 subscriber.by-imsi-901991234567891.msisdn +GET_REPLY 105 subscriber.by-imsi-901991234567891.msisdn 555666 + +SET 106 subscriber.by-imsi-901991234567891.msisdn 888000 +SET_REPLY 106 subscriber.by-imsi-901991234567891.msisdn OK + +GET 107 subscriber.by-imsi-901991234567891.msisdn +GET_REPLY 107 subscriber.by-imsi-901991234567891.msisdn 888000 + +GET 108 subscriber.by-imsi-901991234567891.info +GET_REPLY 108 subscriber.by-imsi-901991234567891.info +id 124 +imsi 901991234567891 +msisdn 888000 +nam_cs 1 +nam_ps 1 +ms_purged_cs 0 +ms_purged_ps 0 +periodic_lu_timer 0 +periodic_rau_tau_timer 0 +lmsi 00000000 + +SET 109 subscriber.by-imsi-901991234567891.msisdn none +SET_REPLY 109 subscriber.by-imsi-901991234567891.msisdn OK + +GET 110 subscriber.by-imsi-901991234567891.msisdn +GET_REPLY 110 subscriber.by-imsi-901991234567891.msisdn none + +GET 111 subscriber.by-imsi-901991234567891.info +GET_REPLY 111 subscriber.by-imsi-901991234567891.info +id 124 +imsi 901991234567891 +nam_cs 1 +nam_ps 1 +ms_purged_cs 0 +ms_purged_ps 0 +periodic_lu_timer 0 +periodic_rau_tau_timer 0 +lmsi 00000000 diff --git a/tests/test_subscriber_errors.ctrl b/tests/test_subscriber_errors.ctrl index 425b0df..8309e61 100644 --- a/tests/test_subscriber_errors.ctrl +++ b/tests/test_subscriber_errors.ctrl @@ -114,3 +114,6 @@ SET 50 subscriber.create 901990000000001 ERROR 50 Subscriber already exists. + +SET 51 subscriber.by-imsi-1234567890123456.msisdn hellobadmsisdn +ERROR 51 Value failed verification. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/28319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5f2e807859f7e28e0984c8dc37edc69319fd8e10 Gerrit-Change-Number: 28319 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2025

2024

2023

2022

gerrit-log