- gerrit-log - lists.osmocom.org

[XS] Change in pysim[master]: filesystem: add export method for ADF files
by dexter 10 Aug '24

10 Aug '24

Attention is currently required from: fixeria, laforge. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37642?usp=email ) Change subject: filesystem: add export method for ADF files ...................................................................... Patch Set 2: (1 comment) File pySim/filesystem.py: https://gerrit.osmocom.org/c/pysim/+/37642/comment/4cc826d6_3c403563?usp=em… : PS1, Line 536: eUICC > is this eUICC specific API? Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37642?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8129656096ecaf41b36e5f2afbbfbebcd0587886 Gerrit-Change-Number: 37642 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Aug 2024 13:27:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo_dia2gsup[master]: examples/sys.config: add pid, delete time
by fixeria 10 Aug '24

10 Aug '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/37720?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: examples/sys.config: add pid, delete time ...................................................................... examples/sys.config: add pid, delete time pid is useful for understanding which process logs messages. time is not needed, since systemd-journald adds timestamps for us. Related: OS#6450 Change-Id: I1dd98bae69c6d644870d44f8217262669fc20c6d --- M examples/sys.config 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/examples/sys.config b/examples/sys.config index c85eee7..15b6b35 100644 --- a/examples/sys.config +++ b/examples/sys.config @@ -17,8 +17,8 @@ {level, info}, {formatter, lager_default_formatter}, {formatter_config, [ - time, " ", "[", severity ,"] ", + pid, " ", message, "\n" ]} ]} -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/37720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I1dd98bae69c6d644870d44f8217262669fc20c6d Gerrit-Change-Number: 37720 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[XS] Change in osmo-mgw[master]: mgcp_network: use an uint16_t to store the port number
by dexter 10 Aug '24

10 Aug '24

Attention is currently required from: fixeria, laforge, neels. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-mgw/+/37776?usp=email ) Change subject: mgcp_network: use an uint16_t to store the port number ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/37776/comment/f6f6215c_5624c36b?usp… : PS1, Line 10: byte > 16 bit! Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37776?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I392b07b243389a78d4ad1d784cdfdc28ec59b487 Gerrit-Change-Number: 37776 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Aug 2024 07:49:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in pysim[master]: pySim.cards: Make file_exists() check for activated/deactivated
by laforge 10 Aug '24

10 Aug '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37778?usp=email ) Change subject: pySim.cards: Make file_exists() check for activated/deactivated ...................................................................... pySim.cards: Make file_exists() check for activated/deactivated The Card.file_exists() method is only called by legacy pySim-{read,prog} when it wants to determine if it can read/write a file. Therefore it actually doesn't only want to know if the file exists, but also if it's not deactivated. Change-Id: I73bd1ab3780e475c96a10cd5dbdd45b829c67335 Closes: OS#6530 --- M pySim/cards.py 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/78/37778/1 diff --git a/pySim/cards.py b/pySim/cards.py index 802c921..65aef98 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -23,7 +23,7 @@ # from typing import Optional, Tuple -from pySim.ts_102_221 import EF_DIR +from pySim.ts_102_221 import EF_DIR, CardProfileUICC from pySim.ts_51_011 import DF_GSM from pySim.utils import * @@ -54,10 +54,17 @@ print("warning: erasing is not supported for specified card type!") def file_exists(self, fid: Path) -> bool: + """Determine if the file exists (and is not deactivated).""" res_arr = self._scc.try_select_path(fid) for res in res_arr: if res[1] != '9000': return False + try: + d = CardProfileUICC.decode_select_response(res_arr[-1][0]) + if d.get('life_cycle_status_integer', 'operational_activated') != 'operational_activated': + return False + except: + pass return True def read_aids(self) -> List[Hexstr]: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I73bd1ab3780e475c96a10cd5dbdd45b829c67335 Gerrit-Change-Number: 37778 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[S] Change in pysim[master]: runtime: add method to lookup a file by name without selecting it
by dexter 10 Aug '24

10 Aug '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37785?usp=email ) Change subject: runtime: add method to lookup a file by name without selecting it ...................................................................... runtime: add method to lookup a file by name without selecting it In some cases it might come in handy to be able to lookup a random file in the file system tree before actually selecting it. This would be very useful in situations where we need to check the presence of the file or if we need to check certain file attributes before performing some task. Related: OS#6092 Change-Id: I6b6121e749cea843163659e1a26bb3893c032e29 --- M pySim/runtime.py 1 file changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/37785/1 diff --git a/pySim/runtime.py b/pySim/runtime.py index 08371ae..5ffbee6 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -234,6 +234,42 @@ node = node.parent return None + def get_file_by_name(self, name: str) -> CardFile: + """Obtain the file object from the file system tree by its name without actually selecting the file. + + Returns: + CardFile() instance or None""" + + # handling of entire paths with multiple directories/elements + if '/' in name: + pathlist = name.split('/') + # treat /DF.GSM/foo like MF/DF.GSM/foo + if pathlist[0] == '': + pathlist[0] = 'MF' + else: + pathlist = [name] + + # start in the current working directory (we can still + # select any ADF and the MF from here, so those will be + # among the selectables). + file = self.get_cwd() + + for p in pathlist: + # Look for the next file in the path list + selectables = file.get_selectables().items() + file = None + for selectable in selectables: + if selectable[1].name == name: + file = selectable[1] + break + + # When we hit none, then the given path must be invalid + if file is None: + return None + + # Return the file object found at the tip of the path + return file + def interpret_sw(self, sw: str): """Interpret a given status word relative to the currently selected application or the underlying card profile. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37785?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6b6121e749cea843163659e1a26bb3893c032e29 Gerrit-Change-Number: 37785 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in osmo-hlr[master]: subscriber-create-on-demand: add mode for MSISDN=IMSI
by fixeria 10 Aug '24

10 Aug '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/37780?usp=email ) Change subject: subscriber-create-on-demand: add mode for MSISDN=IMSI ...................................................................... subscriber-create-on-demand: add mode for MSISDN=IMSI In may be desirable for some users to assign deterministic MSISDNs when subscriber-create-on-demand is enabled. This can be achieved by assigning MSISDN=IMSI. This commit adds a new mode for that. Change-Id: I3470492f5e46de7246d9a74e80c37f80f455d851 --- M include/osmocom/hlr/hlr.h M src/hlr.c M src/hlr_vty.c M tests/test_nodes.vty M tests/test_subscr_create_on_demand.vty 5 files changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/80/37780/1 diff --git a/include/osmocom/hlr/hlr.h b/include/osmocom/hlr/hlr.h index 4bdb5b0..92a5994 100644 --- a/include/osmocom/hlr/hlr.h +++ b/include/osmocom/hlr/hlr.h @@ -43,6 +43,7 @@ SUBSCR_COD_MODE_DISABLED = 0, SUBSCR_COD_MODE_NO_MSISDN, SUBSCR_COD_MODE_RAND_MSISDN, + SUBSCR_COD_MODE_IMSI, }; struct hlr { diff --git a/src/hlr.c b/src/hlr.c index 44c96b5..3db3333 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -209,6 +209,9 @@ return -1; switch (g_hlr->subscr_create_on_demand.mode) { + case SUBSCR_COD_MODE_IMSI: + OSMO_STRLCPY_ARRAY(msisdn, imsi); + break; case SUBSCR_COD_MODE_RAND_MSISDN: if (generate_new_msisdn(msisdn, imsi, g_hlr->subscr_create_on_demand.rand_msisdn_len) != 0) return -1; diff --git a/src/hlr_vty.c b/src/hlr_vty.c index ae1e13e..01d3291 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -288,6 +288,9 @@ const char *flags_str; switch (g_hlr->subscr_create_on_demand.mode) { + case SUBSCR_COD_MODE_IMSI: + vty_out(vty, " subscriber-create-on-demand imsi"); + break; case SUBSCR_COD_MODE_RAND_MSISDN: vty_out(vty, " subscriber-create-on-demand %u", g_hlr->subscr_create_on_demand.rand_msisdn_len); @@ -810,9 +813,10 @@ } DEFUN(cfg_subscr_create_on_demand, cfg_subscr_create_on_demand_cmd, - "subscriber-create-on-demand (no-msisdn|<3-15>) (none|cs|ps|cs+ps)", + "subscriber-create-on-demand (no-msisdn|imsi|<3-15>) (none|cs|ps|cs+ps)", "Make a new record when a subscriber is first seen.\n" "Do not automatically assign MSISDN.\n" + "Assign MSISDN identical to subscriber's IMSI.\n" "Length of an automatically assigned MSISDN.\n" "Do not allow any NAM (Network Access Mode) by default.\n" "Allow access to circuit switched NAM by default.\n" @@ -825,6 +829,8 @@ if (strcmp(argv[0], "no-msisdn") == 0) { mode = SUBSCR_COD_MODE_NO_MSISDN; + } else if (strcmp(argv[0], "imsi") == 0) { + mode = SUBSCR_COD_MODE_IMSI; } else { /* random MSISDN */ mode = SUBSCR_COD_MODE_RAND_MSISDN; rand_msisdn_len = atoi(argv[0]); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 02a5552..9392c96 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -73,7 +73,7 @@ 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) + subscriber-create-on-demand (no-msisdn|imsi|<3-15>) (none|cs|ps|cs+ps) no subscriber-create-on-demand OsmoHLR(config-hlr)# gsup diff --git a/tests/test_subscr_create_on_demand.vty b/tests/test_subscr_create_on_demand.vty index fb587ae..df8e5e4 100644 --- a/tests/test_subscr_create_on_demand.vty +++ b/tests/test_subscr_create_on_demand.vty @@ -10,6 +10,14 @@ subscriber-create-on-demand no-msisdn none ... +OsmoHLR(config-hlr)# subscriber-create-on-demand imsi cs+ps +OsmoHLR(config-hlr)# show running-config +... +hlr +... + subscriber-create-on-demand imsi cs+ps +... + OsmoHLR(config-hlr)# subscriber-create-on-demand 3 none OsmoHLR(config-hlr)# show running-config ... -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/37780?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: I3470492f5e46de7246d9a74e80c37f80f455d851 Gerrit-Change-Number: 37780 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-hlr[master]: subscriber-create-on-demand: rework configuration
by fixeria 10 Aug '24

10 Aug '24

Attention is currently required from: osmith. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-hlr/+/37779?usp=email ) Change subject: subscriber-create-on-demand: rework configuration ...................................................................... Patch Set 1: (1 comment) File src/hlr_vty.c: https://gerrit.osmocom.org/c/osmo-hlr/+/37779/comment/b998d013_4fa65ecf?usp… : PS1, Line 300: vty_out(vty, " no subscriber-create-on-demand%s", VTY_NEWLINE); > This is the default, I thought we omit these. […] Well, I believe printing a setting explicitly is better than omitting values. I expected to get some questions here, let's see what others think. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/37779?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib553172655f83dad1ac0e0254615c8c207d79ca9 Gerrit-Change-Number: 37779 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Aug 2024 12:35:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-upf[master]: move pfcp_tool.h to include/osmocom/pfcptool/
by laforge 10 Aug '24

10 Aug '24

Attention is currently required from: neels. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-upf/+/37763?usp=email ) Change subject: move pfcp_tool.h to include/osmocom/pfcptool/ ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/37763?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: If3e7cc4df3defd08df9e75965715a1be0388ed01 Gerrit-Change-Number: 37763 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Aug 2024 12:35:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo_dia2gsup[master]: osmo_dia2gsup.service: use /etc/osmocom/osmo-dia2gsup.config
by fixeria 10 Aug '24

10 Aug '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/37718?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo_dia2gsup.service: use /etc/osmocom/osmo-dia2gsup.config ...................................................................... osmo_dia2gsup.service: use /etc/osmocom/osmo-dia2gsup.config Related: OS#6148 Change-Id: I5ff07341597b2838bce0750a576e463addd2964f --- M contrib/systemd/osmo_dia2gsup.service 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo_dia2gsup.service b/contrib/systemd/osmo_dia2gsup.service index e3d092e..e8359b8 100644 --- a/contrib/systemd/osmo_dia2gsup.service +++ b/contrib/systemd/osmo_dia2gsup.service @@ -12,6 +12,7 @@ User=osmocom Group=osmocom Environment="HOME=/var/lib/osmo_dia2gsup" +Environment="ERL_FLAGS=-config /etc/osmocom/osmo-dia2gsup.config" ExecStart=/usr/bin/osmo-dia2gsup foreground RestartSec=2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/37718?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I5ff07341597b2838bce0750a576e463addd2964f Gerrit-Change-Number: 37718 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[XS] Change in osmo-sgsn[master]: includes: sgsn.h: use full path include for gtp.h
by laforge 10 Aug '24

10 Aug '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37752?usp=email ) Change subject: includes: sgsn.h: use full path include for gtp.h ...................................................................... includes: sgsn.h: use full path include for gtp.h The gtp header of ggsn have been moved to osmocom/gtp/gtp.h for a while. Use the full path to prevent clashs with older versions Change-Id: I764644110c0f332b18117e1e8311ddc55eafd5fa --- M include/osmocom/sgsn/sgsn.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 6e93178..9e09184 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -21,7 +21,7 @@ #endif #include <ares.h> -#include <gtp.h> +#include <osmocom/gtp/gtp.h> struct hostent; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37752?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I764644110c0f332b18117e1e8311ddc55eafd5fa Gerrit-Change-Number: 37752 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log