- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: library/DIAMETER_Emulation: implement direct mode of operation

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26521 ) Change subject: library/DIAMETER_Emulation: implement direct mode of operation ...................................................................... Patch Set 2: (1 comment) This change is ready for review. File library/DIAMETER_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26521/comment/647e67de_501c… PS1, Line 342: [ops.direct] DIAMETER_UNIT.receive(PDU_DIAMETER:?) -> value msg { > so if direct is false, what do we do with those messages? I don't see any other DIAMETER_UNIT. […] If 'direct' is false, then the emulation component behaves as usual: looks up a dedicated component in its internal table and sends the PDU over DIAMETER_CLIENT port. If true, no lookup is performed and all messages are getting sent over DIAMETER_UNIT port regardless of the IMSI. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I52e22ac70cc85be5b0436b68c77356aabc4f05e1 Gerrit-Change-Number: 26521 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Jan 2022 15:37:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-bsc-nat[master]: Add bsc_nat fsm

by osmith

Attention is currently required from: neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662 ) Change subject: Add bsc_nat fsm ...................................................................... Patch Set 5: (9 comments) Patchset: PS5: Thanks for the detailed review, updated. File include/osmocom/bsc_nat/bsc_nat_fsm.h: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662/comment/8b63849b_0bba3e23 PS4, Line 21: enum bsc_nat_fsm_states { > (usually the state enum can live in the foo_fsm. […] Done https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662/comment/a90c2712_7a6e96fd PS4, Line 33: extern struct osmo_fsm bsc_nat_fsm; > (no need to declare the fsm in the .h, it can be static in the .c file. […] Done https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662/comment/f5560898_43a60a2b PS4, Line 35: void bsc_nat_start(struct bsc_nat *bsc_nat); > does this do the same as BSC_NAT_FSM_EV_START? Then maybe the events enum can also move to the . […] Done File src/osmo-bsc-nat/bsc_nat_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662/comment/47801b12_3e07cc73 PS4, Line 34: #define X(s) (1 << (s)) > There's tons of FSMs where X() is used. keeping X() https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662/comment/cd103293_e7785c1d PS4, Line 142: osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STOPPED, 0, 0); > seems like ST_STOPPING is not needed: the onenter directly changes state to another state. […] Done https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662/comment/3a713cdc_f3708e26 PS4, Line 159: X(BSC_NAT_FSM_ST_STOPPING), > (let me plug here the scheme i invented and use in my FSM definitions, which allows adding and remov […] Done https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662/comment/83077a4d_41fe4fd7 PS4, Line 184: int bsc_nat_fsm_timer_cb(struct osmo_fsm_inst *fi) > seems like no timer cb is needed. […] Done File src/osmo-bsc-nat/main.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662/comment/7cbf2bbd_1130f83e PS4, Line 150: bsc_nat_stop(g_bsc_nat, true); > osmo_select_shutdown_request() changes the osmo select loop to only handle pending writes and no lon […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I7d52fa649c397582b18a1a7dcc40bb407f3b2c97 Gerrit-Change-Number: 26662 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Jan 2022 15:09:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-bsc-nat[master]: Add bsc_nat fsm

by osmith

Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662 to look at the new patch set (#5). Change subject: Add bsc_nat fsm ...................................................................... Add bsc_nat fsm Create the initial FSM that starts and stops two SS7 instances (one for CN, one for RAN), and binds an sccp user to each. Related: OS#2545 Depends: libosmocore 0066f1bdcb328e7ffc846b4746e3e1d02afe4be8 Change-Id: I7d52fa649c397582b18a1a7dcc40bb407f3b2c97 --- M doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg M include/osmocom/bsc_nat/Makefile.am M include/osmocom/bsc_nat/bsc_nat.h A include/osmocom/bsc_nat/bsc_nat_fsm.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc_nat.c A src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/main.c M src/osmo-bsc-nat/vty.c 9 files changed, 324 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/62/26662/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I7d52fa649c397582b18a1a7dcc40bb407f3b2c97 Gerrit-Change-Number: 26662 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 5 months

1
0
0 0

Change in pysim[master]: ts_102_221: decode/encode EF.PL

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26965 ) Change subject: ts_102_221: decode/encode EF.PL ...................................................................... ts_102_221: decode/encode EF.PL pySIM-shell (MF/EF.PL)> read_binary_decoded [ "en", null, null, null, null ] Change-Id: I4e879ef34acee461adb8137a6315d064370b1b10 --- M pySim/ts_102_221.py 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/65/26965/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index f145d19..7cc3025 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -503,6 +503,17 @@ class EF_PL(TransRecEF): def __init__(self, fid='2f05', sfid=0x05, name='EF.PL', desc='Preferred Languages'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=2, size={2,None}) + def _decode_record_bin(self, bin_data): + if bin_data == b'\xff\xff': + return None + else: + return bin_data.decode('ascii') + def _encode_record_bin(self, in_json): + if in_json is None: + return b'\xff\xff' + else: + return in_json.encode('ascii') + # TS 102 221 Section 13.4 class EF_ARR(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4e879ef34acee461adb8137a6315d064370b1b10 Gerrit-Change-Number: 26965 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in pysim[master]: pySim-shell: alphabetically sort name of files in 'dir' command

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26964 ) Change subject: pySim-shell: alphabetically sort name of files in 'dir' command ...................................................................... pySim-shell: alphabetically sort name of files in 'dir' command Change-Id: Id136909884d3c0eaa2416c6c488a6c4b7ed48119 --- M pySim/filesystem.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/26964/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 32688db..3e9d52e 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -172,7 +172,9 @@ list containing all selectable names. """ sels = self.get_selectables(flags) - return list(sels.keys()) + sel_keys = list(sels.keys()) + sel_keys.sort() + return sel_keys def decode_select_response(self, data_hex:str): """Decode the response to a SELECT command. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id136909884d3c0eaa2416c6c488a6c4b7ed48119 Gerrit-Change-Number: 26964 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in pysim[master]: cosmetic: Use EF.FDN instead of EF_FDN in ts_51_011.py

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26963 ) Change subject: cosmetic: Use EF.FDN instead of EF_FDN in ts_51_011.py ...................................................................... cosmetic: Use EF.FDN instead of EF_FDN in ts_51_011.py All the files have '.' as separator in their names so far, let's avoid any inconsistencies Change-Id: Icabb892408a40ea37c7ebeb7db545b383aa01d99 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/26963/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 847ed98..0f7e737 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -434,7 +434,7 @@ super().__init__(fid=fid, name=name, desc=desc) files = [ EF_ADN(), - EF_ADN(fid='6f3b', name='EF_FDN', desc='Fixed dialling numbers'), + EF_ADN(fid='6f3b', name='EF.FDN', desc='Fixed dialling numbers'), EF_SMS(), LinFixedEF(fid='6f3d', name='EF.CCP', desc='Capability Configuration Parameters', rec_len={14,14}), LinFixedEF(fid='6f4f', name='EF.ECCP', desc='Extended Capability Configuration Parameters', rec_len={15,32}), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icabb892408a40ea37c7ebeb7db545b383aa01d99 Gerrit-Change-Number: 26963 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add support for EF.ECC (emergency call codes)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26962 ) Change subject: ts_31_102: Add support for EF.ECC (emergency call codes) ...................................................................... ts_31_102: Add support for EF.ECC (emergency call codes) decoded output will look like this: [ { "call_code": "911", "service_category": { "police": false, "ambulance": false, "fire_brigade": false, "marine_guard": false, "mountain_rescue": false, "manual_ecall": false, "automatic_ecall": false }, "alpha_id": "911" }, { "call_code": "112", "service_category": { "police": false, "ambulance": false, "fire_brigade": false, "marine_guard": false, "mountain_rescue": false, "manual_ecall": false, "automatic_ecall": false }, "alpha_id": "112" }, null, null, null ] Change-Id: If8b4972af4f5be1707446d335cfc6e729c973abb --- M pySim/ts_31_102.py 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/62/26962/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 647a4d7..c96bf09 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -558,9 +558,35 @@ # TS 31.103 Section 4.2.7 - *not* the same as DF.GSM/EF.ECC! class EF_ECC(LinFixedEF): + cc_construct = Rpad(BcdAdapter(Rpad(Bytes(3))), pattern='f') + category_construct = FlagsEnum(Byte, police=1, ambulance=2, fire_brigade=3, marine_guard=4, + mountain_rescue=5, manual_ecall=6, automatic_ecall=7) + alpha_construct = GsmStringAdapter(Rpad(GreedyBytes)) def __init__(self, fid='6fb7', sfid=0x01, name='EF.ECC', desc='Emergency Call Codes'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={4,20}) + def _decode_record_bin(self, in_bin): + # mandatory parts + code = in_bin[:3] + if code == b'\xff\xff\xff': + return None + svc_category = in_bin[-1:] + ret = {'call_code': parse_construct(EF_ECC.cc_construct, code), + 'service_category': parse_construct(EF_ECC.category_construct, svc_category) } + # optional alpha identifier + if len(in_bin) > 4: + alpha_id = in_bin[3:-1] + ret['alpha_id'] = parse_construct(EF_ECC.alpha_construct, alpha_id) + return ret + def _encode_record_bin(self, in_json): + if in_json is None: + return b'\xff\xff\xff\xff' + code = EF_ECC.cc_construct.build(in_json['call_code']) + svc_category = EF_ECC.category_construct.build(in_json['category']) + alpha_id = EF_ECC.alpha_construct.build(in_json['alpha_id']) + # FIXME: alpha_id needs padding up to 'record_length - 4' + return code + alpha_id + svc_category + # TS 31.102 Section 4.2.17 class EF_LOCI(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If8b4972af4f5be1707446d335cfc6e729c973abb Gerrit-Change-Number: 26962 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in pysim[master]: add missing bit definition for NG-RAN in xAcT

by fixeria

Attention is currently required from: laforge, bjoern. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26956 ) Change subject: add missing bit definition for NG-RAN in xAcT ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: As can be seen from https://jenkins.osmocom.org/jenkins/job/gerrit-pysim/1653/a1=default,a2=def…, you also need to update DecTestCase.testDecAct_allSet() in tests/test_utils.py. Just add the missing entry to the array. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I910df28c4c59ec94cce9603377786325f6d8c1a3 Gerrit-Change-Number: 26956 Gerrit-PatchSet: 2 Gerrit-Owner: bjoern <bjoern.c3(a)nixda.biz> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: bjoern <bjoern.c3(a)nixda.biz> Gerrit-Comment-Date: Fri, 21 Jan 2022 12:10:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in pysim[master]: add missing bit definition for NG-RAN in xAcT

by bjoern

Attention is currently required from: laforge, fixeria. bjoern has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26956 ) Change subject: add missing bit definition for NG-RAN in xAcT ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > You can do the following: […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I910df28c4c59ec94cce9603377786325f6d8c1a3 Gerrit-Change-Number: 26956 Gerrit-PatchSet: 2 Gerrit-Owner: bjoern <bjoern.c3(a)nixda.biz> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Jan 2022 12:06:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: bjoern <bjoern.c3(a)nixda.biz> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in pysim[master]: add missing bit definition for NG-RAN in xAcT

by bjoern

Attention is currently required from: laforge, bjoern. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/26956 to look at the new patch set (#2). Change subject: add missing bit definition for NG-RAN in xAcT ...................................................................... add missing bit definition for NG-RAN in xAcT when encoding the AcT value bit 11 is correctly set when NG-RAN is present in the string representation, however the decoding of bit 11 was missing. Change-Id: I910df28c4c59ec94cce9603377786325f6d8c1a3 --- M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 5 files changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/56/26956/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I910df28c4c59ec94cce9603377786325f6d8c1a3 Gerrit-Change-Number: 26956 Gerrit-PatchSet: 2 Gerrit-Owner: bjoern <bjoern.c3(a)nixda.biz> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: bjoern <bjoern.c3(a)nixda.biz> Gerrit-MessageType: newpatchset

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log