- gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: pySim-shell: add command to manually query the Card Key Provider
by dexter 20 Nov '25

20 Nov '25

Attention is currently required from: dexter, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/41467?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: pySim-shell: add command to manually query the Card Key Provider ...................................................................... pySim-shell: add command to manually query the Card Key Provider The Card Key Provider is a built in mechanism of pySim-shell which allows the user to read key material from a CSV file in order to avoid having to lookup and enter the key material himself. The lookup normally done by the pySim-shell commands automatically. However, in some cases it may also be useful to be able to query the CSV file manually in order to get certain fields displayed. Such a command is in particular helpful to check and diagnose the CSV data source. Related: SYS#7725 Change-Id: I76e0f883572a029bdca65a5a6b3eef306db1c221 --- M pySim-shell.py 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/67/41467/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41467?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I76e0f883572a029bdca65a5a6b3eef306db1c221 Gerrit-Change-Number: 41467 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in pysim[master]: pySim-shell: re-organize Card Key Provider related options
by dexter 20 Nov '25

20 Nov '25

Attention is currently required from: dexter, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/41468?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: pySim-shell: re-organize Card Key Provider related options ...................................................................... pySim-shell: re-organize Card Key Provider related options As we plan to support other formats as data source for the Card Key Provider soon, the more commandline options may be added and it makes sense to group the Card Key Provider options in a dedicated group. Let's also rename the option "--csv-column-key" to just "--column-key". The column encryption is a generic concept and not CSV format specific. (let's silently keep the "--csv-column-key" argument so maintain backward compatibility) Related: SYS#7725 Change-Id: I5093f8383551f8c9b84342ca6674c1ebdbbfc19c --- M pySim-shell.py 1 file changed, 15 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/68/41468/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41468?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5093f8383551f8c9b84342ca6674c1ebdbbfc19c Gerrit-Change-Number: 41468 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in osmo-gsm-manuals[master]: GSUP: PDP Context ID: start at 1
by osmith 20 Nov '25

20 Nov '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/41471?usp=email ) Change subject: GSUP: PDP Context ID: start at 1 ...................................................................... GSUP: PDP Context ID: start at 1 In OsmoHLR, PDP Contexts can have IDs <1-10>. 0 is used internally to mark a profile slot as disabled: https://gitea.osmocom.org/cellular-infrastructure/osmo-hlr/src/commit/d4b45… HLR Test TC_gsup_ul_subscriber_data in osmo-ttcn3-hacks also makes this assumption: https://gitea.osmocom.org/ttcn3/osmo-ttcn3-hacks/src/commit/85276b94c474bb6… However the new GSUP implementation in PyHSS started its IDs at 0. I'll send a patch to change it to start at 1 as well. Update the documentation to reflect that 0 is not used as PDP Context ID. Change-Id: I9c39002cb7f7dd81ae0f1f0f9d80df1aaf399f48 --- M common/chapters/gsup.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/71/41471/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 824ac90..29d5513 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -1276,7 +1276,7 @@ ==== PDP Context ID The PDP type context ID IE consists of a single integer byte wrapped in -a TLV. +a TLV. Values for PDP Context ID start at 1 (not 0). [packetdiag] ---- -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/41471?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I9c39002cb7f7dd81ae0f1f0f9d80df1aaf399f48 Gerrit-Change-Number: 41471 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in pysim[master]: card_key_provider: add unit-test
by dexter 20 Nov '25

20 Nov '25

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/41448?usp=email ) Change subject: card_key_provider: add unit-test ...................................................................... card_key_provider: add unit-test There is no unit-test for the CardKeyProviderCsv class yet. Let's add one to ensure that the CardKeyProviderCsv class keeps working as expected. Related: SYS#7725 Change-Id: I52519847a4c4a13a7bca49985133872b01c4aaab --- A tests/unittests/test_card_key_provider.csv A tests/unittests/test_card_key_provider.py 2 files changed, 85 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/unittests/test_card_key_provider.csv b/tests/unittests/test_card_key_provider.csv new file mode 100644 index 0000000..a9fdf57 --- /dev/null +++ b/tests/unittests/test_card_key_provider.csv @@ -0,0 +1,5 @@ +"card_type_id","formfactor_id","imsi","iccid","pin1","puk1","pin2","puk2","ki","adm1","adm2","proprietary","kic1","kic2","kic3","kid1","kid2","kid3","kik1","kik2","kik3","msisdn","acc","opc" +"myCardType","3FF","901700000000001","8988211000000000001","1234","12345678","1223","12345678","AAAAAAAAAAA5435425AAAAAAAAAAAAAA","10101010","9999999999999999","proprietary data 01","BBBBBBBBBB3324BBBBBBBB21212BBBBB","CC7654CCCCCCCCCCCCCCCCCCCCCCCCCC","DDDD90DDDDDDDDDDDDDDDDDD767DDDDD","EEEEEE567657567567EEEEEEEEEEEEEE","FFFFFFFFFFFFFFFFFFF56765765FFFFF","11111567811111111111111111111111","22222222222222222227669999222222","33333333333333333333333333333333","44444444444444445234544444444444","55555555555","0001","66666666666666666666666666666666" +"myCardType","3FF","901700000000002","8988211000000000002","1234","12345678","1223","12345678","AAAAAAAAAAAAAAAAAAAAAAAA3425AAAA","10101010","9999999999999999","proprietary data 02","BBBBBB421BBBBBBBBBB12BBBBBBBBBBB","CCCCCCCCCC3456CCCCCCCCCCCCCCCCCC","DDDDDDDDD567657DDDD2DDDDDDDDDDDD","EEEEEEEE56756EEEEEEEEE567657EEEE","FFFFF567657FFFFFFFFFFFFFFFFFFFFF","11111111111146113433411576511111","22222222222223432225765222222222","33333333333333523453333333333333","44425435234444444444446544444444","55555555555","0001","66666666666666266666666666666666" +"myCardType","3FF","901700000000003","8988211000000000003","1234","12345678","1223","12345678","AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","10101010","9999999999999999","proprietary data 03","BBBBBBB45678BBBB756765BBBBBBBBBB","CCCCCCCCCCCCCC76543CCCC56765CCCC","DDDDDDDDDDDDDDDDDD5676575DDDDDDD","EEEEEEEEEEEEEEEEEE56765EEEEEEEEE","FFFFFFFFFFFFFFF567657FFFFFFFFFFF","11111111119876511111111111111111","22222222222444422222222222576522","33333332543333576733333333333333","44444444444567657567444444444444","55555555555","0001","66666675676575666666666666666666" + diff --git a/tests/unittests/test_card_key_provider.py b/tests/unittests/test_card_key_provider.py new file mode 100644 index 0000000..03148e2 --- /dev/null +++ b/tests/unittests/test_card_key_provider.py @@ -0,0 +1,80 @@ +#!/usr/bin/env python3 + +import unittest +import os +from pySim.card_key_provider import * + +class TestCardKeyProvider(unittest.TestCase): + + def __init__(self, *args, **kwargs): + column_keys = {"KI" : "000424252525535532532A0B0C0D0E0F", + "OPC" : "000102030405065545645645645D0E0F", + "KIC1" : "06410203546406456456450B0C0D0E0F", + "KID1" : "00040267840507667609045645645E0F", + "KIK1" : "0001020307687607668678678C0D0E0F", + "KIC2" : "000142457594860706090A0B0688678F", + "KID2" : "600102030405649468690A0B0C0D648F", + "KIK2" : "00010203330506070496330B08640E0F", + "KIC3" : "000104030405064684686A068C0D0E0F", + "KID3" : "00010243048468070809060B0C0D0E0F", + "KIK3" : "00010204040506070809488B0C0D0E0F"} + + csv_file_path = os.path.dirname(os.path.abspath(__file__)) + "/test_card_key_provider.csv" + card_key_provider_register(CardKeyProviderCsv(csv_file_path, column_keys)) + super().__init__(*args, **kwargs) + + def test_card_key_provider_get(self): + test_data = [{'EXPECTED' : {'PIN1': '1234', 'PUK1': '12345678', 'PIN2': '1223', 'PUK2': '12345678', + 'KI': '48a6d5f60567d45299e3ba08594009e7', 'ADM1': '10101010', + 'ADM2': '9999999999999999', 'KIC1': '3eb8567fa0b4b1e63bcab13bff5f2702', + 'KIC2': 'fd6c173a5b3f04b563808da24237fb46', + 'KIC3': '66c8c848e5dff69d70689d155d44f323', + 'KID1': 'd78accce870332dced467c173244dd94', + 'KID2': 'b3bf050969747b2d2c9389e127a3d791', + 'KID3': '40a77deb50d260b3041bbde1b5040625', + 'KIK1': '451b503239d818ea34421aa9c2a8887a', + 'KIK2': '967716f5fca8ae179f87f76524d1ae6b', + 'KIK3': '0884db5eee5409a00fc1bbc57ac52541', + 'OPC': '81817574c1961dd272ad080eb2caf279'}, 'ICCID' :"8988211000000000001"}, + {'EXPECTED' : {'PIN1': '1234', 'PUK1': '12345678', 'PIN2': '1223', 'PUK2': '12345678', + 'KI': 'e94d7fa6fb92375dae86744ff6ecef49', 'ADM1': '10101010', + 'ADM2': '9999999999999999', 'KIC1': '79b4e39387c66253da68f653381ded44', + 'KIC2': '560561b5dba89c1da8d1920049e5e4f7', + 'KIC3': '79ff35e84e39305a119af8c79f84e8e5', + 'KID1': '233baf89122159553d67545ecedcf8e0', + 'KID2': '8fc2874164d7a8e40d72c968bc894ab8', + 'KID3': '2e3320f0dda85054d261be920fbfa065', + 'KIK1': 'd51b1b17630103d1672a3e9e0e4827ed', + 'KIK2': 'd01edbc48be555139506b0d7982bf7ff', + 'KIK3': 'a6487a5170849e8e0a03026afea91f5a', + 'OPC': '6b0d19ef28bd12f2daac31828d426939'}, 'ICCID' :"8988211000000000002"}, + {'EXPECTED' : {'PIN1': '1234', 'PUK1': '12345678', 'PIN2': '1223', 'PUK2': '12345678', + 'KI': '3cdec1552ef433a89f327905213c5a6e', 'ADM1': '10101010', + 'ADM2': '9999999999999999', 'KIC1': '72986b13ce505e12653ad42df5cfca13', + 'KIC2': '8f0d1e58b01e833773e5562c4940674d', + 'KIC3': '9c72ba5a14d54f489edbffd3d8802f03', + 'KID1': 'd23a42995df9ca83f74b2cfd22695526', + 'KID2': '5c3a189d12aa1ac6614883d7de5e6c8c', + 'KID3': 'a6ace0d303a2b38a96b418ab83c16725', + 'KIK1': 'bf2319467d859c12527aa598430caef2', + 'KIK2': '6a4c459934bea7e40787976b8881ab01', + 'KIK3': '91cd02c38b5f68a98cc90a1f2299538f', + 'OPC': '6df46814b1697daca003da23808bbbc3'}, 'ICCID' :"8988211000000000003"}] + + for t in test_data: + result = card_key_provider_get(["PIN1","PUK1","PIN2","PUK2","KI","ADM1","ADM2","KIC1", + "KIC2","KIC3","KID1","KID2","KID3","KIK1","KIK2","KIK3","OPC"], + "ICCID", t.get('ICCID')) + self.assertEqual(result, t.get('EXPECTED')) + + def test_card_key_provider_get_field(self): + test_data = [{'EXPECTED' : "3eb8567fa0b4b1e63bcab13bff5f2702", 'ICCID' :"8988211000000000001"}, + {'EXPECTED' : "79b4e39387c66253da68f653381ded44", 'ICCID' :"8988211000000000002"}, + {'EXPECTED' : "72986b13ce505e12653ad42df5cfca13", 'ICCID' :"8988211000000000003"}] + + for t in test_data: + result = card_key_provider_get_field("KIC1", "ICCID", t.get('ICCID')) + self.assertEqual(result, t.get('EXPECTED')) + +if __name__ == "__main__": + unittest.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/41448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I52519847a4c4a13a7bca49985133872b01c4aaab Gerrit-Change-Number: 41448 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[L] Change in osmo-upf[master]: up_peer: Use Node Id as identifier
by pespin 20 Nov '25

20 Nov '25

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/41453?usp=email ) Change subject: up_peer: Use Node Id as identifier ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/41453?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Idff2865ff63ad2de5e48cceb99f47e6255b330aa Gerrit-Change-Number: 41453 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-hnbgw[master]: iuh: Allow setting tx-queue-max-length for all HNBs
by pespin 20 Nov '25

20 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41436?usp=email ) Change subject: iuh: Allow setting tx-queue-max-length for all HNBs ...................................................................... iuh: Allow setting tx-queue-max-length for all HNBs Related: SYS#7693 Change-Id: I8bc9e8bae7a4815dc2f2bc9e15401e01948d1748 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_vty.c M src/osmo-hnbgw/osmo_hnbgw_main.c M tests/osmo-hnbgw.vty 5 files changed, 42 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index e26ae2d..86fded3 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -71,6 +71,8 @@ #define IUH_MSGB_SIZE 2048 +#define IUH_TX_QUEUE_MAX_LENGTH 1024 + struct hnbgw_context_map; static inline bool cnlink_is_cs(const struct hnbgw_cnlink *cnlink) @@ -96,6 +98,9 @@ bool accept_all_hnb; struct mgcp_client_conf *mgcp_client; struct { + unsigned int tx_queue_max_length; + } iuh; + struct { char *local_addr; uint16_t local_port; char *remote_addr; diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index d237928..a8f827c 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -216,6 +216,7 @@ g_hnbgw->config.hnbap_allow_tmsi = true; g_hnbgw->config.log_prefix_hnb_id = true; g_hnbgw->config.accept_all_hnb = true; + g_hnbgw->config.iuh.tx_queue_max_length = IUH_TX_QUEUE_MAX_LENGTH; /* Set zero PLMN to detect a missing PLMN when transmitting RESET */ g_hnbgw->config.plmn = (struct osmo_plmn_id){ 0, 0, false }; diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index f1b128c..c74c5db 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -318,6 +318,18 @@ return CMD_SUCCESS; } +DEFUN(cfg_hnbgw_iuh_tx_queue_max_length, cfg_hnbgw_iuh_tx_queue_max_length_cmd, + "tx-queue-max-length <0-65535>", + "Maximum transmit queue length, in msgbs\n" + "Amount of msgbs which can be queued at maximum in the transmit queue\n") +{ + g_hnbgw->config.iuh.tx_queue_max_length = atoi(argv[0]); + if (g_hnbgw->iuh) + osmo_stream_srv_link_set_tx_queue_max_length(g_hnbgw->iuh, + g_hnbgw->config.iuh.tx_queue_max_length); + return CMD_SUCCESS; +} + DEFUN(cfg_hnbgw_iuh_hnbap_allow_tmsi, cfg_hnbgw_iuh_hnbap_allow_tmsi_cmd, "hnbap-allow-tmsi (0|1)", "Allow HNBAP UE Register messages with TMSI or PTMSI identity\n" @@ -1039,6 +1051,9 @@ if (port && port != IUH_DEFAULT_SCTP_PORT) vty_out(vty, " local-port %u%s", port, VTY_NEWLINE); + if (g_hnbgw->config.iuh.tx_queue_max_length != IUH_TX_QUEUE_MAX_LENGTH) + vty_out(vty, " tx-queue-max-length %u%s", g_hnbgw->config.iuh.tx_queue_max_length, VTY_NEWLINE); + if (!g_hnbgw->config.hnbap_allow_tmsi) vty_out(vty, " hnbap-allow-tmsi 0%s", VTY_NEWLINE); @@ -1125,6 +1140,7 @@ install_element(IUH_NODE, &cfg_hnbgw_iuh_local_ip_cmd); install_element(IUH_NODE, &cfg_hnbgw_iuh_local_port_cmd); + install_element(IUH_NODE, &cfg_hnbgw_iuh_tx_queue_max_length_cmd); install_element(IUH_NODE, &cfg_hnbgw_iuh_hnbap_allow_tmsi_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_iucs_cmd); diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c index b8b1b0b..1664f02 100644 --- a/src/osmo-hnbgw/osmo_hnbgw_main.c +++ b/src/osmo-hnbgw/osmo_hnbgw_main.c @@ -316,6 +316,7 @@ osmo_stream_srv_link_set_port(srv, g_hnbgw->config.iuh_local_port); osmo_stream_srv_link_set_accept_cb(srv, hnbgw_rua_accept_cb); osmo_stream_srv_link_set_msgb_alloc_info(srv, IUH_MSGB_SIZE, 0); + osmo_stream_srv_link_set_tx_queue_max_length(srv, g_hnbgw->config.iuh.tx_queue_max_length); if (osmo_stream_srv_link_open(srv) < 0) { perror("Cannot open server"); diff --git a/tests/osmo-hnbgw.vty b/tests/osmo-hnbgw.vty index 391605b..c3e1f11 100644 --- a/tests/osmo-hnbgw.vty +++ b/tests/osmo-hnbgw.vty @@ -84,6 +84,25 @@ rnc-id 42 ... +OsmoHNBGW(config-hnbgw)# iuh +OsmoHNBGW(config-hnbgw-iuh)# list +... + local-ip A.B.C.D + local-port <1-65535> + tx-queue-max-length <0-65535> + hnbap-allow-tmsi (0|1) +... + +OsmoHNBGW(config-hnbgw-iuh)# tx-queue-max-length 2000 +OsmoHNBGW(config-hnbgw-iuh)# show running-config +... +hnbgw +... + iuh + tx-queue-max-length 2000 +... +OsmoHNBGW(config-hnbgw-iuh)# exit + OsmoHNBGW(config-hnbgw)# nft-kpi? nft-kpi Retrieve traffic counters from nftables OsmoHNBGW(config-hnbgw)# nft-kpi ? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I8bc9e8bae7a4815dc2f2bc9e15401e01948d1748 Gerrit-Change-Number: 41436 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-hnbgw[master]: Move iuh fields in iuh substruct
by pespin 20 Nov '25

20 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41441?usp=email ) Change subject: Move iuh fields in iuh substruct ...................................................................... Move iuh fields in iuh substruct Change-Id: If6954929def24d48661bc132070440513b01289e --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c M src/osmo-hnbgw/osmo_hnbgw_main.c 5 files changed, 20 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 86fded3..981b809 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -87,17 +87,17 @@ struct hnbgw { struct { - const char *iuh_local_ip; - /*! SCTP port for Iuh listening */ - uint16_t iuh_local_port; struct osmo_plmn_id plmn; uint16_t rnc_id; - bool hnbap_allow_tmsi; /*! print hnb-id (true) or MCC-MNC-LAC-RAC-SAC (false) in logs */ bool log_prefix_hnb_id; bool accept_all_hnb; struct mgcp_client_conf *mgcp_client; struct { + const char *local_ip; + /*! SCTP port for Iuh listening */ + uint16_t local_port; + bool hnbap_allow_tmsi; unsigned int tx_queue_max_length; } iuh; struct { diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index a8f827c..32605b7 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -211,9 +211,9 @@ g_hnbgw = talloc_zero(ctx, struct hnbgw); /* strdup so we can easily talloc_free in the VTY code */ - g_hnbgw->config.iuh_local_ip = talloc_strdup(g_hnbgw, HNBGW_LOCAL_IP_DEFAULT); - g_hnbgw->config.iuh_local_port = IUH_DEFAULT_SCTP_PORT; - g_hnbgw->config.hnbap_allow_tmsi = true; + g_hnbgw->config.iuh.local_ip = talloc_strdup(g_hnbgw, HNBGW_LOCAL_IP_DEFAULT); + g_hnbgw->config.iuh.local_port = IUH_DEFAULT_SCTP_PORT; + g_hnbgw->config.iuh.hnbap_allow_tmsi = true; g_hnbgw->config.log_prefix_hnb_id = true; g_hnbgw->config.accept_all_hnb = true; g_hnbgw->config.iuh.tx_queue_max_length = IUH_TX_QUEUE_MAX_LENGTH; diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 8185f72..75b1250 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -617,7 +617,7 @@ break; case HNBAP_UE_Identity_PR_tMSILAI: case HNBAP_UE_Identity_PR_pTMSIRAI: - if (g_hnbgw->config.hnbap_allow_tmsi) { + if (g_hnbgw->config.iuh.hnbap_allow_tmsi) { rc = hnbgw_tx_ue_register_acc_tmsi(ctx, &ies.uE_Identity, get_next_ue_ctx_id()); } else { cause.present = HNBAP_Cause_PR_radioNetwork; diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index c74c5db..28d5e84 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -305,8 +305,8 @@ "Accept Iuh connections on local interface\n" "Local interface IP address (default: " HNBGW_LOCAL_IP_DEFAULT ")") { - talloc_free((void *)g_hnbgw->config.iuh_local_ip); - g_hnbgw->config.iuh_local_ip = talloc_strdup(g_hnbgw, argv[0]); + talloc_free((void *)g_hnbgw->config.iuh.local_ip); + g_hnbgw->config.iuh.local_ip = talloc_strdup(g_hnbgw, argv[0]); return CMD_SUCCESS; } @@ -314,7 +314,7 @@ "Accept Iuh connections on local port\n" "Local interface port (default: 29169)") { - g_hnbgw->config.iuh_local_port = atoi(argv[0]); + g_hnbgw->config.iuh.local_port = atoi(argv[0]); return CMD_SUCCESS; } @@ -336,7 +336,7 @@ "Only accept IMSI identity, reject TMSI or PTMSI\n" "Accept IMSI, TMSI or PTMSI as UE identity (default)\n") { - g_hnbgw->config.hnbap_allow_tmsi = (*argv[0] == '1'); + g_hnbgw->config.iuh.hnbap_allow_tmsi = (*argv[0] == '1'); return CMD_SUCCESS; } @@ -1043,18 +1043,18 @@ vty_out(vty, " iuh%s", VTY_NEWLINE); - addr = g_hnbgw->config.iuh_local_ip; + addr = g_hnbgw->config.iuh.local_ip; if (addr && (strcmp(addr, HNBGW_LOCAL_IP_DEFAULT) != 0)) vty_out(vty, " local-ip %s%s", addr, VTY_NEWLINE); - port = g_hnbgw->config.iuh_local_port; + port = g_hnbgw->config.iuh.local_port; if (port && port != IUH_DEFAULT_SCTP_PORT) vty_out(vty, " local-port %u%s", port, VTY_NEWLINE); if (g_hnbgw->config.iuh.tx_queue_max_length != IUH_TX_QUEUE_MAX_LENGTH) vty_out(vty, " tx-queue-max-length %u%s", g_hnbgw->config.iuh.tx_queue_max_length, VTY_NEWLINE); - if (!g_hnbgw->config.hnbap_allow_tmsi) + if (!g_hnbgw->config.iuh.hnbap_allow_tmsi) vty_out(vty, " hnbap-allow-tmsi 0%s", VTY_NEWLINE); return CMD_SUCCESS; diff --git a/src/osmo-hnbgw/osmo_hnbgw_main.c b/src/osmo-hnbgw/osmo_hnbgw_main.c index 1664f02..34375a9 100644 --- a/src/osmo-hnbgw/osmo_hnbgw_main.c +++ b/src/osmo-hnbgw/osmo_hnbgw_main.c @@ -300,10 +300,10 @@ LOGP(DHNBAP, LOGL_NOTICE, "Using RNC-Id %u\n", g_hnbgw->config.rnc_id); - OSMO_ASSERT(g_hnbgw->config.iuh_local_ip); + OSMO_ASSERT(g_hnbgw->config.iuh.local_ip); LOGP(DMAIN, LOGL_NOTICE, "Listening for Iuh at %s %d\n", - g_hnbgw->config.iuh_local_ip, - g_hnbgw->config.iuh_local_port); + g_hnbgw->config.iuh.local_ip, + g_hnbgw->config.iuh.local_port); srv = osmo_stream_srv_link_create(g_hnbgw); if (!srv) { perror("cannot create server"); @@ -312,8 +312,8 @@ osmo_stream_srv_link_set_data(srv, g_hnbgw); osmo_stream_srv_link_set_proto(srv, IPPROTO_SCTP); osmo_stream_srv_link_set_nodelay(srv, true); - osmo_stream_srv_link_set_addr(srv, g_hnbgw->config.iuh_local_ip); - osmo_stream_srv_link_set_port(srv, g_hnbgw->config.iuh_local_port); + osmo_stream_srv_link_set_addr(srv, g_hnbgw->config.iuh.local_ip); + osmo_stream_srv_link_set_port(srv, g_hnbgw->config.iuh.local_port); osmo_stream_srv_link_set_accept_cb(srv, hnbgw_rua_accept_cb); osmo_stream_srv_link_set_msgb_alloc_info(srv, IUH_MSGB_SIZE, 0); osmo_stream_srv_link_set_tx_queue_max_length(srv, g_hnbgw->config.iuh.tx_queue_max_length); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If6954929def24d48661bc132070440513b01289e Gerrit-Change-Number: 41441 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-hnbgw[master]: Move iuh fields in iuh substruct
by pespin 20 Nov '25

20 Nov '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41441?usp=email ) Change subject: Move iuh fields in iuh substruct ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If6954929def24d48661bc132070440513b01289e Gerrit-Change-Number: 41441 Gerrit-PatchSet: 2 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Nov 2025 09:55:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-hnbgw[master]: hnb: Avoid calling osmo_sock_get_ip_and_port() with negative fd
by pespin 20 Nov '25

20 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41462?usp=email ) Change subject: hnb: Avoid calling osmo_sock_get_ip_and_port() with negative fd ...................................................................... hnb: Avoid calling osmo_sock_get_ip_and_port() with negative fd Related: Coverity CID#551438 Change-Id: I3ff5d17cd42393893a507718ee191af40bb2499b --- M src/osmo-hnbgw/hnb.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnb.c b/src/osmo-hnbgw/hnb.c index bd6b02c..88c64f6 100644 --- a/src/osmo-hnbgw/hnb.c +++ b/src/osmo-hnbgw/hnb.c @@ -132,7 +132,7 @@ int fd = osmo_stream_srv_get_fd(ctx->conn); /* get remote addr */ - if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) == 0) + if (fd >= 0 && osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) == 0) result = talloc_asprintf(OTC_SELECT, "%s:%s", hostbuf_r, portbuf_r); else result = "?"; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3ff5d17cd42393893a507718ee191af40bb2499b Gerrit-Change-Number: 41462 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: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-hnbgw[master]: hnb: Avoid calling osmo_sock_get_ip_and_port() with negative fd
by pespin 20 Nov '25

20 Nov '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/41462?usp=email ) Change subject: hnb: Avoid calling osmo_sock_get_ip_and_port() with negative fd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/41462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I3ff5d17cd42393893a507718ee191af40bb2499b Gerrit-Change-Number: 41462 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Nov 2025 09:54:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log