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

[S] Change in osmocom-bb[master]: layer23: modem: Fix wrong 'radio not started' vty message

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32420 ) Change subject: layer23: modem: Fix wrong 'radio not started' vty message ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8871c9d0e820beb75d7820b5a2d8d3c77dac379d Gerrit-Change-Number: 32420 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Apr 2023 11:16:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Use GSM23003_IMEI(SV)_NUM_DIGITS from libosmocore

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32437 ) Change subject: layer23: Use GSM23003_IMEI(SV)_NUM_DIGITS from libosmocore ...................................................................... layer23: Use GSM23003_IMEI(SV)_NUM_DIGITS from libosmocore Change-Id: I12a96043947c0f5366f550944a4df5edd2fd2c9d --- M src/host/layer23/include/osmocom/bb/common/settings.h 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/32437/1 diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 60b9df1..88ce280 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -69,8 +69,8 @@ struct audio_settings audio; /* IMEI */ - char imei[16]; - char imeisv[17]; + char imei[GSM23003_IMEI_NUM_DIGITS + 1]; + char imeisv[GSM23003_IMEISV_NUM_DIGITS + 1]; char imei_random; /* network search */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I12a96043947c0f5366f550944a4df5edd2fd2c9d Gerrit-Change-Number: 32437 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Use OSMO_IMSI_BUF_SIZE from libosmocore

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/32436 to look at the new patch set (#2). Change subject: layer23: Use OSMO_IMSI_BUF_SIZE from libosmocore ...................................................................... layer23: Use OSMO_IMSI_BUF_SIZE from libosmocore Change-Id: I295444bb3b75ed236ea4af5563d9a9c9e590cab7 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/subscriber.c 3 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/36/32436/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I295444bb3b75ed236ea4af5563d9a9c9e590cab7 Gerrit-Change-Number: 32436 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[L] Change in osmocom-bb[master]: layer23: Move testsim node to common/

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32419 ) Change subject: layer23: Move testsim node to common/ ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ife34403a715809b43e7a4cd5ce4dec8616fc08af Gerrit-Change-Number: 32419 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Apr 2023 11:15:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Use libosmocore API to validate IMSI string

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32418 ) Change subject: layer23: Use libosmocore API to validate IMSI string ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2d4737dabcfb83a7b675c35ad973029a36658d5b Gerrit-Change-Number: 32418 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Apr 2023 11:10:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: common/vty: Drop includes pointing to mobile app

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32417 ) Change subject: layer23: common/vty: Drop includes pointing to mobile app ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I025b09500547a739240fc07fa04cb38378ed71db Gerrit-Change-Number: 32417 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Apr 2023 11:09:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[L] Change in osmocom-bb[master]: layer23: Move vty_notify() to common/

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32416 ) Change subject: layer23: Move vty_notify() to common/ ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic0a98e66adffa9fefeee6e69a4b5c691e0e9c789 Gerrit-Change-Number: 32416 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Apr 2023 11:09:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Use OSMO_IMSI_BUF_SIZE from libosmocore

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32436 ) Change subject: layer23: Use OSMO_IMSI_BUF_SIZE from libosmocore ...................................................................... layer23: Use OSMO_IMSI_BUF_SIZE from libosmocore Change-Id: I295444bb3b75ed236ea4af5563d9a9c9e590cab7 --- M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/subscriber.c 2 files changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/36/32436/1 diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index 8b15295..9f945e9 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -1,6 +1,8 @@ #ifndef _SUBSCRIBER_H #define _SUBSCRIBER_H +#include <osmocom/gsm/protocol/gsm_23_003.h> + /* GSM 04.08 4.1.2.2 SIM update status */ #define GSM_SIM_U0_NULL 0 #define GSM_SIM_U1_UPDATED 1 @@ -18,8 +20,6 @@ uint8_t cause; }; -#define GSM_IMSI_LENGTH 16 - #define GSM_SIM_IS_READER(type) \ (type == GSM_SIM_TYPE_L1PHY || type == GSM_SIM_TYPE_SAP) @@ -40,7 +40,7 @@ uint8_t imsi_attached; /* attached state */ /* IMSI & co */ - char imsi[GSM_IMSI_LENGTH]; + char imsi[OSMO_IMSI_BUF_SIZE]; char msisdn[31]; /* may include access codes */ char iccid[21]; /* 20 + termination */ diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 1683b09..6b18e7c 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -229,7 +229,7 @@ /* decode IMSI, skip first digit (parity) */ imsi = sim_decode_bcd(data + 1, length); - if (strlen(imsi) - 1 > GSM_IMSI_LENGTH - 1 || strlen(imsi) - 1 < 6) { + if (strlen(imsi) - 1 > OSMO_IMSI_BUF_SIZE - 1 || strlen(imsi) - 1 < 6) { LOGP(DMM, LOGL_NOTICE, "IMSI invalid length = %zu\n", strlen(imsi) - 1); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I295444bb3b75ed236ea4af5563d9a9c9e590cab7 Gerrit-Change-Number: 32436 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Use GSM_RESERVED_TMSI from libosmocore everywhere

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32435 ) Change subject: layer23: Use GSM_RESERVED_TMSI from libosmocore everywhere ...................................................................... layer23: Use GSM_RESERVED_TMSI from libosmocore everywhere Change-Id: Ib9483b8ae4067994aef523291733ae706ffabe7a --- M src/host/layer23/src/common/settings.c M src/host/layer23/src/common/subscriber.c M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/vty_interface.c 5 files changed, 25 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/35/32435/1 diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index d391f7d..565da96 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -19,6 +19,7 @@ #include <errno.h> #include <string.h> #include <osmocom/core/talloc.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/utils.h> @@ -69,7 +70,7 @@ strcpy(set->test_imsi, "001010000000000"); set->test_rplmn_mcc = set->test_rplmn_mnc = 1; set->test_lac = 0x0000; - set->test_tmsi = 0xffffffff; + set->test_tmsi = GSM_RESERVED_TMSI; /* set all supported features */ set->sms_ptp = sup->sms_ptp; diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index d80515d..1683b09 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -22,6 +22,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/crypt/auth.h> #include <osmocom/gsm/gsm23003.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> @@ -77,7 +78,7 @@ subscr->ms = ms; /* set TMSI / LAC invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* set key invalid */ @@ -1161,7 +1162,7 @@ subscr->sms_sca); print(priv, " Status: %s IMSI %s", subscr_ustate_names[subscr->ustate], (subscr->imsi_attached) ? "attached" : "detached"); - if (subscr->tmsi != 0xffffffff) + if (subscr->tmsi != GSM_RESERVED_TMSI) print(priv, " TMSI 0x%08x", subscr->tmsi); if (subscr->lac > 0x0000 && subscr->lac < 0xfffe) { print(priv, "\n"); diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index dc6e580..58ddf06 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -635,7 +635,7 @@ if (argc >= 4) set->test_tmsi = strtoul(argv[3], NULL, 16); else - set->test_tmsi = 0xffffffff; + set->test_tmsi = GSM_RESERVED_TMSI; if (attached) set->test_imsi_attached = 1; diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 6c5a860..77f3094 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -1601,12 +1601,12 @@ gsm48_mm_tx_tmsi_reall_cpl(ms); break; case GSM_MI_TYPE_IMSI: - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; LOGP(DMM, LOGL_INFO, "TMSI removed.\n"); gsm48_mm_tx_tmsi_reall_cpl(ms); break; default: - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; LOGP(DMM, LOGL_NOTICE, "TMSI reallocation with unknown MI " "type %d.\n", mi_type); gsm48_mm_tx_mm_status(ms, GSM48_REJECT_INCORRECT_MESSAGE); @@ -1698,7 +1698,7 @@ subscr->sim_valid = 0; /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ @@ -2017,7 +2017,7 @@ subscr->sim_valid = 0; /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ @@ -2487,7 +2487,7 @@ break; case GSM_MI_TYPE_IMSI: LOGP(DMM, LOGL_INFO, "TMSI removed\n"); - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; /* store LOCI on sim */ gsm_subscr_write_loci(ms); @@ -2582,7 +2582,7 @@ case GSM48_REJECT_LOC_NOT_ALLOWED: case GSM48_REJECT_ROAMING_NOT_ALLOWED: /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ @@ -2705,7 +2705,7 @@ } /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ @@ -2913,7 +2913,7 @@ abort_any = 1; /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index e7f0454..8751de6 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -438,7 +438,7 @@ /* Initial testcard settings */ uint16_t mcc = 0x001, mnc = 0x01f, lac = 0x0000; - uint32_t tmsi = 0xffffffff; + uint32_t tmsi = GSM_RESERVED_TMSI; ms = l23_vty_get_ms(argv[0], vty); if (!ms) @@ -719,7 +719,7 @@ ms->subscr.mcc = mcc; ms->subscr.mnc = mnc; ms->subscr.lac = lac; - ms->subscr.tmsi = 0xffffffff; + ms->subscr.tmsi = GSM_RESERVED_TMSI; gsm_subscr_write_loci(ms); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib9483b8ae4067994aef523291733ae706ffabe7a Gerrit-Change-Number: 32435 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master,gerrit: use PFCP var for osmo-hnbgw

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/32432 ) Change subject: jobs/master,gerrit: use PFCP var for osmo-hnbgw ...................................................................... jobs/master,gerrit: use PFCP var for osmo-hnbgw Build osmo-hnbgw with and without PFCP. Build the manuals with PFCP, so it includes the additional VTY commands. Related: OS#6013 Change-Id: I4a4e25e0c179c0d408c3728a28eb75bbfa086f48 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 42 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/32432/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f32a07c..537e335 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -369,7 +369,21 @@ - osmo-smlc - osmo-gbproxy - osmo-hnodeb - - osmo-hnbgw + + - osmo-hnbgw: + a1_name: PFCP + a1: !!python/tuple [--enable-pfcp, --disable-pfcp] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (PFCP == "--enable-pfcp" && WITH_MANUALS == "1") || + (PFCP == "--disable-pfcp" && WITH_MANUALS == "0") + cmd: | + {docker_run_ccache} \ + -e PFCP="$PFCP" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh + - osmo-upf - pysim: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 828bf52..0953c0d 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -469,7 +469,20 @@ - osmo-smlc - osmo-gbproxy - osmo-hnodeb - - osmo-hnbgw + + - osmo-hnbgw: + a1_name: PFCP + a1: !!python/tuple [--enable-pfcp, --disable-pfcp] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (PFCP == "--enable-pfcp" && WITH_MANUALS == "1") || + (PFCP == "--disable-pfcp" && WITH_MANUALS == "0") + cmd: | + {docker_run_ccache} \ + -e PFCP="$PFCP" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - rtl-sdr: git_base_url: https://gitea.osmocom.org/sdr -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4a4e25e0c179c0d408c3728a28eb75bbfa086f48 Gerrit-Change-Number: 32432 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023