- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: library/gsup: add src/dst name IEs to all SS templates
by fixeria 30 Oct '24

30 Oct '24

Attention is currently required from: fixeria. Hello Jenkins Builder, 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 (#2). The following approvals got outdated and were removed: 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. Change-Id: I8d947313a99491d2e4790bc06db863fe09d8b5cf --- M library/GSUP_Templates.ttcn 1 file changed, 58 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/38585/2 -- 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/gsup: add src/dst name IE to add SS templates
by fixeria 30 Oct '24

30 Oct '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38585?usp=email ) Change subject: library/gsup: add src/dst name IE to add SS templates ...................................................................... library/gsup: add src/dst name IE to add SS templates This enables us to send/match OSMO_GSUP_{SOURCE,DESTINATION}_NAME IEs (if needed) and brings consistency to all SS related templates. Change-Id: I8d947313a99491d2e4790bc06db863fe09d8b5cf --- M library/GSUP_Templates.ttcn 1 file changed, 58 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/38585/1 diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 9a0805e..0abc489 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -1331,7 +1331,8 @@ template (value) GSUP_SessionState state, template (omit) octetstring ss := omit, template (omit) integer cause := omit, - template (omit) octetstring source_name := omit) + template (omit) octetstring src_name := omit, + template (omit) octetstring dst_name := omit) return template (value) GSUP_IEs { /* Mandatory IEs */ var template (value) GSUP_IEs ies := { @@ -1357,9 +1358,13 @@ idx := idx + 1; } - /* OSMO_GSUP_SOURCE_NAME_IE */ - if (not istemplatekind(source_name, "omit")) { - ies[idx] := ts_GSUP_IE_Source_Name(source_name); + /* OSMO_GSUP_{SOURCE,DESTINATION}_NAME_IE */ + if (not istemplatekind(src_name, "omit")) { + ies[idx] := ts_GSUP_IE_Source_Name(src_name); + idx := idx + 1; + } + if (not istemplatekind(dst_name, "omit")) { + ies[idx] := ts_GSUP_IE_Destination_Name(dst_name); idx := idx + 1; } @@ -1370,7 +1375,8 @@ template (present) GSUP_SessionState state := ?, template octetstring ss := *, template integer cause := *, - template octetstring destination_name := *) + template octetstring src_name := *, + template octetstring dst_name := *) return template GSUP_IEs { /* Mandatory IEs */ var template GSUP_IEs ies := { @@ -1403,13 +1409,19 @@ } /* FIXME: OSMO_GSUP_MESSAGE_CLASS_IE goes here */ - /* TODO: OSMO_GSUP_SOURCE_NAME_IE goes here */ - /* OSMO_GSUP_DESTINATION_NAME_IE */ - if (ispresent(destination_name)) { - ies[idx] := tr_GSUP_IE_Destination_Name(destination_name); + /* OSMO_GSUP_{SOURCE,DESTINATION}_NAME_IE */ + if (ispresent(src_name)) { + ies[idx] := tr_GSUP_IE_Source_Name(src_name); idx := idx + 1; - } else if (istemplatekind(destination_name, "*")) { + } else if (istemplatekind(src_name, "*")) { + ies[idx] := *; + idx := idx + 1; + } + if (ispresent(dst_name)) { + ies[idx] := tr_GSUP_IE_Destination_Name(dst_name); + idx := idx + 1; + } else if (istemplatekind(dst_name, "*")) { ies[idx] := *; idx := idx + 1; } @@ -1427,52 +1439,76 @@ template (value) OCT4 sid, template (value) GSUP_SessionState state, template (omit) octetstring ss := omit, - template (omit) octetstring source_name := omit) := { + template (omit) octetstring src_name := omit, + template (omit) octetstring dst_name := omit) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_REQUEST, - ies := f_gen_ts_ss_ies(imsi, sid, state, ss, source_name := source_name) + ies := f_gen_ts_ss_ies(imsi, sid, state, ss, + src_name := src_name, + dst_name := dst_name) }; template (present) GSUP_PDU tr_GSUP_PROC_SS_REQ(template (present) hexstring imsi, template (present) OCT4 sid := ?, template (present) GSUP_SessionState state := ?, - template octetstring ss := *) := { + template octetstring ss := *, + template octetstring src_name := *, + template octetstring dst_name := *) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_REQUEST, - ies := f_gen_tr_ss_ies(imsi, sid, state, ss) + ies := f_gen_tr_ss_ies(imsi, sid, state, ss, + src_name := src_name, + dst_name := dst_name) }; template (value) GSUP_PDU ts_GSUP_PROC_SS_RES(template (value) hexstring imsi, template (value) OCT4 sid, template (value) GSUP_SessionState state, - template (omit) octetstring ss := omit) := { + template (omit) octetstring ss := omit, + template (omit) octetstring src_name := omit, + template (omit) octetstring dst_name := omit) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_RESULT, - ies := f_gen_ts_ss_ies(imsi, sid, state, ss) + ies := f_gen_ts_ss_ies(imsi, sid, state, ss, + src_name := src_name, + dst_name := dst_name) }; template (present) GSUP_PDU tr_GSUP_PROC_SS_RES(template (present) hexstring imsi, template (present) OCT4 sid := ?, template (present) GSUP_SessionState state := ?, template octetstring ss := *, - template octetstring destination_name := omit) := { + template octetstring src_name := *, + template octetstring dst_name := *) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_RESULT, - ies := f_gen_tr_ss_ies(imsi, sid, state, ss, destination_name := destination_name) + ies := f_gen_tr_ss_ies(imsi, sid, state, ss, + src_name := src_name, + dst_name := dst_name) }; template (value) GSUP_PDU ts_GSUP_PROC_SS_ERR(template (value) hexstring imsi, template (value) OCT4 sid, template (value) GSUP_SessionState state, - template (value) integer cause) := { + template (value) integer cause, + template (omit) octetstring src_name := omit, + template (omit) octetstring dst_name := omit) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_ERROR, - ies := f_gen_ts_ss_ies(imsi, sid, state, cause := cause) + ies := f_gen_ts_ss_ies(imsi, sid, state, + cause := cause, + src_name := src_name, + dst_name := dst_name) }; template (present) GSUP_PDU tr_GSUP_PROC_SS_ERR(template (present) hexstring imsi, template (present) OCT4 sid := ?, template (present) GSUP_SessionState state := ?, - template (present) integer cause := ?) := { + template (present) integer cause := ?, + template octetstring src_name := *, + template octetstring dst_name := *) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_ERROR, - ies := f_gen_tr_ss_ies(imsi, sid, state, cause := cause) + ies := f_gen_tr_ss_ies(imsi, sid, state, + cause := cause, + src_name := src_name, + dst_name := dst_name) }; template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_REQ( -- 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: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8d947313a99491d2e4790bc06db863fe09d8b5cf Gerrit-Change-Number: 38585 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/gsup: improve formatting of SS templates
by fixeria 30 Oct '24

30 Oct '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38583?usp=email ) Change subject: library/gsup: improve formatting of SS templates ...................................................................... library/gsup: improve formatting of SS templates Change-Id: I27aa67ded044a4a5362795bb791d883c4af55cd9 --- M library/GSUP_Templates.ttcn 1 file changed, 74 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/38583/1 diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 403af74..21805cb 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -1200,14 +1200,14 @@ } private function f_gen_ts_ies(hexstring imsi, - template (omit) boolean pdp_info_compl := omit, - template (omit) GSUP_Message_Class message_class := omit, - template (omit) hexstring imei := omit, - template (omit) PCO_DATA pco := omit, - template (omit) GSUP_CnDomain dom := omit, - template (omit) octetstring source_name := omit, - template (omit) octetstring destination_name := omit - ) return GSUP_IEs { + template (omit) boolean pdp_info_compl := omit, + template (omit) GSUP_Message_Class message_class := omit, + template (omit) hexstring imei := omit, + template (omit) PCO_DATA pco := omit, + template (omit) GSUP_CnDomain dom := omit, + template (omit) octetstring source_name := omit, + template (omit) octetstring destination_name := omit) +return GSUP_IEs { var GSUP_IEs ies := { valueof(ts_GSUP_IE_IMSI(imsi)) }; @@ -1254,8 +1254,8 @@ template PCO_DATA pco := omit, template GSUP_CnDomain cn_domain := omit, template octetstring source_name := omit, - template octetstring destination_name := omit - ) return template GSUP_IEs { + template octetstring destination_name := omit) +return template GSUP_IEs { var template GSUP_IEs ies := { tr_GSUP_IE_IMSI(imsi) }; @@ -1326,14 +1326,13 @@ return ies; } -private function f_gen_ts_ss_ies( - hexstring imsi, - OCT4 sid, - GSUP_SessionState state, - template (omit) octetstring ss := omit, - template (omit) integer cause := omit, - template octetstring source_name := omit -) return GSUP_IEs { +private function f_gen_ts_ss_ies(hexstring imsi, + OCT4 sid, + GSUP_SessionState state, + template (omit) octetstring ss := omit, + template (omit) integer cause := omit, + template octetstring source_name := omit) +return GSUP_IEs { /* Mandatory IEs */ var GSUP_IEs ies := { valueof(ts_GSUP_IE_IMSI(imsi)) @@ -1359,14 +1358,13 @@ return ies; } -private function f_gen_tr_ss_ies( - template hexstring imsi, - template OCT4 sid := ?, - template GSUP_SessionState state := ?, - template octetstring ss := omit, - template integer cause := omit, - template octetstring destination_name := omit -) return template GSUP_IEs { +private function f_gen_tr_ss_ies(template hexstring imsi, + template OCT4 sid := ?, + template GSUP_SessionState state := ?, + template octetstring ss := omit, + template integer cause := omit, + template octetstring destination_name := omit) +return template GSUP_IEs { /* Mandatory IEs */ var template GSUP_IEs ies := { tr_GSUP_IE_IMSI(imsi) @@ -1409,64 +1407,58 @@ return (ies, ies2); } -template (value) GSUP_PDU ts_GSUP_PROC_SS_REQ( - hexstring imsi, - OCT4 sid, - GSUP_SessionState state, - template (omit) octetstring ss := omit, - template (omit) octetstring source_name := omit -) := ts_GSUP( - OSMO_GSUP_MSGT_PROC_SS_REQUEST, - f_gen_ts_ss_ies(imsi, sid, state, ss, source_name := source_name) -); -template GSUP_PDU tr_GSUP_PROC_SS_REQ( - template hexstring imsi, - template OCT4 sid := ?, - template GSUP_SessionState state := ?, - template octetstring ss := * -) := tr_GSUP( - OSMO_GSUP_MSGT_PROC_SS_REQUEST, - f_gen_tr_ss_ies(imsi, sid, state, ss) -); +template (value) GSUP_PDU +ts_GSUP_PROC_SS_REQ(hexstring imsi, + OCT4 sid, + GSUP_SessionState state, + template (omit) octetstring ss := omit, + template (omit) octetstring source_name := omit) := { + msg_type := OSMO_GSUP_MSGT_PROC_SS_REQUEST, + ies := f_gen_ts_ss_ies(imsi, sid, state, ss, source_name := source_name) +}; +template GSUP_PDU +tr_GSUP_PROC_SS_REQ(template hexstring imsi, + template OCT4 sid := ?, + template GSUP_SessionState state := ?, + template octetstring ss := *) := { + msg_type := OSMO_GSUP_MSGT_PROC_SS_REQUEST, + ies := f_gen_tr_ss_ies(imsi, sid, state, ss) +}; -template (value) GSUP_PDU ts_GSUP_PROC_SS_RES( - hexstring imsi, - OCT4 sid, - GSUP_SessionState state, - template (omit) octetstring ss := omit -) := ts_GSUP( - OSMO_GSUP_MSGT_PROC_SS_RESULT, - f_gen_ts_ss_ies(imsi, sid, state, ss) -); -template GSUP_PDU tr_GSUP_PROC_SS_RES( - template hexstring imsi, - template OCT4 sid := ?, - template GSUP_SessionState state := ?, - template octetstring ss := *, - template octetstring destination_name := omit -) := tr_GSUP( - OSMO_GSUP_MSGT_PROC_SS_RESULT, - f_gen_tr_ss_ies(imsi, sid, state, ss, destination_name := destination_name) -); +template (value) GSUP_PDU +ts_GSUP_PROC_SS_RES(hexstring imsi, + OCT4 sid, + GSUP_SessionState state, + template (omit) octetstring ss := omit) := { + msg_type := OSMO_GSUP_MSGT_PROC_SS_RESULT, + ies := f_gen_ts_ss_ies(imsi, sid, state, ss) +}; +template GSUP_PDU +tr_GSUP_PROC_SS_RES(template hexstring imsi, + template OCT4 sid := ?, + template GSUP_SessionState state := ?, + template octetstring ss := *, + template octetstring destination_name := omit) := { + msg_type := OSMO_GSUP_MSGT_PROC_SS_RESULT, + ies := f_gen_tr_ss_ies(imsi, sid, state, ss, destination_name := destination_name) +}; -template (value) GSUP_PDU ts_GSUP_PROC_SS_ERR( - hexstring imsi, - OCT4 sid, - GSUP_SessionState state, - integer cause -) := ts_GSUP( - OSMO_GSUP_MSGT_PROC_SS_ERROR, - f_gen_ts_ss_ies(imsi, sid, state, cause := cause) -); -template GSUP_PDU tr_GSUP_PROC_SS_ERR( - template hexstring imsi, - template OCT4 sid := ?, - template GSUP_SessionState state := ?, - template integer cause := ? -) := tr_GSUP( - OSMO_GSUP_MSGT_PROC_SS_ERROR, - f_gen_tr_ss_ies(imsi, sid, state, cause := cause) -); +template (value) GSUP_PDU +ts_GSUP_PROC_SS_ERR(hexstring imsi, + OCT4 sid, + GSUP_SessionState state, + integer cause) := { + msg_type := OSMO_GSUP_MSGT_PROC_SS_ERROR, + ies := f_gen_ts_ss_ies(imsi, sid, state, cause := cause) +}; +template GSUP_PDU +tr_GSUP_PROC_SS_ERR(template hexstring imsi, + template OCT4 sid := ?, + template GSUP_SessionState state := ?, + template integer cause := ?) := { + msg_type := OSMO_GSUP_MSGT_PROC_SS_ERROR, + ies := f_gen_tr_ss_ies(imsi, sid, state, cause := cause) +}; template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_REQ( hexstring imsi, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38583?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: I27aa67ded044a4a5362795bb791d883c4af55cd9 Gerrit-Change-Number: 38583 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: library/gsup: fix wrong IE order in f_gen_tr_ss_ies
by fixeria 30 Oct '24

30 Oct '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38586?usp=email ) Change subject: library/gsup: fix wrong IE order in f_gen_tr_ss_ies ...................................................................... library/gsup: fix wrong IE order in f_gen_tr_ss_ies libosmocore's GSUP encoder puts the OSMO_GSUP_MESSAGE_CLASS_IE before OSMO_GSUP_{SOURCE,DESTINATION}_NAME_IE, not after. We use 'record of' in GSUP_Types, so the order does matter. Change-Id: I5aafbc885d3b78fd37f84feebf5dab1255d51eb1 --- M library/GSUP_Templates.ttcn 1 file changed, 4 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/38586/1 diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 0abc489..bf189e1 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -1408,7 +1408,9 @@ idx := idx + 1; } - /* FIXME: OSMO_GSUP_MESSAGE_CLASS_IE goes here */ + /* OSMO_GSUP_MESSAGE_CLASS_IE (may or may not be present) */ + ies[idx] := *; + idx := idx + 1; /* OSMO_GSUP_{SOURCE,DESTINATION}_NAME_IE */ if (ispresent(src_name)) { @@ -1426,12 +1428,7 @@ idx := idx + 1; } - /* the GSUP Message Class IE is optional, as old implementations don't have it yet */ - var template GSUP_IEs ies2 := ies; - ies2[idx] := tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_USSD); - idx := idx + 1; - - return (ies, ies2); + return ies; } template (value) GSUP_PDU -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38586?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: I5aafbc885d3b78fd37f84feebf5dab1255d51eb1 Gerrit-Change-Number: 38586 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

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

30 Oct '24

fixeria has uploaded this change for review. ( 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 ...................................................................... library/gsup: rework f_gen_{tr,ts}_ss_ies() and SS templates * Add missing param restrictions to SS related templates. * f_gen_{tr,ts}_ss_ies(): proper template param restrictions. * f_gen_ts_ss_ies(): return a template, not a value. * f_gen_ts_ss_ies(): append IEs using list index. * f_gen_ts_ss_ies(): isvalue() -> istemplatekind() to allow passing template lists. * f_gen_tr_ss_ies(): istemplatekind() -> ispresent() to allow passing template lists. * f_gen_tr_ss_ies(): 'omit' -> '*' for optional params. 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. We still do not expect that IE, but now we put '*' in place of the Destination Name IE by default, which matches it. A follow-up commit will add support fot the Destination Name IE. Change-Id: Ia611ffa3845d48c5553c70f10981aa029d00d873 --- M library/GSUP_Templates.ttcn 1 file changed, 93 insertions(+), 78 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/38584/1 diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 21805cb..9a0805e 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -640,7 +640,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 := { @@ -648,7 +648,7 @@ } } -template GSUP_IE tr_GSUP_IE_Cause(template integer cause) := { +template GSUP_IE tr_GSUP_IE_Cause(template (present) integer cause) := { tag := OSMO_GSUP_CAUSE_IE, len := ?, val := { @@ -808,14 +808,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 GSUP_IE tr_GSUP_IE_SessionId(template (present) OCT4 sid) := { tag := OSMO_GSUP_SESSION_ID_IE, len := ?, val := { @@ -823,14 +823,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 GSUP_IE tr_GSUP_IE_SessionState(template (present) GSUP_SessionState state) := { tag := OSMO_GSUP_SESSION_STATE_IE, len := ?, val := { @@ -1090,14 +1090,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 GSUP_IE tr_GSUP_IE_SSInfo(template (present) octetstring ss) := { tag := OSMO_GSUP_SS_INFO_IE, len := ?, val := { @@ -1105,7 +1105,7 @@ } } -template GSUP_IE tr_GSUP_IE_Message_Class(template GSUP_Message_Class val) := { +template GSUP_IE tr_GSUP_IE_Message_Class(template (present) GSUP_Message_Class val) := { tag := OSMO_GSUP_MESSAGE_CLASS_IE, len := ?, val := { @@ -1113,7 +1113,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 := { @@ -1121,7 +1121,7 @@ } } -template GSUP_IE tr_GSUP_IE_Source_Name(template octetstring name) := { +template GSUP_IE tr_GSUP_IE_Source_Name(template (present) octetstring name) := { tag := OSMO_GSUP_SOURCE_NAME_IE, len := ?, val := { @@ -1129,7 +1129,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 := { @@ -1137,7 +1137,7 @@ } } -template GSUP_IE tr_GSUP_IE_Destination_Name(template octetstring name) := { +template GSUP_IE tr_GSUP_IE_Destination_Name(template (present) octetstring name) := { tag := OSMO_GSUP_DESTINATION_NAME_IE, len := ?, val := { @@ -1145,7 +1145,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 := { @@ -1326,77 +1326,92 @@ return ies; } -private function f_gen_ts_ss_ies(hexstring imsi, - OCT4 sid, - GSUP_SessionState state, +private function f_gen_ts_ss_ies(template (value) hexstring imsi, + template (value) OCT4 sid, + template (value) GSUP_SessionState state, template (omit) octetstring ss := omit, template (omit) integer cause := omit, - template octetstring source_name := omit) -return GSUP_IEs { + template (omit) octetstring source_name := omit) +return template (value) GSUP_IEs { /* Mandatory IEs */ - var GSUP_IEs ies := { - valueof(ts_GSUP_IE_IMSI(imsi)) + var template (value) GSUP_IEs ies := { + ts_GSUP_IE_IMSI(imsi) }; + var integer idx := lengthof(ies); - /* Cause IE is needed for PROC_SS_ERR */ - if (isvalue(cause)) { - ies := ies & { valueof(ts_GSUP_IE_Cause(valueof(cause))) }; + /* OSMO_GSUP_CAUSE_IE (needed for PROC_SS_ERR) */ + if (not istemplatekind(cause, "omit")) { + ies[idx] := ts_GSUP_IE_Cause(cause); + idx := idx + 1; } - /* Mandatory session IEs */ - ies := ies & { valueof(ts_GSUP_IE_SessionId(sid)) }; - ies := ies & { valueof(ts_GSUP_IE_SessionState(state)) }; + /* OSMO_GSUP_SESSION_{ID,STATE}_IE */ + ies[idx] := ts_GSUP_IE_SessionId(sid); + idx := idx + 1; + ies[idx] := ts_GSUP_IE_SessionState(state); + idx := idx + 1; - /* Optional SS payload */ - if (isvalue(ss)) { - ies := ies & { valueof(ts_GSUP_IE_SSInfo(valueof(ss))) }; + /* OSMO_GSUP_SS_INFO_IE */ + if (not istemplatekind(ss, "omit")) { + ies[idx] := ts_GSUP_IE_SSInfo(ss); + idx := idx + 1; } - if (isvalue(source_name)) { - ies := ies & { valueof(ts_GSUP_IE_Source_Name(valueof(source_name))) }; + /* OSMO_GSUP_SOURCE_NAME_IE */ + if (not istemplatekind(source_name, "omit")) { + ies[idx] := ts_GSUP_IE_Source_Name(source_name); + idx := idx + 1; } return ies; } -private function f_gen_tr_ss_ies(template hexstring imsi, - template OCT4 sid := ?, - template GSUP_SessionState state := ?, - template octetstring ss := omit, - template integer cause := omit, - template octetstring destination_name := omit) +private function f_gen_tr_ss_ies(template (present) hexstring imsi, + template (present) OCT4 sid := ?, + template (present) GSUP_SessionState state := ?, + template octetstring ss := *, + template integer cause := *, + template octetstring destination_name := *) return template GSUP_IEs { /* Mandatory IEs */ var template GSUP_IEs ies := { tr_GSUP_IE_IMSI(imsi) }; - var integer idx := 1; + var integer idx := lengthof(ies); - /* Cause IE is needed for PROC_SS_ERR */ - if (istemplatekind(cause, "*")) { - ies[idx] := *; - idx := idx + 1; - } else if (not istemplatekind(cause, "omit")) { + /* OSMO_GSUP_CAUSE_IE (needed for PROC_SS_ERR) */ + if (ispresent(cause)) { ies[idx] := tr_GSUP_IE_Cause(cause); idx := idx + 1; - } - - /* Mandatory session IEs */ - ies[idx] := tr_GSUP_IE_SessionId(sid); - ies[idx + 1] := tr_GSUP_IE_SessionState(state); - idx := idx + 2; - - /* Optional SS payload */ - if (istemplatekind(ss, "*")) { + } else if (istemplatekind(cause, "*")) { ies[idx] := *; idx := idx + 1; - } else if (not istemplatekind(ss, "omit")) { + } + + /* OSMO_GSUP_SESSION_{ID,STATE}_IE */ + ies[idx] := tr_GSUP_IE_SessionId(sid); + idx := idx + 1; + ies[idx] := tr_GSUP_IE_SessionState(state); + idx := idx + 1; + + /* OSMO_GSUP_SS_INFO_IE */ + if (ispresent(ss)) { ies[idx] := tr_GSUP_IE_SSInfo(ss); idx := idx + 1; + } else if (istemplatekind(ss, "*")) { + ies[idx] := *; + idx := idx + 1; } - if (isvalue(destination_name)) { + /* FIXME: OSMO_GSUP_MESSAGE_CLASS_IE goes here */ + /* TODO: OSMO_GSUP_SOURCE_NAME_IE goes here */ + + /* OSMO_GSUP_DESTINATION_NAME_IE */ + if (ispresent(destination_name)) { ies[idx] := tr_GSUP_IE_Destination_Name(destination_name); idx := idx + 1; + } else if (istemplatekind(destination_name, "*")) { + ies[idx] := *; + idx := idx + 1; } /* the GSUP Message Class IE is optional, as old implementations don't have it yet */ @@ -1408,35 +1423,35 @@ } template (value) GSUP_PDU -ts_GSUP_PROC_SS_REQ(hexstring imsi, - OCT4 sid, - GSUP_SessionState state, +ts_GSUP_PROC_SS_REQ(template (value) hexstring imsi, + template (value) OCT4 sid, + template (value) GSUP_SessionState state, template (omit) octetstring ss := omit, template (omit) octetstring source_name := omit) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_REQUEST, ies := f_gen_ts_ss_ies(imsi, sid, state, ss, source_name := source_name) }; -template GSUP_PDU -tr_GSUP_PROC_SS_REQ(template hexstring imsi, - template OCT4 sid := ?, - template GSUP_SessionState state := ?, +template (present) GSUP_PDU +tr_GSUP_PROC_SS_REQ(template (present) hexstring imsi, + template (present) OCT4 sid := ?, + template (present) GSUP_SessionState state := ?, template octetstring ss := *) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_REQUEST, ies := f_gen_tr_ss_ies(imsi, sid, state, ss) }; template (value) GSUP_PDU -ts_GSUP_PROC_SS_RES(hexstring imsi, - OCT4 sid, - GSUP_SessionState state, +ts_GSUP_PROC_SS_RES(template (value) hexstring imsi, + template (value) OCT4 sid, + template (value) GSUP_SessionState state, template (omit) octetstring ss := omit) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_RESULT, ies := f_gen_ts_ss_ies(imsi, sid, state, ss) }; -template GSUP_PDU -tr_GSUP_PROC_SS_RES(template hexstring imsi, - template OCT4 sid := ?, - template GSUP_SessionState state := ?, +template (present) GSUP_PDU +tr_GSUP_PROC_SS_RES(template (present) hexstring imsi, + template (present) OCT4 sid := ?, + template (present) GSUP_SessionState state := ?, template octetstring ss := *, template octetstring destination_name := omit) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_RESULT, @@ -1444,18 +1459,18 @@ }; template (value) GSUP_PDU -ts_GSUP_PROC_SS_ERR(hexstring imsi, - OCT4 sid, - GSUP_SessionState state, - integer cause) := { +ts_GSUP_PROC_SS_ERR(template (value) hexstring imsi, + template (value) OCT4 sid, + template (value) GSUP_SessionState state, + template (value) integer cause) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_ERROR, ies := f_gen_ts_ss_ies(imsi, sid, state, cause := cause) }; -template GSUP_PDU -tr_GSUP_PROC_SS_ERR(template hexstring imsi, - template OCT4 sid := ?, - template GSUP_SessionState state := ?, - template integer cause := ?) := { +template (present) GSUP_PDU +tr_GSUP_PROC_SS_ERR(template (present) hexstring imsi, + template (present) OCT4 sid := ?, + template (present) GSUP_SessionState state := ?, + template (present) integer cause := ?) := { msg_type := OSMO_GSUP_MSGT_PROC_SS_ERROR, ies := f_gen_tr_ss_ies(imsi, sid, state, cause := cause) }; -- 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: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia611ffa3845d48c5553c70f10981aa029d00d873 Gerrit-Change-Number: 38584 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: testenv: set MTU=1500 for lo
by pespin 30 Oct '24

30 Oct '24

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38546?usp=email ) Change subject: bsc: testenv: set MTU=1500 for lo ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > I've spent a lot more time analyzing it and made an upstream bug report: […] My opinion on setting MTU=1500 is that we may want to have that *on all tests* to resemble a more usual scenario, not to workaround any sort of bug we could most probably debug and fix. Hence, I'd say if we want to set MTU 1500 we do it automatically for all testsuites being run. If others believe different they are welcome to provide feedback and give +1 to merge this patch as is now. Also I can also look further at the bug maybe in a few weeks when I get some higher prio stuff done. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38546?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: Ifeda66954263fe8d2637377d0701a2208a19c332 Gerrit-Change-Number: 38546 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Oct 2024 18:44:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-hnbgw[master]: Fix SCCP RLSD not sent upon rx RUA Disconnect due to error condition
by pespin 30 Oct '24

30 Oct '24

Attention is currently required from: daniel, fixeria, lynxis lazus, neels, pespin. Hello Jenkins Builder, daniel, fixeria, lynxis lazus, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38581?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: Fix SCCP RLSD not sent upon rx RUA Disconnect due to error condition ...................................................................... Fix SCCP RLSD not sent upon rx RUA Disconnect due to error condition Scenario: HNB tears down the RUA/Iu conn by first sending RUA_DATA[RANAP IuReleaseReq], followed shortly by a RUA Disconnect with no RANAP and Cause!=Normal. HNBGW should release the SCCP connection through RLSD since it's impossible to terminate the Iu connection in a normal condition. Validated with TTCN-3 HNBGW_Tests.TC_cs_iu_release_req_rua_disconnect. Related: osmo-ttcn3-hacks.git Change-Id I6782920c4a86d3311eb54239ab13a18e393c1ec0 Related: SYS#6602 Change-Id: I1b7f72034eaf40bfa60d552d434847467ac4e97a --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c 3 files changed, 62 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/81/38581/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1b7f72034eaf40bfa60d552d434847467ac4e97a Gerrit-Change-Number: 38581 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-hnbgw[master]: Fix SCCP RLSD not sent upon rx RUA Disconnect due to error condition
by fixeria 30 Oct '24

30 Oct '24

Attention is currently required from: daniel, lynxis lazus, neels, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38581?usp=email ) Change subject: Fix SCCP RLSD not sent upon rx RUA Disconnect due to error condition ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmo-hnbgw/context_map_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/38581/comment/d1eb63b2_5af3ff3b?u… : PS2, Line 294: the typo: there's -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1b7f72034eaf40bfa60d552d434847467ac4e97a Gerrit-Change-Number: 38581 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 30 Oct 2024 17:28:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: run podman command with logfile
by pespin 30 Oct '24

30 Oct '24

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38580?usp=email ) Change subject: testenv: run podman command with logfile ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38580?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: Ife3c0ae559c94f7df8b5912bb0e338ae6283cb7f Gerrit-Change-Number: 38580 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Oct 2024 17:04:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-iuh[master]: ranap: Add API to encode Reset Resource into msgb
by pespin 30 Oct '24

30 Oct '24

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/38569?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ranap: Add API to encode Reset Resource into msgb ...................................................................... ranap: Add API to encode Reset Resource into msgb Related: SYS#6602 Change-Id: I5e7b647dee2887d9af7dc22bc9f46f499f676e01 --- M TODO-RELEASE M include/osmocom/ranap/ranap_msg_factory.h M src/ranap_msg_factory.c 3 files changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/69/38569/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/38569?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5e7b647dee2887d9af7dc22bc9f46f499f676e01 Gerrit-Change-Number: 38569 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log