- gerrit-log - lists.osmocom.org

[S] Change in osmo-hlr[master]: src/hlr: reopen DB after changing schema version
by osmith 17 Mar '25

17 Mar '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39804?usp=email ) Change subject: src/hlr: reopen DB after changing schema version ...................................................................... src/hlr: reopen DB after changing schema version Close and reopen the DB after changing the version to so it gets written to disk. Otherwise it may be that the DB does not get closed, and when sqlite restores the DB the version can be 0 again, leading to errors when trying to re-apply the schema upgrades Related: SYS#7394 Change-Id: I5943a1cb3447c038c6e7972f68f9656b73a9248b --- M src/db.c M tests/db_upgrade/db_upgrade_test.ok 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/04/39804/1 diff --git a/src/db.c b/src/db.c index 7b8a415..c9f526c 100644 --- a/src/db.c +++ b/src/db.c @@ -595,6 +595,7 @@ int rc; bool has_sqlite_config_sqllog = false; int version; + bool version_changed = false; LOGP(DDB, LOGL_NOTICE, "using database: %s\n", fname); LOGP(DDB, LOGL_INFO, "Compiled against SQLite3 lib version %s\n", SQLITE_VERSION); @@ -672,6 +673,7 @@ goto out_free; } version = CURRENT_SCHEMA_VERSION; + version_changed = true; } LOGP(DDB, LOGL_NOTICE, "Database '%s' has HLR DB schema version %d\n", dbc->fname, version); @@ -686,6 +688,7 @@ } LOGP(DDB, LOGL_NOTICE, "Database '%s' has been upgraded to HLR DB schema version %d\n", dbc->fname, version+1); + version_changed = true; } if (version != CURRENT_SCHEMA_VERSION) { @@ -702,6 +705,17 @@ goto out_free; } + /* Close and reopen the DB after changing the version to so it gets + * written to disk. Otherwise it may be that the DB does not get + * closed, and when sqlite restores the DB the version can be 0 again, + * leading to errors when trying to re-apply the schema upgrades + * (SYS#7394). */ + if (version_changed) { + LOGP(DDB, LOGL_NOTICE, "HLR DB schema version was changed, reopening...\n"); + db_close(dbc); + return db_open(ctx, fname, enable_sqlite_logging, false); + } + /* prepare all SQL statements */ for (i = 0; i < ARRAY_SIZE(dbc->stmt); i++) { rc = sqlite3_prepare_v2(dbc->db, stmt_sql[i], -1, diff --git a/tests/db_upgrade/db_upgrade_test.ok b/tests/db_upgrade/db_upgrade_test.ok index c719498..7248606 100644 --- a/tests/db_upgrade/db_upgrade_test.ok +++ b/tests/db_upgrade/db_upgrade_test.ok @@ -87,6 +87,9 @@ DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 5 DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 6 DDB Database <PATH>test.db' has been upgraded to HLR DB schema version 7 +DDB HLR DB schema version was changed, reopening... +DDB using database: <PATH>test.db +DDB Database <PATH>test.db' has HLR DB schema version 7 DMAIN Cmdline option --db-check: Database was opened successfully, quitting. Resulting db: -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39804?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5943a1cb3447c038c6e7972f68f9656b73a9248b Gerrit-Change-Number: 39804 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: -h output: add more binary repo examples
by osmith 17 Mar '25

17 Mar '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39803?usp=email ) Change subject: testenv: -h output: add more binary repo examples ...................................................................... testenv: -h output: add more binary repo examples It wasn't clear how to use the nightly asan repository with testenv. Extend the help output for that. Change-Id: I5e18059f129423eac3374bd6beff32930a0f7c95 --- M _testenv/testenv/__init__.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index c1991ca..015ef24 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -43,6 +43,8 @@ " ./testenv.py run mgw\n" " ./testenv.py run mgw --test TC_crcx\n" " ./testenv.py run mgw --podman --binary-repo osmocom:latest\n" + " ./testenv.py run mgw --podman --binary-repo osmocom:nightly\n" + " ./testenv.py run mgw --podman --binary-repo osmocom:nightly:asan\n" " ./testenv.py run mgw --io-uring\n" " ./testenv.py run ggsn --config open5gs\n" " ./testenv.py run ggsn --config 'osmo_ggsn_v4_only'\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39803?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5e18059f129423eac3374bd6beff32930a0f7c95 Gerrit-Change-Number: 39803 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>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: -h output: add more binary repo examples
by pespin 17 Mar '25

17 Mar '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39803?usp=email ) Change subject: testenv: -h output: add more binary repo examples ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39803?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5e18059f129423eac3374bd6beff32930a0f7c95 Gerrit-Change-Number: 39803 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 11:05:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: -h output: add more binary repo examples
by osmith 17 Mar '25

17 Mar '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39803?usp=email ) Change subject: testenv: -h output: add more binary repo examples ...................................................................... testenv: -h output: add more binary repo examples It wasn't clear how to use the nightly asan repository with testenv. Extend the help output for that. Change-Id: I5e18059f129423eac3374bd6beff32930a0f7c95 --- M _testenv/testenv/__init__.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/39803/1 diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index c1991ca..015ef24 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -43,6 +43,8 @@ " ./testenv.py run mgw\n" " ./testenv.py run mgw --test TC_crcx\n" " ./testenv.py run mgw --podman --binary-repo osmocom:latest\n" + " ./testenv.py run mgw --podman --binary-repo osmocom:nightly\n" + " ./testenv.py run mgw --podman --binary-repo osmocom:nightly:asan\n" " ./testenv.py run mgw --io-uring\n" " ./testenv.py run ggsn --config open5gs\n" " ./testenv.py run ggsn --config 'osmo_ggsn_v4_only'\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39803?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5e18059f129423eac3374bd6beff32930a0f7c95 Gerrit-Change-Number: 39803 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-pcu[master]: checkpath: Exclude csn1 files
by pespin 17 Mar '25

17 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39782?usp=email ) Change subject: checkpath: Exclude csn1 files ...................................................................... checkpath: Exclude csn1 files CSN.1 parsing code is inherited/co-maintained with wireshark.git code, and used to have its own coding style, so avoid enforcing osmocom code style in there. Change-Id: Ib6e7d2dcc3d8f262092f0100e55cad397aa226f4 --- M .checkpatch.conf 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf index d808861..8194ffb 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -1 +1,4 @@ +--exclude ^src/csn1.c$ +--exclude ^src/csn1.h$ +--exclude ^src/csn1_(enc|dec).c$ --exclude ^src/gsm_rlcmac.c$ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39782?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib6e7d2dcc3d8f262092f0100e55cad397aa226f4 Gerrit-Change-Number: 39782 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcu[master]: csn1: Use enum to select enc/dec direction
by pespin 17 Mar '25

17 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email ) Change subject: csn1: Use enum to select enc/dec direction ...................................................................... csn1: Use enum to select enc/dec direction Change-Id: I845bcab61e354436bff1c3a0f2b6f49de9705716 --- M src/csn1.c M src/csn1.h M src/csn1_dec.c M src/csn1_enc.c M src/gsm_rlcmac.c 5 files changed, 12 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/csn1.c b/src/csn1.c index a9b1343..7148e8c 100644 --- a/src/csn1.c +++ b/src/csn1.c @@ -73,7 +73,7 @@ { ar->remaining_bits_len = remaining_bits_len; ar->bit_offset = bit_offset; - ar->direction = 0; + ar->direction = CSN_DIRECTION_ENC; } static const struct value_string csn1_error_names[] = { diff --git a/src/csn1.h b/src/csn1.h index 47956c3..6607b02 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -51,7 +51,10 @@ #define CSNCBS_REVISION_LIMIT_STOP -20 /* Stop packing/unpacking - revision limit */ #define CSNCBS_NOT_SUPPORTED_IE -21 /* Handling of the unpacked IE is not supported by MS-software */ - +enum CSN_Direction { + CSN_DIRECTION_ENC = 0, + CSN_DIRECTION_DEC = 1, +}; #ifndef ElementsOf #define ElementsOf(array) (sizeof(array) / sizeof(array[0])) @@ -63,7 +66,7 @@ { gint remaining_bits_len; /* IN to an csn stream operation */ gint bit_offset; /* IN/OUT to an csn stream operation */ - gint direction; /* 0 - decode; 1 - encode */ + enum CSN_Direction direction; /* encode vs decode */ } csnStream_t; typedef gint16 (*StreamSerializeFcn_t)(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data); diff --git a/src/csn1_dec.c b/src/csn1_dec.c index f0d07ac..c6ea12b 100644 --- a/src/csn1_dec.c +++ b/src/csn1_dec.c @@ -483,7 +483,7 @@ remaining_bits_len -= length_len; csnStreamInit(&arT, bit_offset, length > 0 ? length : remaining_bits_len); - arT.direction = 1; + arT.direction = CSN_DIRECTION_DEC; LOGPC(DCSN1, LOGL_DEBUG, "offset = %u | ", pDescr->offset); Status = serialize(&arT, vector, readIndex, pvDATA(data, pDescr->offset)); diff --git a/src/csn1_enc.c b/src/csn1_enc.c index e4e5e09..b6ed6c4 100644 --- a/src/csn1_enc.c +++ b/src/csn1_enc.c @@ -433,7 +433,7 @@ *writeIndex += length_len; bit_offset += length_len; remaining_bits_len -= length_len; - arT.direction = 0; + arT.direction = CSN_DIRECTION_ENC; csnStreamInit(&arT, bit_offset, remaining_bits_len); Status = serialize(&arT, vector, writeIndex, pvDATA(data, pDescr->offset)); diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index 79fda90..ecb1e44 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -178,7 +178,7 @@ /*< EGPRS Ack/Nack Description IE >*/ gint16 Egprs_Ack_Nack_Desc_w_len_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(EGPRS_AckNack_Desc_t), vector, readIndex, data); } @@ -798,7 +798,7 @@ #if 0 gint16 Receive_N_PDU_Number_list_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(Receive_N_PDU_Number_t), vector, readIndex, data); } @@ -937,7 +937,7 @@ gint16 Content_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(Content_t), vector, readIndex, data); } @@ -961,7 +961,7 @@ static gint16 Additional_access_technologies_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I845bcab61e354436bff1c3a0f2b6f49de9705716 Gerrit-Change-Number: 39778 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: configure: set min python version check to 3.4
by osmith 17 Mar '25

17 Mar '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39802?usp=email ) Change subject: configure: set min python version check to 3.4 ...................................................................... configure: set min python version check to 3.4 While the osmo-gsm-tester builder jobs that use the poky SDK with python version 3.5 are passing with the last patch, the jobs that build our images and packages with the poky SDK (201705 jobs) are still failing. This is because they run on a machine with Python 3.4 installed, and that version gets used in the build process. Lower the version to 3.4 to not have a regression there. Fixes: 489a6f ("configure.ac: check for Python interpreter unconditionally") Fixes: 40e8f5 ("configure: set min python version check to 3.5") Change-Id: Ia83f360274061463232c1fcd7f6dc6e70f774738 --- M configure.ac 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: osmith: Verified fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 80d1b76..7863624 100644 --- a/configure.ac +++ b/configure.ac @@ -176,7 +176,8 @@ dnl Search for a Python interpreter on the system dnl python is needed at built-time for auto-generating code dnl Don't require a newer version than 3.5 for now, as poky 201705 ships that -AM_PATH_PYTHON([3.5]) +dnl Don't require a newer version than 3.4, we build poky 201705 on debian 8 +AM_PATH_PYTHON([3.4]) PKG_CHECK_MODULES(TALLOC, [talloc >= 2.1.0]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39802?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia83f360274061463232c1fcd7f6dc6e70f774738 Gerrit-Change-Number: 39802 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: configure: set min python version check to 3.4
by pespin 17 Mar '25

17 Mar '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmocore/+/39802?usp=email ) Change subject: configure: set min python version check to 3.4 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39802?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia83f360274061463232c1fcd7f6dc6e70f774738 Gerrit-Change-Number: 39802 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 10:27:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: configure: set min python version check to 3.5
by osmith 17 Mar '25

17 Mar '25

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmocore/+/39801?usp=email ) Change subject: configure: set min python version check to 3.5 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > unfortunately it is still failing, I'll look further into it -> https://gerrit.osmocom.org/c/libosmocore/+/39802 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39801?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia39e7e04dd8a31efaf87fd1f0fbbfdc5b5fa37c2 Gerrit-Change-Number: 39801 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 10:21:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: configure: set min python version check to 3.4
by fixeria 17 Mar '25

17 Mar '25

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmocore/+/39802?usp=email ) Change subject: configure: set min python version check to 3.4 ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: Uhh, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39802?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia83f360274061463232c1fcd7f6dc6e70f774738 Gerrit-Change-Number: 39802 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Mar 2025 10:21:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log