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

[S] Change in libosmo-sigtran[master]: sigtran: Add API osmo_ss7_get_sccp()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38656?usp=email ) Change subject: sigtran: Add API osmo_ss7_get_sccp() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I8f09aff41666822f759f99fa91c13e3b9d89d530 Gerrit-Change-Number: 38656 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Nov 2024 08:45:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/gsup: rework f_gen_{tr,ts}_ss_ies() and SS templates

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38584?usp=email ) Change subject: library/gsup: rework f_gen_{tr,ts}_ss_ies() and SS templates ...................................................................... Patch Set 4: (2 comments) This change is ready for review. File library/GSUP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38584/comment/4c4cdf47_7ea3… : PS2, Line 1330: private function f_gen_ts_ss_ies(template (value) hexstring imsi, > You could split this big chunk of changes and move all the "(present)" and "(value)" into another pa […] See https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38689. File library/GSUP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38584/comment/956ef41d_3cb1… : PS3, Line 1415: else if (istemplatekind(destination_name, "*")) > TODO: separate commit I moved this chunk to https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38585. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia611ffa3845d48c5553c70f10981aa029d00d873 Gerrit-Change-Number: 38584 Gerrit-PatchSet: 4 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, 08 Nov 2024 08:43:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/gsup: add src/dst name IEs to all SS templates

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38585?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: library/gsup: add src/dst name IEs to all SS templates ...................................................................... library/gsup: add src/dst name IEs to all SS templates This enables us to send/match OSMO_GSUP_{SOURCE,DESTINATION}_NAME IEs (if needed) and brings consistency to all SS related templates. This patch makes the following testcases pass [again]: * TC_mt_ussd_for_unknown_subscr, * TC_proc_ss_for_unknown_session. At some point osmo-msc started including the Source Name IE in OSMO_GSUP_MSGT_PROC_SS_ERROR messages, which we didn't expect. Change-Id: I8d947313a99491d2e4790bc06db863fe09d8b5cf --- M library/GSUP_Templates.ttcn 1 file changed, 61 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/38585/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38585?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8d947313a99491d2e4790bc06db863fe09d8b5cf Gerrit-Change-Number: 38585 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/gsup: improve GSUP_IE templates

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38689?usp=email ) Change subject: library/gsup: improve GSUP_IE templates ...................................................................... library/gsup: improve GSUP_IE templates * Turn template params into templates * Use proper template restrictions * Remove unnecessary valueof()s * Improve formatting Change-Id: I67cc555a54113dccb11d0cc05cee66f5c2d795fe --- M library/GSUP_Templates.ttcn 1 file changed, 115 insertions(+), 105 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/38689/1 diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 2ccc16d..00c1e17 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -40,9 +40,9 @@ } } -template (value) GSUP_MSISDN ts_GSUP_MSISDN(hexstring digits, - BIT3 ton := '000'B, - BIT4 npi := '0000'B) := { +template (value) GSUP_MSISDN ts_GSUP_MSISDN(template (value) hexstring digits, + template (value) BIT3 ton := '000'B, + template (value) BIT4 npi := '0000'B) := { len := 0, /* overwritten */ /* numberingPlanIdentification := npi, typeOfNumber := ton, @@ -50,9 +50,9 @@ digits := digits } -template GSUP_MSISDN tr_GSUP_MSISDN(template hexstring digits, - template BIT3 ton := ?, - template BIT4 npi := ?) := { +template (present) GSUP_MSISDN tr_GSUP_MSISDN(template (present) hexstring digits, + template (present) BIT3 ton := ?, + template (present) BIT4 npi := ?) := { len := ?, /* numberingPlanIdentification := npi, typeOfNumber := ton, @@ -79,25 +79,27 @@ } } -template GSUP_IE ts_GSUP_IE_AuthTuple2G(octetstring rand, octetstring sres, - octetstring kc) := { +template (value) GSUP_IE +ts_GSUP_IE_AuthTuple2G(template (value) octetstring rand, + template (value) octetstring sres, + template (value) octetstring kc) := { tag := OSMO_GSUP_AUTH_TUPLE_IE, len := 0, /* overwritten */ val := { auth_tuple := { - valueof(ts_GSUP_IE_RAND(rand)), - valueof(ts_GSUP_IE_SRES(sres)), - valueof(ts_GSUP_IE_Kc(kc)) + ts_GSUP_IE_RAND(rand), + ts_GSUP_IE_SRES(sres), + ts_GSUP_IE_Kc(kc) } } } -template GSUP_IE tr_GSUP_IE_AuthTuple3G( - template (present) octetstring rand := ?, - template (present) octetstring ik := ?, - template (present) octetstring ck := ?, - template (present) octetstring autn := ?, - template (present) octetstring res := ?) := { +template (present) GSUP_IE +tr_GSUP_IE_AuthTuple3G(template (present) octetstring rand := ?, + template (present) octetstring ik := ?, + template (present) octetstring ck := ?, + template (present) octetstring autn := ?, + template (present) octetstring res := ?) := { tag := OSMO_GSUP_AUTH_TUPLE_IE, len := ?, val := { @@ -111,30 +113,33 @@ } } -template GSUP_IE ts_GSUP_IE_AuthTuple3G(octetstring rand, octetstring ik, - octetstring ck, octetstring autn, - octetstring res) := { +template (value) GSUP_IE +ts_GSUP_IE_AuthTuple3G(template (value) octetstring rand, + template (value) octetstring ik, + template (value) octetstring ck, + template (value) octetstring autn, + template (value) octetstring res) := { tag := OSMO_GSUP_AUTH_TUPLE_IE, len := 0, /* overwritten */ val := { auth_tuple := { - valueof(ts_GSUP_IE_RAND(rand)), - valueof(ts_GSUP_IE_IK(ik)), - valueof(ts_GSUP_IE_CK(ck)), - valueof(ts_GSUP_IE_AUTN(autn)), - valueof(ts_GSUP_IE_RES(res)) + ts_GSUP_IE_RAND(rand), + ts_GSUP_IE_IK(ik), + ts_GSUP_IE_CK(ck), + ts_GSUP_IE_AUTN(autn), + ts_GSUP_IE_RES(res) } } } -template GSUP_IE tr_GSUP_IE_AuthTuple2G3G( - template (present) octetstring rand := ?, - template (present) octetstring sres := ?, - template (present) octetstring kc := ?, - template (present) octetstring ik := ?, - template (present) octetstring ck := ?, - template (present) octetstring autn := ?, - template (present) octetstring res := ?) := { +template (present) GSUP_IE +tr_GSUP_IE_AuthTuple2G3G(template (present) octetstring rand := ?, + template (present) octetstring sres := ?, + template (present) octetstring kc := ?, + template (present) octetstring ik := ?, + template (present) octetstring ck := ?, + template (present) octetstring autn := ?, + template (present) octetstring res := ?) := { tag := OSMO_GSUP_AUTH_TUPLE_IE, len := ?, val := { @@ -150,21 +155,25 @@ } } -template GSUP_IE ts_GSUP_IE_AuthTuple2G3G(octetstring rand, octetstring sres, - octetstring kc, octetstring ik, - octetstring ck, octetstring autn, - octetstring res) := { +template (value) GSUP_IE +ts_GSUP_IE_AuthTuple2G3G(template (value)octetstring rand, + template (value) octetstring sres, + template (value) octetstring kc, + template (value) octetstring ik, + template (value) octetstring ck, + template (value) octetstring autn, + template (value) octetstring res) := { tag := OSMO_GSUP_AUTH_TUPLE_IE, len := 0, /* overwritten */ val := { auth_tuple := { - valueof(ts_GSUP_IE_RAND(rand)), - valueof(ts_GSUP_IE_SRES(sres)), - valueof(ts_GSUP_IE_Kc(kc)), - valueof(ts_GSUP_IE_IK(ik)), - valueof(ts_GSUP_IE_CK(ck)), - valueof(ts_GSUP_IE_AUTN(autn)), - valueof(ts_GSUP_IE_RES(res)) + ts_GSUP_IE_RAND(rand), + ts_GSUP_IE_SRES(sres), + ts_GSUP_IE_Kc(kc), + ts_GSUP_IE_IK(ik), + ts_GSUP_IE_CK(ck), + ts_GSUP_IE_AUTN(autn), + ts_GSUP_IE_RES(res) } } } @@ -193,10 +202,10 @@ len := 0, /* overwritten */ val := { pdp_info := { - valueof(ts_GSUP_IE_PDP_CONTEXT_ID(ctx_id)), - valueof(ts_GSUP_IE_PDP_ADDRESS(pdp_address)), - valueof(ts_GSUP_IE_APN(apn)), - valueof(ts_GSUP_IE_PDP_QOS(pdp_qos)) + ts_GSUP_IE_PDP_CONTEXT_ID(ctx_id), + ts_GSUP_IE_PDP_ADDRESS(pdp_address), + ts_GSUP_IE_APN(apn), + ts_GSUP_IE_PDP_QOS(pdp_qos) } } } @@ -237,7 +246,7 @@ } } -template (present) GSUP_IE tr_GSUP_IE_PDP_CONTEXT_ID(template OCT1 ctx_id) := { +template (present) GSUP_IE tr_GSUP_IE_PDP_CONTEXT_ID(template (present) OCT1 ctx_id) := { tag := OSMO_GSUP_PDP_CONTEXT_ID_IE, len := ?, val := { @@ -309,12 +318,12 @@ } } -template (value) GSUP_IMEI ts_GSUP_IMEI(hexstring digits) := { +template (value) GSUP_IMEI ts_GSUP_IMEI(template (value) hexstring digits) := { len := 0, /* overwritten */ digits := digits } -template GSUP_IMEI tr_GSUP_IMEI(template hexstring digits) := { +template (present) GSUP_IMEI tr_GSUP_IMEI(template (present) hexstring digits) := { len := ?, digits := digits } @@ -588,7 +597,7 @@ destination_name := destination_name)); -template (value) GSUP_IE ts_GSUP_IE_CancelType(GSUP_CancelType ctype) := { +template (value) GSUP_IE ts_GSUP_IE_CancelType(template (value) GSUP_CancelType ctype) := { tag := OSMO_GSUP_CANCEL_TYPE_IE, len := 0, /* overwritten */ val := { @@ -596,13 +605,14 @@ } } -template GSUP_IE tr_GSUP_IE_CancelType(template GSUP_CancelType ctype) := +template (present) GSUP_IE tr_GSUP_IE_CancelType(template (present) GSUP_CancelType ctype) := tr_GSUP_IE(OSMO_GSUP_CANCEL_TYPE_IE, GSUP_IeValue:{cancel_type:=ctype}); -template GSUP_IE tr_GSUP_IE_CnDomain(template GSUP_CnDomain domain) := +template (present) GSUP_IE tr_GSUP_IE_CnDomain(template (present) GSUP_CnDomain domain) := tr_GSUP_IE(OSMO_GSUP_CN_DOMAIN_IE, GSUP_IeValue:{cn_domain:=domain}); -template GSUP_IE tr_GSUP_IE(template GSUP_IEI iei, template GSUP_IeValue val := ?) := { +template (present) GSUP_IE tr_GSUP_IE(template (present) GSUP_IEI iei, + template (present) GSUP_IeValue val := ?) := { tag := iei, len := ?, val := val @@ -624,7 +634,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_MSISDN(hexstring msisdn) := { +template (value) GSUP_IE ts_GSUP_IE_MSISDN(template (value) hexstring msisdn) := { tag := OSMO_GSUP_MSISDN_IE, len := 0, /* overwritten */ val := { @@ -632,7 +642,7 @@ } } -template GSUP_IE tr_GSUP_IE_MSISDN(template hexstring msisdn) := { +template (present) GSUP_IE tr_GSUP_IE_MSISDN(template (present) hexstring msisdn) := { tag := OSMO_GSUP_MSISDN_IE, len := ?, val := { @@ -641,7 +651,7 @@ } -template (value) GSUP_IE ts_GSUP_IE_Cause(integer cause) := { +template (value) GSUP_IE ts_GSUP_IE_Cause(template (value) integer cause) := { tag := OSMO_GSUP_CAUSE_IE, len := 0, /* overwritten */ val := { @@ -649,7 +659,7 @@ } } -template GSUP_IE tr_GSUP_IE_Cause(template integer cause) := { +template (present) GSUP_IE tr_GSUP_IE_Cause(template (present) integer cause) := { tag := OSMO_GSUP_CAUSE_IE, len := ?, val := { @@ -665,7 +675,7 @@ } } -template GSUP_IE tr_GSUP_IE_AUTS(template octetstring auts) := { +template (present) GSUP_IE tr_GSUP_IE_AUTS(template (present) octetstring auts) := { tag := OSMO_GSUP_AUTS_IE, len := ?, val := { @@ -681,7 +691,7 @@ } } -template GSUP_IE tr_GSUP_IE_RAND(template octetstring rand := ?) := { +template (present) GSUP_IE tr_GSUP_IE_RAND(template (present) octetstring rand := ?) := { tag := OSMO_GSUP_RAND_IE, len := ?, val := { @@ -697,7 +707,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_SRES(octetstring sres) := { +template (value) GSUP_IE ts_GSUP_IE_SRES(template (value) octetstring sres) := { tag := OSMO_GSUP_SRES_IE, len := 0, /* overwritten */ val := { @@ -713,7 +723,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_Kc(octetstring kc) := { +template (value) GSUP_IE ts_GSUP_IE_Kc(template (value) octetstring kc) := { tag := OSMO_GSUP_KC_IE, len := 0, /* overwritten */ val := { @@ -729,7 +739,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_IK(octetstring ik) := { +template (value) GSUP_IE ts_GSUP_IE_IK(template (value) octetstring ik) := { tag := OSMO_GSUP_IK_IE, len := 0, /* overwritten */ val := { @@ -745,7 +755,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_CK(octetstring ck) := { +template (value) GSUP_IE ts_GSUP_IE_CK(template (value) octetstring ck) := { tag := OSMO_GSUP_CK_IE, len := 0, /* overwritten */ val := { @@ -761,7 +771,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_AUTN(octetstring autn) := { +template (value) GSUP_IE ts_GSUP_IE_AUTN(template (value) octetstring autn) := { tag := OSMO_GSUP_AUTN_IE, len := 0, /* overwritten */ val := { @@ -777,7 +787,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_RES(octetstring res) := { +template (value) GSUP_IE ts_GSUP_IE_RES(template (value) octetstring res) := { tag := OSMO_GSUP_RES_IE, len := 0, /* overwritten */ val := { @@ -793,7 +803,7 @@ } } -template GSUP_IE tr_GSUP_IE_APN(template octetstring apn) := { +template (present) GSUP_IE tr_GSUP_IE_APN(template (present) octetstring apn) := { tag := OSMO_GSUP_ACCESS_POINT_NAME_IE, len := ?, val := { @@ -801,7 +811,7 @@ } } -template GSUP_IE ts_GSUP_IE_CnDomain(template GSUP_CnDomain dom) := { +template (value) GSUP_IE ts_GSUP_IE_CnDomain(template (value) GSUP_CnDomain dom) := { tag := OSMO_GSUP_CN_DOMAIN_IE, len := 0, /* overwritten */ val := { @@ -809,14 +819,14 @@ } } -template (value) GSUP_IE ts_GSUP_IE_SessionId(OCT4 sid) := { +template (value) GSUP_IE ts_GSUP_IE_SessionId(template (value) OCT4 sid) := { tag := OSMO_GSUP_SESSION_ID_IE, len := 0, /* overwritten */ val := { session_id := sid } } -template GSUP_IE tr_GSUP_IE_SessionId(template OCT4 sid) := { +template (present) GSUP_IE tr_GSUP_IE_SessionId(template (present) OCT4 sid) := { tag := OSMO_GSUP_SESSION_ID_IE, len := ?, val := { @@ -824,14 +834,14 @@ } } -template (value) GSUP_IE ts_GSUP_IE_SessionState(GSUP_SessionState state) := { +template (value) GSUP_IE ts_GSUP_IE_SessionState(template (value) GSUP_SessionState state) := { tag := OSMO_GSUP_SESSION_STATE_IE, len := 0, /* overwritten */ val := { session_state := state } } -template GSUP_IE tr_GSUP_IE_SessionState(template GSUP_SessionState state) := { +template (present) GSUP_IE tr_GSUP_IE_SessionState(template (present) GSUP_SessionState state) := { tag := OSMO_GSUP_SESSION_STATE_IE, len := ?, val := { @@ -839,14 +849,14 @@ } } -template (value) GSUP_IE ts_GSUP_IE_SM_RP_MR(OCT1 ref) := { +template (value) GSUP_IE ts_GSUP_IE_SM_RP_MR(template (value) OCT1 ref) := { tag := OSMO_GSUP_SM_RP_MR_IE, len := 0, /* overwritten */ val := { sm_rp_mr := ref } } -template GSUP_IE tr_GSUP_IE_SM_RP_MR(template OCT1 ref) := { +template (present) GSUP_IE tr_GSUP_IE_SM_RP_MR(template (present) OCT1 ref) := { tag := OSMO_GSUP_SM_RP_MR_IE, len := ?, val := { @@ -854,14 +864,14 @@ } } -template (value) GSUP_IE ts_GSUP_IE_SM_RP_CAUSE(OCT1 cause) := { +template (value) GSUP_IE ts_GSUP_IE_SM_RP_CAUSE(template (value) OCT1 cause) := { tag := OSMO_GSUP_SM_RP_CAUSE_IE, len := 0, /* overwritten */ val := { sm_rp_cause := cause } } -template GSUP_IE tr_GSUP_IE_SM_RP_CAUSE(template OCT1 cause) := { +template (present) GSUP_IE tr_GSUP_IE_SM_RP_CAUSE(template (present) OCT1 cause) := { tag := OSMO_GSUP_SM_RP_CAUSE_IE, len := ?, val := { @@ -869,14 +879,14 @@ } } -template (value) GSUP_IE ts_GSUP_IE_SM_RP_MMS(OCT1 mms) := { +template (value) GSUP_IE ts_GSUP_IE_SM_RP_MMS(template (value) OCT1 mms) := { tag := OSMO_GSUP_SM_RP_MMS_IE, len := 0, /* overwritten */ val := { sm_rp_mms := mms } } -template GSUP_IE tr_GSUP_IE_SM_RP_MMS(template OCT1 mms) := { +template (present) GSUP_IE tr_GSUP_IE_SM_RP_MMS(template (present) OCT1 mms) := { tag := OSMO_GSUP_SM_RP_MMS_IE, len := ?, val := { @@ -884,14 +894,14 @@ } } -template (value) GSUP_IE ts_GSUP_IE_IMEI(hexstring imei) := { +template (value) GSUP_IE ts_GSUP_IE_IMEI(template (value) hexstring imei) := { tag := OSMO_GSUP_IMEI_IE, len := 0, /* overwritten */ val := { imei := ts_GSUP_IMEI(imei) } } -template GSUP_IE tr_GSUP_IE_IMEI(template hexstring imei) := { +template (present) GSUP_IE tr_GSUP_IE_IMEI(template (present) hexstring imei) := { tag := OSMO_GSUP_IMEI_IE, len := ?, val := { @@ -899,14 +909,14 @@ } } -template (value) GSUP_IE ts_GSUP_IE_IMEI_Result(GSUP_IMEIResult result) := { +template (value) GSUP_IE ts_GSUP_IE_IMEI_Result(template (value) GSUP_IMEIResult result) := { tag := OSMO_GSUP_IMEI_RESULT_IE, len := 0, /* overwritten */ val := { imei_result := result } } -template GSUP_IE tr_GSUP_IE_IMEI_Result(template GSUP_IMEIResult result) := { +template (present) GSUP_IE tr_GSUP_IE_IMEI_Result(template (present) GSUP_IMEIResult result) := { tag := OSMO_GSUP_IMEI_RESULT_IE, len := ?, val := { @@ -914,14 +924,14 @@ } } -template (value) GSUP_IE ts_GSUP_IE_NUM_VECTORS_REQ(OCT1 num) := { +template (value) GSUP_IE ts_GSUP_IE_NUM_VECTORS_REQ(template (value) OCT1 num) := { tag := OSMO_GSUP_NUM_VECTORS_REQ_IE, len := 0, /* overwritten */ val := { num_auth_vectors := num } } -template GSUP_IE tr_GSUP_IE_NUM_VECTORS_REQ(template OCT1 num) := { +template (present) GSUP_IE tr_GSUP_IE_NUM_VECTORS_REQ(template (present) OCT1 num) := { tag := OSMO_GSUP_NUM_VECTORS_REQ_IE, len := ?, val := { @@ -996,14 +1006,14 @@ id_enc := omit } -template (value) GSUP_IE ts_GSUP_IE_SM_RP_DA(GSUP_SM_RP_DA val) := { +template (value) GSUP_IE ts_GSUP_IE_SM_RP_DA(template (value) GSUP_SM_RP_DA val) := { tag := OSMO_GSUP_SM_RP_DA_IE, len := 0, /* overwritten */ val := { sm_rp_da := val } } -template GSUP_IE tr_GSUP_IE_SM_RP_DA(template GSUP_SM_RP_DA val) := { +template (present) GSUP_IE tr_GSUP_IE_SM_RP_DA(template (present) GSUP_SM_RP_DA val) := { tag := OSMO_GSUP_SM_RP_DA_IE, len := ?, val := { @@ -1044,14 +1054,14 @@ id_enc := omit } -template (value) GSUP_IE ts_GSUP_IE_SM_RP_OA(GSUP_SM_RP_OA val) := { +template (value) GSUP_IE ts_GSUP_IE_SM_RP_OA(template (value) GSUP_SM_RP_OA val) := { tag := OSMO_GSUP_SM_RP_OA_IE, len := 0, /* overwritten */ val := { sm_rp_oa := val } } -template GSUP_IE tr_GSUP_IE_SM_RP_OA(template GSUP_SM_RP_OA val) := { +template (present) GSUP_IE tr_GSUP_IE_SM_RP_OA(template (present) GSUP_SM_RP_OA val) := { tag := OSMO_GSUP_SM_RP_OA_IE, len := ?, val := { @@ -1060,14 +1070,14 @@ } /* SM-RP-UI represents the SM TPDU, see 7.6.8.4 */ -template (value) GSUP_IE ts_GSUP_IE_SM_RP_UI(octetstring val) := { +template (value) GSUP_IE ts_GSUP_IE_SM_RP_UI(template (value) octetstring val) := { tag := OSMO_GSUP_SM_RP_UI_IE, len := 0, /* overwritten */ val := { sm_rp_ui := val } } -template GSUP_IE tr_GSUP_IE_SM_RP_UI(template octetstring val) := { +template (present) GSUP_IE tr_GSUP_IE_SM_RP_UI(template (present) octetstring val) := { tag := OSMO_GSUP_SM_RP_UI_IE, len := ?, val := { @@ -1076,14 +1086,14 @@ } /* SM Alert Reason IE (used in READY-FOR-SM), see 7.6.8.8 */ -template (value) GSUP_IE ts_GSUP_IE_SM_ALERT_RSN(GSUP_SM_ALERT_RSN_Type rsn) := { +template (value) GSUP_IE ts_GSUP_IE_SM_ALERT_RSN(template (value) GSUP_SM_ALERT_RSN_Type rsn) := { tag := OSMO_GSUP_SM_ALERT_RSN_IE, len := 0, /* overwritten */ val := { sm_alert_rsn := rsn } } -template GSUP_IE tr_GSUP_IE_SM_ALERT_RSN(template GSUP_SM_ALERT_RSN_Type rsn) := { +template (present) GSUP_IE tr_GSUP_IE_SM_ALERT_RSN(template (present) GSUP_SM_ALERT_RSN_Type rsn) := { tag := OSMO_GSUP_SM_ALERT_RSN_IE, len := ?, val := { @@ -1091,14 +1101,14 @@ } } -template (value) GSUP_IE ts_GSUP_IE_SSInfo(octetstring ss) := { +template (value) GSUP_IE ts_GSUP_IE_SSInfo(template (value) octetstring ss) := { tag := OSMO_GSUP_SS_INFO_IE, len := 0, /* overwritten */ val := { ss_info := ss } } -template GSUP_IE tr_GSUP_IE_SSInfo(template octetstring ss) := { +template (present) GSUP_IE tr_GSUP_IE_SSInfo(template (present) octetstring ss) := { tag := OSMO_GSUP_SS_INFO_IE, len := ?, val := { @@ -1106,7 +1116,7 @@ } } -template GSUP_IE tr_GSUP_IE_Message_Class(template GSUP_Message_Class val) := { +template (present) GSUP_IE tr_GSUP_IE_Message_Class(template (present) GSUP_Message_Class val) := { tag := OSMO_GSUP_MESSAGE_CLASS_IE, len := ?, val := { @@ -1114,7 +1124,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_Message_Class(GSUP_Message_Class val) := { +template (value) GSUP_IE ts_GSUP_IE_Message_Class(template (value) GSUP_Message_Class val) := { tag := OSMO_GSUP_MESSAGE_CLASS_IE, len := 0, /* overwritten */ val := { @@ -1122,7 +1132,7 @@ } } -template GSUP_IE tr_GSUP_IE_Source_Name(template octetstring name) := { +template (present) GSUP_IE tr_GSUP_IE_Source_Name(template (present) octetstring name) := { tag := OSMO_GSUP_SOURCE_NAME_IE, len := ?, val := { @@ -1130,7 +1140,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_Source_Name(octetstring name) := { +template (value) GSUP_IE ts_GSUP_IE_Source_Name(template (value) octetstring name) := { tag := OSMO_GSUP_SOURCE_NAME_IE, len := 0, /* overwritten */ val := { @@ -1138,7 +1148,7 @@ } } -template GSUP_IE tr_GSUP_IE_Destination_Name(template octetstring name) := { +template (present) GSUP_IE tr_GSUP_IE_Destination_Name(template (present) octetstring name) := { tag := OSMO_GSUP_DESTINATION_NAME_IE, len := ?, val := { @@ -1146,7 +1156,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_Destination_Name(octetstring name) := { +template (value) GSUP_IE ts_GSUP_IE_Destination_Name(template (value) octetstring name) := { tag := OSMO_GSUP_DESTINATION_NAME_IE, len := 0, /* overwritten */ val := { @@ -1154,7 +1164,7 @@ } } -template GSUP_IE tr_GSUP_IE_AN_APDU(template GSUP_AN_APDU an_apdu) := { +template (present) GSUP_IE tr_GSUP_IE_AN_APDU(template (present) GSUP_AN_APDU an_apdu) := { tag := OSMO_GSUP_AN_APDU_IE, len := ?, val := { @@ -1162,7 +1172,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_AN_APDU(GSUP_AN_APDU an_apdu) := { +template (value) GSUP_IE ts_GSUP_IE_AN_APDU(template (value) GSUP_AN_APDU an_apdu) := { tag := OSMO_GSUP_AN_APDU_IE, len := 0, /* overwritten */ val := { @@ -1177,7 +1187,7 @@ supported_rat_types := ratt } } -template (value) GSUP_IE ts_GSUP_IE_SUPPORTED_RAT_TYPES(GSUP_RatTypes ratt) := { +template (value) GSUP_IE ts_GSUP_IE_SUPPORTED_RAT_TYPES(template (value) GSUP_RatTypes ratt) := { tag := OSMO_GSUP_SUPPORTED_RAT_TYPES_IE, len := 0, /* overwritten */ val := { @@ -1192,7 +1202,7 @@ current_rat_type := ratt } } -template (value) GSUP_IE ts_GSUP_IE_CURRENT_RAT_TYPE(GSUP_RatType ratt) := { +template (value) GSUP_IE ts_GSUP_IE_CURRENT_RAT_TYPE(template (value) GSUP_RatType ratt) := { tag := OSMO_GSUP_CURRENT_RAT_TYPE_IE, len := 0, /* overwritten */ val := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38689?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I67cc555a54113dccb11d0cc05cee66f5c2d795fe Gerrit-Change-Number: 38689 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in pysim[master]: Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for E...

by Jean-Pierre Marcotte

Jean-Pierre Marcotte has posted comments on this change by Jean-Pierre Marcotte. ( https://gerrit.osmocom.org/c/pysim/+/38688?usp=email ) Change subject: Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for EF_OPL and EF_ePDGSelection. ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Pending pyosmocom fix 38687: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plmn_adapter. | https://gerrit.osmocom.org/c/python/pyosmocom/+/38687 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38688?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: Ib2b586cb570dbe74a617c45c0fca276b08bb075e Gerrit-Change-Number: 38688 Gerrit-PatchSet: 1 Gerrit-Owner: Jean-Pierre Marcotte <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 08 Nov 2024 03:48:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[S] Change in ...pyosmocom[master]: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plm...

by Jean-Pierre Marcotte

Jean-Pierre Marcotte has posted comments on this change by Jean-Pierre Marcotte. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email ) Change subject: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plmn_adapter. ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: See 38688: Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for EF_OPL and EF_ePDGSelection. | https://gerrit.osmocom.org/c/pysim/+/38688 -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I3811b227d629bd4e051a480c9622967e31f8a376 Gerrit-Change-Number: 38687 Gerrit-PatchSet: 1 Gerrit-Owner: Jean-Pierre Marcotte <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 08 Nov 2024 03:46:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[S] Change in ...pyosmocom[master]: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plm...

by Jean-Pierre Marcotte

Jean-Pierre Marcotte has posted comments on this change by Jean-Pierre Marcotte. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email ) Change subject: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plmn_adapter. ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: The failing tests are from project (pysim) using pyosmocom. Those test are wrong as 3GPP TS 24.008 states taht the encoding is MCC[2] MCC[1] MNC[3] MCC[3] MNC[2] MNC[1]. -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I3811b227d629bd4e051a480c9622967e31f8a376 Gerrit-Change-Number: 38687 Gerrit-PatchSet: 1 Gerrit-Owner: Jean-Pierre Marcotte <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 08 Nov 2024 03:43:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[XS] Change in pysim[master]: Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for E...

by Jean-Pierre Marcotte

Jean-Pierre Marcotte has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38688?usp=email ) Change subject: Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for EF_OPL and EF_ePDGSelection. ...................................................................... Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for EF_OPL and EF_ePDGSelection. Change-Id: Ib2b586cb570dbe74a617c45c0fca276b08bb075e --- M pySim/ts_31_102.py M pySim/ts_51_011.py 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/88/38688/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 636cf37..4eeacf2 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -875,7 +875,7 @@ class EF_ePDGSelection(TransparentEF): _test_de_encode = [ ( '800600f110000100', {'e_pdg_selection': [{'plmn': '001-01', 'epdg_priority': 1, 'epdg_fqdn_format': 'operator_identified' }] }), - ( '800600011000a001', {'e_pdg_selection': [{'plmn': '001-001', 'epdg_priority': 160, 'epdg_fqdn_format': 'location_based' }] }), + ( '800600110000a001', {'e_pdg_selection': [{'plmn': '001-001', 'epdg_priority': 160, 'epdg_fqdn_format': 'location_based' }] }), ] class ePDGSelection(BER_TLV_IE, tag=0x80): _construct = GreedyRange(Struct('plmn'/PlmnAdapter(Bytes(3)), diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index d28e8ee..eb1984e 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -886,6 +886,8 @@ _test_de_encode = [ ( '62f2100000fffe01', { "lai": { "mcc_mnc": "262-01", "lac_min": "0000", "lac_max": "fffe" }, "pnn_record_id": 1 } ), + ( '216354789abcde12', + { "lai": { "mcc_mnc": "123-456", "lac_min": "789a", "lac_max": "bcde" }, "pnn_record_id": 18 } ), ] def __init__(self, fid='6fc6', sfid=None, name='EF.OPL', rec_len=(8, 8), desc='Operator PLMN List', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=rec_len, **kwargs) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38688?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: Ib2b586cb570dbe74a617c45c0fca276b08bb075e Gerrit-Change-Number: 38688 Gerrit-PatchSet: 1 Gerrit-Owner: Jean-Pierre Marcotte <jean-pierre.marcotte.1(a)ens.etsmtl.ca>

7 months, 2 weeks

1
0
0 0

[S] Change in ...pyosmocom[master]: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plm...

by Jenkins Builder

Jenkins Builder has posted comments on this change by Jean-Pierre Marcotte. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email ) Change subject: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plmn_adapter. ...................................................................... Patch Set 1: (1 comment) File tests/test_construct.py: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-19746): https://gerrit.osmocom.org/c/python/pyosmocom/+/38687/comment/7833ed7d_4a0e… : PS1, Line 115: trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I3811b227d629bd4e051a480c9622967e31f8a376 Gerrit-Change-Number: 38687 Gerrit-PatchSet: 1 Gerrit-Owner: Jean-Pierre Marcotte <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 08 Nov 2024 02:03:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[S] Change in ...pyosmocom[master]: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plm...

by Jean-Pierre Marcotte

Jean-Pierre Marcotte has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email ) Change subject: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plmn_adapter. ...................................................................... Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plmn_adapter. Change-Id: I3811b227d629bd4e051a480c9622967e31f8a376 --- M src/osmocom/construct.py M tests/test_construct.py 2 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/pyosmocom refs/changes/87/38687/1 diff --git a/src/osmocom/construct.py b/src/osmocom/construct.py index 5a78246..d96ab5e 100644 --- a/src/osmocom/construct.py +++ b/src/osmocom/construct.py @@ -268,14 +268,14 @@ if bcd[3] == 'f': return '-'.join([bcd[:3], bcd[4:]]) else: - return '-'.join([bcd[:3], bcd[3:]]) + return '-'.join([bcd[:3], bcd[4:6]+bcd[3]]) def _encode(self, obj, context, path): l = obj.split('-') if len(l[1]) == 2: bcd = l[0] + 'f' + l[1] else: - bcd = l[0] + l[1] + bcd = l[0] + l[1][2] + l[1][0:2] return super()._encode(bcd, context, path) class InvertAdapter(Adapter): diff --git a/tests/test_construct.py b/tests/test_construct.py index ba4f8f4..b069809 100755 --- a/tests/test_construct.py +++ b/tests/test_construct.py @@ -112,6 +112,22 @@ with self.subTest(type='encode', name=exp_dec): re_enc = ad._encode(exp_dec, None, None) self.assertEqual(re_enc, enc) + + def test_plmn_adapter(self): + ad = PlmnAdapter(Bytes(3)) + td = [ + (bytes.fromhex('62f210'),'262-01'), + (bytes.fromhex('21f354'),"123-45"), + (bytes.fromhex('216354'),"123-456"), + (bytes.fromhex('030251'),"302-150") + ] + for enc, exp_dec in td: + with self.subTest(type='decode', name=exp_dec): + dec = ad._decode(enc, None, None) + self.assertEqual(dec, exp_dec) + with self.subTest(type='encode', name=exp_dec): + re_enc = ad._encode(exp_dec, None, None) + self.assertEqual(re_enc, enc) class TestAsn1DerInteger(unittest.TestCase): -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?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: I3811b227d629bd4e051a480c9622967e31f8a376 Gerrit-Change-Number: 38687 Gerrit-PatchSet: 1 Gerrit-Owner: Jean-Pierre Marcotte <jean-pierre.marcotte.1(a)ens.etsmtl.ca>

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024