October 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-gprs[master]: sm_ms_fsm: fix double timer_cb assignment
by pespin 17 Oct '23

17 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34777?usp=email ) Change subject: sm_ms_fsm: fix double timer_cb assignment ...................................................................... sm_ms_fsm: fix double timer_cb assignment sm_ms_fsm.c:287:14: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides] .timer_cb = sm_ms_fsm_timer_cb, ^~~~~~~~~~~~~~~~~~ sm_ms_fsm.c:284:14: note: previous initialization is here .timer_cb = sm_ms_fsm_timer_cb, ^~~~~~~~~~~~~~~~~~ Change-Id: Ic1bffe410a4ce5ddafe740185a5a894e056d7879 --- M src/sm/sm_ms_fsm.c 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sm/sm_ms_fsm.c b/src/sm/sm_ms_fsm.c index dc063b9..8d994eb 100644 --- a/src/sm/sm_ms_fsm.c +++ b/src/sm/sm_ms_fsm.c @@ -281,7 +281,6 @@ .name = "SM_MS", .states = sm_ms_fsm_states, .num_states = ARRAY_SIZE(sm_ms_fsm_states), - .timer_cb = sm_ms_fsm_timer_cb, .event_names = sm_ms_fsm_event_names, .log_subsys = DLGLOBAL, /* updated dynamically through gprs_sm_ms_fsm_set_log_cat() */ .timer_cb = sm_ms_fsm_timer_cb, -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic1bffe410a4ce5ddafe740185a5a894e056d7879 Gerrit-Change-Number: 34777 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-gprs[master]: sm_ms_fsm: fix double timer_cb assignment
by pespin 17 Oct '23

17 Oct '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34777?usp=email ) Change subject: sm_ms_fsm: fix double timer_cb assignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic1bffe410a4ce5ddafe740185a5a894e056d7879 Gerrit-Change-Number: 34777 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Oct 2023 08:30:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3182_timeout
by pespin 17 Oct '23

17 Oct '23

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34771?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria Change subject: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3182_timeout ...................................................................... rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3182_timeout Test test_ul_tbf_t3182_timeout needs to be modified in order to avoid triggering T3180 once it is implemented in a follow-up patch. Both T3180 and T3182 are armed at the same time, so modify the scenario to really scenify the case where T3182 matters: the MS keeps receiving USF indications but the PCU doesn't see them and hence never sends a PKT UL ACK/NACK acking the last block. Related: OS#6209 Change-Id: I73b648bc04d863b9eb67093e5fa510ba88d712c8 --- M tests/rlcmac/rlcmac_prim_test.c M tests/rlcmac/rlcmac_prim_test.ok 2 files changed, 42 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/71/34771/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I73b648bc04d863b9eb67093e5fa510ba88d712c8 Gerrit-Change-Number: 34771 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmo-gprs[master]: rlcmac: ul_tbf: Implement T3180
by fixeria 17 Oct '23

17 Oct '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34773?usp=email ) Change subject: rlcmac: ul_tbf: Implement T3180 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34773?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I350b277532d36ed7928b33ee3b77d98d083a3179 Gerrit-Change-Number: 34773 Gerrit-PatchSet: 1 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: Tue, 17 Oct 2023 01:43:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-gprs[master]: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout
by fixeria 17 Oct '23

17 Oct '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34772?usp=email ) Change subject: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ib84ccfd89773913703e0ab3e09d0ce9eb123e994 Gerrit-Change-Number: 34772 Gerrit-PatchSet: 1 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: Tue, 17 Oct 2023 01:42:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t31...
by fixeria 17 Oct '23

17 Oct '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34771?usp=email ) Change subject: rlcmac: rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3182_timeout ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-gprs/+/34771/comment/24c9645a_c20e748b PS1, Line 7: rlcmac: rlcmac `rlcmac` twice -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I73b648bc04d863b9eb67093e5fa510ba88d712c8 Gerrit-Change-Number: 34771 Gerrit-PatchSet: 1 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: Tue, 17 Oct 2023 01:41:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: Avoid re-arming T3182 in TBF Acknowledged mode
by fixeria 17 Oct '23

17 Oct '23

Attention is currently required from: Hoernchen, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34770?usp=email ) Change subject: rlcmac: Avoid re-arming T3182 in TBF Acknowledged mode ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I532def7f87367b446b5370daf8c81f511e26eb5f Gerrit-Change-Number: 34770 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Oct 2023 01:39:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: sm_ms_fsm: fix double timer_cb assignment
by fixeria 17 Oct '23

17 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34777?usp=email ) Change subject: sm_ms_fsm: fix double timer_cb assignment ...................................................................... sm_ms_fsm: fix double timer_cb assignment sm_ms_fsm.c:287:14: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides] .timer_cb = sm_ms_fsm_timer_cb, ^~~~~~~~~~~~~~~~~~ sm_ms_fsm.c:284:14: note: previous initialization is here .timer_cb = sm_ms_fsm_timer_cb, ^~~~~~~~~~~~~~~~~~ Change-Id: Ic1bffe410a4ce5ddafe740185a5a894e056d7879 --- M src/sm/sm_ms_fsm.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/77/34777/1 diff --git a/src/sm/sm_ms_fsm.c b/src/sm/sm_ms_fsm.c index dc063b9..8d994eb 100644 --- a/src/sm/sm_ms_fsm.c +++ b/src/sm/sm_ms_fsm.c @@ -281,7 +281,6 @@ .name = "SM_MS", .states = sm_ms_fsm_states, .num_states = ARRAY_SIZE(sm_ms_fsm_states), - .timer_cb = sm_ms_fsm_timer_cb, .event_names = sm_ms_fsm_event_names, .log_subsys = DLGLOBAL, /* updated dynamically through gprs_sm_ms_fsm_set_log_cat() */ .timer_cb = sm_ms_fsm_timer_cb, -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic1bffe410a4ce5ddafe740185a5a894e056d7879 Gerrit-Change-Number: 34777 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G() and sub...
by pespin 16 Oct '23

16 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34774?usp=email ) Change subject: library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G() and subfields ...................................................................... library/GSUP: Add tr templates for tr_GSUP_IE_AuthTuple2G3G() and subfields Change-Id: I39babec53f89c11b9a822939af7267aa1111dc8b --- M library/GSUP_Types.ttcn 1 file changed, 81 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/34774/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 818f830..d874862 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -379,6 +379,29 @@ } } +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 := ?) := { + tag := OSMO_GSUP_AUTH_TUPLE_IE, + len := ?, + val := { + auth_tuple := { + tr_GSUP_IE_RAND(rand), + tr_GSUP_IE_SRES(sres), + tr_GSUP_IE_Kc(kc), + tr_GSUP_IE_IK(ik), + tr_GSUP_IE_CK(ck), + tr_GSUP_IE_AUTN(autn), + tr_GSUP_IE_RES(res) + } + } +} + template GSUP_IE ts_GSUP_IE_AuthTuple2G3G(octetstring rand, octetstring sres, octetstring kc, octetstring ik, octetstring ck, octetstring autn, @@ -721,7 +744,7 @@ } } -template GSUP_IE tr_GSUP_IE_RAND(template octetstring rand) := { +template GSUP_IE tr_GSUP_IE_RAND(template octetstring rand := ?) := { tag := OSMO_GSUP_RAND_IE, len := ?, val := { @@ -729,6 +752,14 @@ } } +template (present) GSUP_IE tr_GSUP_IE_SRES(template (present) octetstring sres := ?) := { + tag := OSMO_GSUP_SRES_IE, + len := ?, + val := { + sres := sres + } +} + template (value) GSUP_IE ts_GSUP_IE_SRES(octetstring sres) := { tag := OSMO_GSUP_SRES_IE, len := 0, /* overwritten */ @@ -737,6 +768,14 @@ } } +template (present) GSUP_IE tr_GSUP_IE_Kc(template (present) octetstring kc := ?) := { + tag := OSMO_GSUP_KC_IE, + len := ?, + val := { + kc := kc + } +} + template (value) GSUP_IE ts_GSUP_IE_Kc(octetstring kc) := { tag := OSMO_GSUP_KC_IE, len := 0, /* overwritten */ @@ -745,6 +784,14 @@ } } +template (present) GSUP_IE tr_GSUP_IE_IK(template (present) octetstring ik := ?) := { + tag := OSMO_GSUP_IK_IE, + len := ?, + val := { + ik := ik + } +} + template (value) GSUP_IE ts_GSUP_IE_IK(octetstring ik) := { tag := OSMO_GSUP_IK_IE, len := 0, /* overwritten */ @@ -753,6 +800,14 @@ } } +template (present) GSUP_IE tr_GSUP_IE_CK(template (present) octetstring ck := ?) := { + tag := OSMO_GSUP_CK_IE, + len := ?, + val := { + ck := ck + } +} + template (value) GSUP_IE ts_GSUP_IE_CK(octetstring ck) := { tag := OSMO_GSUP_CK_IE, len := 0, /* overwritten */ @@ -761,6 +816,14 @@ } } +template (present) GSUP_IE tr_GSUP_IE_AUTN(template (present) octetstring autn := ?) := { + tag := OSMO_GSUP_AUTN_IE, + len := ?, + val := { + autn := autn + } +} + template (value) GSUP_IE ts_GSUP_IE_AUTN(octetstring autn) := { tag := OSMO_GSUP_AUTN_IE, len := 0, /* overwritten */ @@ -769,6 +832,14 @@ } } +template (present) GSUP_IE tr_GSUP_IE_RES(template (present) octetstring res := ?) := { + tag := OSMO_GSUP_RES_IE, + len := ?, + val := { + res := res + } +} + template (value) GSUP_IE ts_GSUP_IE_RES(octetstring res) := { tag := OSMO_GSUP_RES_IE, len := 0, /* overwritten */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34774?usp=email 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: I39babec53f89c11b9a822939af7267aa1111dc8b Gerrit-Change-Number: 34774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Add several AVPs required for SWx interface
by pespin 16 Oct '23

16 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34776?usp=email ) Change subject: library/DIAMETER: Add several AVPs required for SWx interface ...................................................................... library/DIAMETER: Add several AVPs required for SWx interface Those are required/used in SWx interface (3GPP TS 29.273), but are specified on other documents. Related: OS#6204 Change-Id: If31e14215fc7fb18cef12d68600b4f170bbb68af --- M library/DIAMETER_Templates.ttcn 1 file changed, 199 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/34776/1 diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index b6723e7..bbf3cff 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -400,6 +400,44 @@ } } +private function enum2int_Vendor_Id_tmpl(template Vendor_Id inp) return template integer +{ + if (istemplatekind(inp, "omit")) { + return omit; + } else if (istemplatekind(inp, "*")) { + return *; + } else if (istemplatekind(inp, "?")) { + return ?; + } else { + return enum2int(valueof(inp)); + } +} + +template (present) GenericAVP tr_AVP_VendorSpecAppId(template (present) Vendor_Id vendor_id := ?, + template (present) uint32_t auth_app_id := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Specific_Application_Id), + avp_data := { + avp_BASE_NONE_Vendor_Specific_Application_Id := { + { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Id), + avp_data := { + avp_BASE_NONE_Vendor_Id := int2oct_tmpl(enum2int_Vendor_Id_tmpl(vendor_id), 4) + } + } + }, { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Application_Id), + avp_data := { + avp_BASE_NONE_Auth_Application_Id := int2oct_tmpl(auth_app_id, 4) + } + } + } + } + } + } +} template (value) GenericAVP ts_AVP_VendorSpecAppId(Vendor_Id vendor_id, uint32_t auth_app_id) := { avp := { avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Vendor_Specific_Application_Id), @@ -2069,4 +2107,152 @@ } } + +/***************************** + * Cx, Dx, 3GPP TS 29.229 + *****************************/ +/* SIP-Auth-Data-Item, 3GPP TS 29.229 6.3.8 */ +template (present) GenericAVP tr_AVP_3GPP_SIPNumAuthDataItems(template (present) uint32_t num := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Number_Auth_Items), + avp_data := { + avp_CxDx_3GPP_SIP_Number_Auth_Items := int2oct_tmpl(num, 4) /* CxDx_3GPP_SIP_Number_Auth_Items */ + } + } +} +template (value) GenericAVP ts_AVP_3GPP_SIPNumAuthDataItems(uint32_t num) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Number_Auth_Items), + avp_data := { + avp_CxDx_3GPP_SIP_Number_Auth_Items := int2oct(num, 4) /* CxDx_3GPP_SIP_Number_Auth_Items */ + } + } +} + +/* SIP-Authentication-Scheme, 3GPP TS 29.229 6.3.9 */ +template (present) GenericAVP tr_AVP_3GPP_SIPAuthScheme(template (present) CxDx_3GPP_SIP_Authentication_Scheme scheme := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authentication_Scheme), + avp_data := { + avp_CxDx_3GPP_SIP_Authentication_Scheme := scheme + } + } +} +template (value) GenericAVP ts_AVP_3GPP_SIPAuthScheme(template (value) CxDx_3GPP_SIP_Authentication_Scheme scheme) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authentication_Scheme), + avp_data := { + avp_CxDx_3GPP_SIP_Authentication_Scheme := scheme + } + } +} + +/* SIP-Authenticate, 3GPP TS 29.229 6.3.10 */ +template (present) GenericAVP tr_AVP_3GPP_SIPAuthenticate(template (present) CxDx_3GPP_SIP_Authenticate rand_autn_concatenated := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authenticate), + avp_data := { + avp_CxDx_3GPP_SIP_Authenticate := rand_autn_concatenated + } + } +} +template (value) GenericAVP ts_AVP_3GPP_SIPAuthenticate(template (value) CxDx_3GPP_SIP_Authenticate rand_autn_concatenated) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authenticate), + avp_data := { + avp_CxDx_3GPP_SIP_Authenticate := rand_autn_concatenated + } + } +} + +/* SIP-Authorization, 3GPP TS 29.229 6.3.11 */ +template (present) GenericAVP tr_AVP_3GPP_SIPAuthorization(template (present) CxDx_3GPP_SIP_Authorization rand_autn_concatenated := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authorization), + avp_data := { + avp_CxDx_3GPP_SIP_Authorization := rand_autn_concatenated + } + } +} +template (value) GenericAVP ts_AVP_3GPP_SIPAuthorization(template (value) CxDx_3GPP_SIP_Authorization rand_autn_concatenated) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authorization), + avp_data := { + avp_CxDx_3GPP_SIP_Authorization := rand_autn_concatenated + } + } +} + +/* SIP-Authentication-Context, 3GPP TS 29.229 6.3.12 */ +template (present) GenericAVP tr_AVP_3GPP_SIPAuthContext(template (present) CxDx_3GPP_SIP_Authentication_Context val := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authentication_Context), + avp_data := { + avp_CxDx_3GPP_SIP_Authentication_Context := val + } + } +} +template (value) GenericAVP ts_AVP_3GPP_SIPAuthContext(template (value) CxDx_3GPP_SIP_Authentication_Context val) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Authentication_Context), + avp_data := { + avp_CxDx_3GPP_SIP_Authentication_Context := val + } + } +} + +/* SIP-Item-Number, 3GPP TS 29.229 6.3.14 */ +template (present) GenericAVP tr_AVP_3GPP_SIPItemNumber(template (present) uint32_t num := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Item_Number), + avp_data := { + avp_CxDx_3GPP_SIP_Item_Number := int2oct_tmpl(num, 4) /* CxDx_3GPP_SIP_Item_Number */ + } + } +} +template (value) GenericAVP ts_AVP_3GPP_SIPItemNumber(uint32_t num) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_SIP_Item_Number), + avp_data := { + avp_CxDx_3GPP_SIP_Item_Number := int2oct(num, 4) /* CxDx_3GPP_SIP_Item_Number */ + } + } +} + +/* Confidentiality-Key, 3GPP TS 29.229 6.3.27 */ +template (present) GenericAVP tr_AVP_3GPP_ConfidentialityKey(template (present) CxDx_3GPP_Confidentiality_Key ckey := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Confidentiality_Key), + avp_data := { + avp_CxDx_3GPP_Confidentiality_Key := ckey + } + } +} +template (value) GenericAVP ts_AVP_3GPP_ConfidentialityKey(template (value) CxDx_3GPP_Confidentiality_Key ckey) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Confidentiality_Key), + avp_data := { + avp_CxDx_3GPP_Confidentiality_Key := ckey + } + } +} + +/* Inegrity-Key, 3GPP TS 29.229 6.3.28 */ +template (present) GenericAVP tr_AVP_3GPP_IntegrityKey(template (present) CxDx_3GPP_Integrity_Key ckey := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Integrity_Key), + avp_data := { + avp_CxDx_3GPP_Integrity_Key := ckey + } + } +} +template (value) GenericAVP ts_AVP_3GPP_IntegrityKey(template (value) CxDx_3GPP_Integrity_Key ckey) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Integrity_Key), + avp_data := { + avp_CxDx_3GPP_Integrity_Key := ckey + } + } +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34776?usp=email 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: If31e14215fc7fb18cef12d68600b4f170bbb68af Gerrit-Change-Number: 34776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0