December 2024 - gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: global_platform: add new command "install_cap"

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/39199?usp=email ) Change subject: global_platform: add new command "install_cap" ...................................................................... global_platform: add new command "install_cap" Installing JAVA-card applets from a CAP file is a multi step process, which is difficult when done manually. Fortunately it is easy to automate the process, so let's add a dedicated command for that. Change-Id: I6cbd37f0fad5579b20e83c27349bd5acc129e6d0 Related: OS#6679 --- M pySim/global_platform/__init__.py A pySim/global_platform/install_param.py M tests/unittests/test_globalplatform.py 3 files changed, 131 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/99/39199/1 diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 7898259..023e7f9 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -30,6 +30,7 @@ from pySim.utils import ResTuple from pySim.card_key_provider import card_key_provider_get_field from pySim.global_platform.scp import SCP02, SCP03 +from pySim.global_platform.install_param import gen_install_parameters from pySim.filesystem import * from pySim.profile import CardProfile from pySim.ota import SimFileAccessAndToolkitAppSpecParams @@ -859,6 +860,53 @@ _rsp_hex, _sw = self._cmd.lchan.scc.send_apdu_checksw(cmd_hex) self._cmd.poutput("Loaded a total of %u bytes in %u blocks. Don't forget install_for_install (and make selectable) now!" % (total_size, block_nr)) + install_cap_parser = argparse.ArgumentParser() + install_cap_parser.add_argument('cap_file', type=str, metavar='FILE', + help='JAVA-CARD CAP file to install') + install_cap_parser.add_argument('--install-parameters', type=is_hexstr, default='', + help='install Parameters (GPC_SPE_034, section 11.5.2.3.7, table 11-49)') + install_cap_parser.add_argument('--install-parameters-volatile-memory-quota', type=int, default=None, + help='install Parameters (GPC_SPE_034, section 11.5.2.3.7, table 11-49)') + install_cap_parser.add_argument('--install-parameters-non-volatile-memory-quota', type=int, default=None, + help='Install Parameters (GPC_SPE_034, section 11.5.2.3.7, table 11-49)') + install_cap_parser.add_argument('--install-parameters-stk', type=is_hexstr, default=None, + help='Load Parameters (ETSI TS 102 226, section 8.2.1.3.2.1)') + + @cmd2.with_argparser(install_cap_parser) + def do_install_cap(self, opts): + """Perform a .cap file installation using GlobalPlatform LOAD and INSTALL commands.""" + + self._cmd.poutput("loading cap file: %s ..." % opts.cap_file) + cap = CapFile(opts.cap_file) + + security_domain_aid = self._cmd.lchan.selected_file.aid + load_file = cap.get_loadfile() + load_file_aid = cap.get_loadfile_aid() + module_aid = cap.get_applet_aid() + application_aid = module_aid + if opts.install_parameters != '': + install_parameters = opts.install_parameters; + else: + install_parameters = gen_install_parameters(opts.install_parameters_non_volatile_memory_quota, + opts.install_parameters_volatile_memory_quota, + opts.install_parameters_stk) + self._cmd.poutput("parameters:") + self._cmd.poutput(" security-domain-aid: %s" % security_domain_aid) + self._cmd.poutput(" load-file: %u bytes" % (len(load_file) // 2)) + self._cmd.poutput(" load-file-aid: %s" % load_file_aid) + self._cmd.poutput(" module-aid: %s" % module_aid) + self._cmd.poutput(" application-aid: %s" % application_aid) + self._cmd.poutput(" install-parameters: %s" % install_parameters) + + self._cmd.poutput("step #1: install for load...") + self.do_install_for_load("--load-file-aid %s --security-domain-aid %s" % (load_file_aid, security_domain_aid)) + self._cmd.poutput("step #2: load...") + self.load(h2b(load_file)) + self._cmd.poutput("step #3: install_for_install (and make selectable)...") + self.do_install_for_install("--load-file-aid %s --module-aid %s --application-aid %s --install-parameters %s --make-selectable" % + (load_file_aid, module_aid, application_aid, install_parameters)) + self._cmd.poutput("done.") + est_scp02_parser = argparse.ArgumentParser() est_scp02_parser.add_argument('--key-ver', type=auto_uint8, required=True, help='Key Version Number (KVN)') est_scp02_parser.add_argument('--host-challenge', type=is_hexstr, diff --git a/pySim/global_platform/install_param.py b/pySim/global_platform/install_param.py new file mode 100644 index 0000000..0d1dfdb --- /dev/null +++ b/pySim/global_platform/install_param.py @@ -0,0 +1,74 @@ +# GlobalPlatform install parameter generator +# +# (C) 2024 by Sysmocom s.f.m.c. GmbH +# All Rights Reserved +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +from construct import Optional as COptional +from construct import Struct, GreedyRange, FlagsEnum, Int16ub, Int32ub, Padding, Bit, Const +from osmocom.construct import * +from osmocom.utils import * +from osmocom.tlv import * + +class AppSpecificParams(BER_TLV_IE, tag=0xC9): + # GPD_SPE_013, table 11-49 + _construct = HexAdapter(GreedyBytes) + +class VolatileMemoryQuota(BER_TLV_IE, tag=0xC7): + # GPD_SPE_013, table 11-49 + _construct = StripTrailerAdapter(GreedyBytes, 4, steps = [2,4], reverse = True) + +class NonVolatileMemoryQuota(BER_TLV_IE, tag=0xC8): + # GPD_SPE_013, table 11-49 + _construct = StripTrailerAdapter(GreedyBytes, 4, steps = [2,4], reverse = True) + +class StkParameter(BER_TLV_IE, tag=0xCA): + # GPD_SPE_013, table 11-49 + # ETSI TS 102 226, section 8.2.1.3.2.1 + _construct = HexAdapter(GreedyBytes) + +class SystemSpecificParams(BER_TLV_IE, tag=0xEF, nested=[VolatileMemoryQuota, NonVolatileMemoryQuota, StkParameter]): + # GPD_SPE_013 v1.1 Table 6-5 + pass + +class InstallParams(TLV_IE_Collection, nested=[AppSpecificParams, SystemSpecificParams]): + # GPD_SPE_013, table 11-49 + pass + +def gen_install_parameters(non_volatile_memory_quota:int, volatile_memory_quota:int, stk_parameter:str): + + # GPD_SPE_013, table 11-49 + + #Mandatory + install_params = InstallParams() + install_params_dict = [{'app_specific_params': None}] + + #Conditional + if non_volatile_memory_quota and volatile_memory_quota and stk_parameter: + system_specific_params = [] + #Optional + if non_volatile_memory_quota: + system_specific_params += [{'non_volatile_memory_quota': non_volatile_memory_quota}] + #Optional + if volatile_memory_quota: + system_specific_params += [{'volatile_memory_quota': volatile_memory_quota}] + #Optional + if stk_parameter: + system_specific_params += [{'stk_parameter': stk_parameter}] + install_params_dict += [{'system_specific_params': system_specific_params}] + + install_params.from_dict(install_params_dict) + return b2h(install_params.to_bytes()) diff --git a/tests/unittests/test_globalplatform.py b/tests/unittests/test_globalplatform.py index 597d51d..3c533d5 100644 --- a/tests/unittests/test_globalplatform.py +++ b/tests/unittests/test_globalplatform.py @@ -21,6 +21,7 @@ from pySim.global_platform import * from pySim.global_platform.scp import * +from pySim.global_platform.install_param import * KIC = h2b('100102030405060708090a0b0c0d0e0f') # enc KID = h2b('101102030405060708090a0b0c0d0e0f') # MAC @@ -289,5 +290,13 @@ self.assertEqual(compute_kcv('aes', KEYSET_AES128.dek), h2b('840DE5')) +class Install_param_Test(unittest.TestCase): + def test_gen_install_parameters(self): + load_parameters = gen_install_parameters(256, 256, '010001001505000000000000000000000000') + self.assertEqual(load_parameters, 'c900ef1cc8020100c7020100ca12010001001505000000000000000000000000') + + load_parameters = gen_install_parameters(None, None, '') + self.assertEqual(load_parameters, 'c900') + if __name__ == "__main__": unittest.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39199?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: I6cbd37f0fad5579b20e83c27349bd5acc129e6d0 Gerrit-Change-Number: 39199 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

6 months

1
0
0 0

[M] Change in ...pyosmocom[master]: construct: allow stripping of leading zeros with StripTrailerAdapter

by dexter

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/python/pyosmocom/+/39193?usp=email to look at the new patch set (#2). Change subject: construct: allow stripping of leading zeros with StripTrailerAdapter ...................................................................... construct: allow stripping of leading zeros with StripTrailerAdapter The class StripTrailerAdapter is currently only able to strip zeros at the end of an integer. What it can not do is stripping leading zeros. Let's add a parameter for that and extend the unittests accordingly. Related: OS#6679 Change-Id: I1a9fff17abbbef0c5f6d45f58198debfa12e78b6 --- M src/osmocom/construct.py M tests/test_construct.py 2 files changed, 59 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/93/39193/2 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/39193?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I1a9fff17abbbef0c5f6d45f58198debfa12e78b6 Gerrit-Change-Number: 39193 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

6 months

1
0
0 0

[M] Change in ...pyosmocom[master]: construct: allow stripping of leading zeros with StripTrailerAdapter

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/39193?usp=email ) Change subject: construct: allow stripping of leading zeros with StripTrailerAdapter ...................................................................... construct: allow stripping of leading zeros with StripTrailerAdapter The class StripTrailerAdapter is currently only able to strip zeros at the end of an integer. What it can not do is stripping leading zeros. Let's add a parameter for that and extend the unittests accordingly. Related: OS#6679 Change-Id: I1a9fff17abbbef0c5f6d45f58198debfa12e78b6 --- M src/osmocom/construct.py M tests/test_construct.py 2 files changed, 59 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/93/39193/1 diff --git a/src/osmocom/construct.py b/src/osmocom/construct.py index 1f5bd45..dd92165 100644 --- a/src/osmocom/construct.py +++ b/src/osmocom/construct.py @@ -420,19 +420,23 @@ where you have a bit-mask that may have 1, 2 or 3 bytes, depending on whether or not any of the LSBs are actually set. """ - def __init__(self, subcon, total_length:int, default_value=b'\x00', min_len=1, steps:[int]=[]): + def __init__(self, subcon, total_length:int, default_value=b'\x00', min_len=1, steps:[int]=[], reverse:bool = False): super().__init__(subcon) assert len(default_value) == 1 self.total_length = total_length self.default_value = default_value self.min_len = min_len self.steps = steps + self.reverse = reverse def _decode(self, obj, context, path): assert isinstance(obj, bytes) # pad with suppressed/missing bytes if len(obj) < self.total_length: - obj += self.default_value * (self.total_length - len(obj)) + if self.reverse: + obj = self.default_value * (self.total_length - len(obj)) + obj + else: + obj += self.default_value * (self.total_length - len(obj)) return int.from_bytes(obj, 'big') def _encode(self, obj, context, path): @@ -441,10 +445,16 @@ # remove trailing bytes if they are zero obj_step_aligned = obj - while len(obj) > self.min_len and obj[-1] == self.default_value[0]: - obj = obj[:-1] - if len(obj) in self.steps: - obj_step_aligned = obj + if self.reverse: + while len(obj) > self.min_len and obj[0] == self.default_value[0]: + obj = obj[1:] + if len(obj) in self.steps: + obj_step_aligned = obj + else: + while len(obj) > self.min_len and obj[-1] == self.default_value[0]: + obj = obj[:-1] + if len(obj) in self.steps: + obj_step_aligned = obj if self.steps == []: return obj diff --git a/tests/test_construct.py b/tests/test_construct.py index e4234db..4fb1a71 100755 --- a/tests/test_construct.py +++ b/tests/test_construct.py @@ -101,6 +101,11 @@ final_application=0x0200, global_service=0x0100, receipt_generation=0x80, ciphered_load_file_data_block=0x40, contactless_activation=0x20, contactless_self_activation=0x10) + IntegerSteps = StripTrailerAdapter(GreedyBytes, 4, steps = [2,4]) + Integer = StripTrailerAdapter(GreedyBytes, 4) + IntegerStepsReverse = StripTrailerAdapter(GreedyBytes, 4, steps = [2,4], reverse = True) + IntegerReverse = StripTrailerAdapter(GreedyBytes, 4, reverse = True) + examples = ['00', '80', '8040', '400010'] def test_encdec(self): for e in self.examples: @@ -108,6 +113,44 @@ reenc = self.Privileges.build(dec) self.assertEqual(e, b2h(reenc)) + def test_encdec_integer(self): + enc = self.IntegerSteps.build(0x10000000) + self.assertEqual(b2h(enc), '1000') + enc = self.IntegerSteps.build(0x10200000) + self.assertEqual(b2h(enc), '1020') + enc = self.IntegerSteps.build(0x10203000) + self.assertEqual(b2h(enc), '10203000') + enc = self.IntegerSteps.build(0x10203040) + self.assertEqual(b2h(enc), '10203040') + + enc = self.Integer.build(0x10000000) + self.assertEqual(b2h(enc), '10') + enc = self.Integer.build(0x10200000) + self.assertEqual(b2h(enc), '1020') + enc = self.Integer.build(0x10203000) + self.assertEqual(b2h(enc), '102030') + enc = self.Integer.build(0x10203040) + self.assertEqual(b2h(enc), '10203040') + + def test_encdec_integer_reverse(self): + enc = self.IntegerStepsReverse.build(0x40) + self.assertEqual(b2h(enc), '0040') + enc = self.IntegerStepsReverse.build(0x3040) + self.assertEqual(b2h(enc), '3040') + enc = self.IntegerStepsReverse.build(0x203040) + self.assertEqual(b2h(enc), '00203040') + enc = self.IntegerStepsReverse.build(0x10203040) + self.assertEqual(b2h(enc), '10203040') + + enc = self.IntegerReverse.build(0x40) + self.assertEqual(b2h(enc), '40') + enc = self.IntegerReverse.build(0x3040) + self.assertEqual(b2h(enc), '3040') + enc = self.IntegerReverse.build(0x203040) + self.assertEqual(b2h(enc), '203040') + enc = self.IntegerReverse.build(0x10203040) + self.assertEqual(b2h(enc), '10203040') + def test_enc(self): enc = self.Privileges.build({'dap_verification' : True}) self.assertEqual(b2h(enc), '40') -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/39193?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I1a9fff17abbbef0c5f6d45f58198debfa12e78b6 Gerrit-Change-Number: 39193 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

6 months

1
0
0 0

[XS] Change in osmo-pcap[master]: pcap-server: remove unneeded check for null base_path

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email ) Change subject: pcap-server: remove unneeded check for null base_path ...................................................................... pcap-server: remove unneeded check for null base_path It cannot be ever NULL. It is set to a non-null path during alloc(), and it can only be replaced with another string through VTY. Change-Id: I2f503f6f9af35d6ae6fbd03e85cade4f0eb93df2 --- M src/osmo_server_vty.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/92/39192/1 diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 6a44da6..c3014c9 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -96,8 +96,7 @@ vty_out(vty, "server%s", VTY_NEWLINE); - if (pcap_server->base_path) - vty_out(vty, " base-path %s%s", pcap_server->base_path, VTY_NEWLINE); + vty_out(vty, " base-path %s%s", pcap_server->base_path, VTY_NEWLINE); vty_out(vty, " file-permission-mask 0%o%s", pcap_server->permission_mask, VTY_NEWLINE); if (pcap_server->addr) vty_out(vty, " server ip %s%s", pcap_server->addr, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I2f503f6f9af35d6ae6fbd03e85cade4f0eb93df2 Gerrit-Change-Number: 39192 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in osmo-pcap[master]: pcap-server: Move struct osmo_pcap_server alloc to its own helper fun...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39191?usp=email ) Change subject: pcap-server: Move struct osmo_pcap_server alloc to its own helper function ...................................................................... pcap-server: Move struct osmo_pcap_server alloc to its own helper function Change-Id: Ie3b96ed6f47c966e2e12ab99710ac6af1468f963 --- M src/osmo_server_main.c 1 file changed, 23 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/91/39191/1 diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index a04de9b..74d2727 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -204,6 +204,28 @@ msgb_talloc_ctx_init(tall_srv_ctx, 0); } +static struct osmo_pcap_server *osmo_pcap_server_alloc(void *ctx) +{ + struct osmo_pcap_server *psrv = talloc_zero(ctx, struct osmo_pcap_server); + OSMO_ASSERT(psrv); + + psrv->ctrg = rate_ctr_group_alloc(psrv, &pcap_server_group_desc, 0); + OSMO_ASSERT(psrv->ctrg); + + INIT_LLIST_HEAD(&psrv->conn); + psrv->base_path = talloc_strdup(psrv, "./"); + OSMO_ASSERT(psrv->base_path); + psrv->permission_mask = 0440; + psrv->max_size = 1073741824; /* 1024^3, 1GB **/ + psrv->max_size_enabled = true; + psrv->max_snaplen = DEFAULT_SNAPLEN; + /* By default rotate daily: */ + psrv->rotate_localtime.enabled = true; + psrv->rotate_localtime.intv = TIME_INTERVAL_DAY; + psrv->rotate_localtime.modulus = 1; + return psrv; +} + int main(int argc, char **argv) { int rc; @@ -236,27 +258,7 @@ osmo_tls_init(); - pcap_server = talloc_zero(tall_srv_ctx, struct osmo_pcap_server); - if (!pcap_server) { - LOGP(DSERVER, LOGL_ERROR, "Failed to allocate osmo_pcap_server.\n"); - exit(1); - } - pcap_server->ctrg = rate_ctr_group_alloc(pcap_server, &pcap_server_group_desc, 0); - if (!pcap_server->ctrg) { - LOGP(DSERVER, LOGL_ERROR, "Failed to allocate rate counter.\n"); - exit(1); - } - - INIT_LLIST_HEAD(&pcap_server->conn); - pcap_server->base_path = talloc_strdup(pcap_server, "./"); - pcap_server->permission_mask = 0440; - pcap_server->max_size = 1073741824; /* 1024^3, 1GB **/ - pcap_server->max_size_enabled = true; - pcap_server->max_snaplen = DEFAULT_SNAPLEN; - /* By default rotate daily: */ - pcap_server->rotate_localtime.enabled = true; - pcap_server->rotate_localtime.intv = TIME_INTERVAL_DAY; - pcap_server->rotate_localtime.modulus = 1; + pcap_server = osmo_pcap_server_alloc(tall_srv_ctx); if (vty_read_config_file(config_file, NULL) < 0) { LOGP(DSERVER, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39191?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Ie3b96ed6f47c966e2e12ab99710ac6af1468f963 Gerrit-Change-Number: 39191 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[XS] Change in osmo-pcap[master]: pcap-server: Use osmo_talloc_replace_string() to replace base-path

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39190?usp=email ) Change subject: pcap-server: Use osmo_talloc_replace_string() to replace base-path ...................................................................... pcap-server: Use osmo_talloc_replace_string() to replace base-path Change-Id: I9ba1b7202d3e6a06cfd6efd6ed773b53007a99c4 --- M src/osmo_server_vty.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/90/39190/1 diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 3191cda..6a44da6 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -149,8 +149,7 @@ "base-path PATH", "Base path for log files\n" "Path\n") { - talloc_free(pcap_server->base_path); - pcap_server->base_path = talloc_strdup(pcap_server, argv[0]); + osmo_talloc_replace_string(pcap_server, &pcap_server->base_path, argv[0]); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39190?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I9ba1b7202d3e6a06cfd6efd6ed773b53007a99c4 Gerrit-Change-Number: 39190 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[XS] Change in osmo-pcap[master]: pcap-server: Fix [no] max-file-size regression

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39189?usp=email ) Change subject: pcap-server: Fix [no] max-file-size regression ...................................................................... pcap-server: Fix [no] max-file-size regression Fix typo ending in inversed logic in max-file-size VTY command. Fixes: d94e1ffcb75f7b2390138d7eb3b95b0f879b1e91 Change-Id: I8f41a045a036301daf8d95535e7043f79db7075e --- M src/osmo_server_network.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index e53ce01..63f026c 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -217,7 +217,7 @@ { off_t cur; - if (pcap_server->max_size_enabled) + if (!pcap_server->max_size_enabled) return false; cur = lseek(conn->local_fd, 0, SEEK_CUR); if (cur + data->len <= conn->server->max_size) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39189?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I8f41a045a036301daf8d95535e7043f79db7075e Gerrit-Change-Number: 39189 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[XS] Change in osmo-pcap[master]: pcap-server: Fix [no] max-file-size regression

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39189?usp=email ) Change subject: pcap-server: Fix [no] max-file-size regression ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: Merging myself since it's a trivial obvious fix. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39189?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I8f41a045a036301daf8d95535e7043f79db7075e Gerrit-Change-Number: 39189 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Dec 2024 12:50:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[XS] Change in osmo-pcap[master]: pcap-server: Fix [no] max-file-size regression

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcap/+/39189?usp=email ) Change subject: pcap-server: Fix [no] max-file-size regression ...................................................................... pcap-server: Fix [no] max-file-size regression Fix typo ending in inversed logic in max-file-size VTY command. Fixes: d94e1ffcb75f7b2390138d7eb3b95b0f879b1e91 Change-Id: I8f41a045a036301daf8d95535e7043f79db7075e --- M src/osmo_server_network.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/89/39189/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39189?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I8f41a045a036301daf8d95535e7043f79db7075e Gerrit-Change-Number: 39189 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

6 months

1
0
0 0

[XS] Change in osmo-pcap[master]: Fix [no] max-file-size regression

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39189?usp=email ) Change subject: Fix [no] max-file-size regression ...................................................................... Fix [no] max-file-size regression Fix typo ending in inversed logic in max-file-size VTY command. Fixes: d94e1ffcb75f7b2390138d7eb3b95b0f879b1e91 Change-Id: I8f41a045a036301daf8d95535e7043f79db7075e --- M src/osmo_server_network.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/89/39189/1 diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index e53ce01..63f026c 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -217,7 +217,7 @@ { off_t cur; - if (pcap_server->max_size_enabled) + if (!pcap_server->max_size_enabled) return false; cur = lseek(conn->local_fd, 0, SEEK_CUR); if (cur + data->len <= conn->server->max_size) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39189?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I8f41a045a036301daf8d95535e7043f79db7075e Gerrit-Change-Number: 39189 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024