[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email ) Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE .. Patch Set 3: (2 comments) File library/GTPv1C_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601/comment/5bde6f36_cfa65846 PS3, Line 473: lengthf := ?, /* overwritten */ These overwritten stuff doesn't make much sense here, should be dropped. File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601/comment/64d89e44_b2e05cbc PS3, Line 3765: pdp_ctx.pdp_typeorg := apars.addr.pdpTypeOrg; All these should be passed in tr_PDP_Context_GTPC. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?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: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 22:35:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?usp=email ) Change subject: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?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: Ie68794c309e548279381d044a3e34dcdf405084f Gerrit-Change-Number: 36600 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 22:31:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: fixeria, osmith.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email )
Change subject: sgsn: add testcases for SGSN Context Request procedure
..
Patch Set 2:
(2 comments)
File sgsn/SGSN_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/fd99ae9e_6aff6fd3
PS2, Line 3807: log("Rx SGSN Context Request from SGSN: ",
gtpc_ud.gtpc);
This log is most probably not needed, only polluting output.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/5090ea49_347399de
PS2, Line 3852: log("Rx SGSN Context ACK from SGSN: ",
gtpc_ud.gtpc);
same, not needed.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c
Gerrit-Change-Number: 36589
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: osmith
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Thu, 18 Apr 2024 22:28:31 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
Attention is currently required from: fixeria.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36599?usp=email )
Change subject: library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
..
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36599?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: Ic8abb048f7c1fa795ee472820c5b88de0073dc66
Gerrit-Change-Number: 36599
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Thu, 18 Apr 2024 22:24:47 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?usp=email ) Change subject: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?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: I9b0c948f295fd73fad79c8d09b45fd992c90a015 Gerrit-Change-Number: 36598 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 22:24:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE .. sgsn: TC_sgsn_context_req_in: match PDP Context IE Change-Id: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 87 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/36601/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?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: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
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/+/36600?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: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs .. sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs Change-Id: Ie68794c309e548279381d044a3e34dcdf405084f Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 55 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/36600/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?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: Ie68794c309e548279381d044a3e34dcdf405084f Gerrit-Change-Number: 36600 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?usp=email ) Change subject: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact .. Patch Set 1: (1 comment) File library/GTPv1C_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598/comment/b6034b8b_b9d0f2dc PS1, Line 1353: cause := GTP_CAUSE_REQUEST_ACCEPTED Note it's the default value here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?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: I9b0c948f295fd73fad79c8d09b45fd992c90a015 Gerrit-Change-Number: 36598 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 20:53:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email ) Change subject: sgsn: add testcases for SGSN Context Request procedure .. Patch Set 2: (3 comments) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/127b479d_9cdf6fa3 PS1, Line 3772: Contect > Context Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/2a90776b_d051ec7d PS1, Line 3814: Contect > Context Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/ab469934_806e1b52 PS1, Line 3950: execute( TC_sgsn_context_req_in() ); > Ah indeed, there's no RAT type being sent in there, good point. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c Gerrit-Change-Number: 36589 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 20:52:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?usp=email )
Change subject: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
..
sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
Change-Id: Ie68794c309e548279381d044a3e34dcdf405084f
Related: SYS#6603, OS#6294
---
M library/GTPv1C_Templates.ttcn
M sgsn/SGSN_Tests.ttcn
2 files changed, 55 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/00/36600/1
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 0907c5e..2eb1d7e 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -341,7 +341,8 @@
/* 7.7.28 MM Context */
template (value) MM_Context ts_MM_ContextGSM(template (value) OCT8 kc,
template (value) BIT3 cksn
:= '000'B,
-template (value) BIT3 gea
:= '000'B) := {
+template (value) BIT3 gea
:= '000'B,
+template (value)
octetstring triplet := ''O) := {
type_gtpc := '81'O,
context := {
mmcontGSM := {
@@ -352,7 +353,7 @@
noofVectors := 0, /* overwritten */
security := '01'B, /* GSM key and triplets */
kc := kc,
- triplet := ''O,
+ triplet := triplet,
drx_par := ''O,
msNetW_cap_length := 0, /* overwritten */
msNetw_cap := omit,
@@ -363,6 +364,32 @@
}
}
}
+ template (present) MM_Context tr_MM_ContextGSM(template (present) OCT8
kc := ?,
+ template (present) BIT3
cksn := ?,
+ template (present) BIT3
gea := ?,
+ template (present)
octetstring triplet := ?) := {
+ type_gtpc := '81'O,
+ context := {
+ mmcontGSM := {
+ lengthf := ?,
+ cksn := cksn,
+ spare := ?,
+ usedCipher := gea,
+ noofVectors := ?,
+ security := '01'B, /* GSM key and triplets */
+ kc := kc,
+ triplet := triplet,
+ drx_par := ?,
+ msNetW_cap_length := ?,
+ msNetw_cap := *,
+ containerLength := ?,
+ container := *,
+ access_restriction_data_length := ?,
+ access_restriction_data := *
+ }
+ }
+ }
+
template (value) MM_Context ts_MM_ContextUMTS(template (value) OCT16 ck,
template (value) OCT16
ik) := {
type_gtpc := '81'O,
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 08ae9bc..da1511b 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -3757,7 +3757,22 @@
var template (present) GTPC_PDUs ctx_rsp;
ctx_rsp := tr_SGSNContextRespPDU(cause := GTP_CAUSE_REQUEST_ACCEPTED,
imsi := g_pars.imsi);
- /* TODO: match MM/PDP Context, GSN Address */
+
+ /* SGSN Address for Control Plane */
+ var octetstring sgsn_addr := f_inet_addr(mp_sgsn_gtp_ip);
+ ctx_rsp.sgsn_ContextResponse.sgsn_addr_controlPlane :=
tr_GsnAddr(mp_sgsn_gtp_ip);
+
+ /* Match MM Context */
+ if (ispresent(g_pars.vec)) {
+ /* XXX: this is only valid for GERAN */
+ var octetstring triplet := g_pars.vec.rand & g_pars.vec.sres &
g_pars.vec.kc;
+ ctx_rsp.sgsn_ContextResponse.mm_Context := tr_MM_ContextGSM(kc
:= g_pars.vec.kc,
+
triplet := triplet);
+ /* TODO: 7.5.4 "The IMEISV shall, if available, be included in
the MM Context".
+* See also 3GPP TS 29.060, section 7.7.28 and Table 47A */
+ }
+
+ /* TODO: match PDP Context */
T.start(2.0);
alt {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project:
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?usp=email )
Change subject: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
..
library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
Change-Id: I9b0c948f295fd73fad79c8d09b45fd992c90a015
---
M library/GTPv1C_Templates.ttcn
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/98/36598/1
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index dcb8e60..0dc30be 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -1360,8 +1360,9 @@
private_extension_gtpc := omit
}
}
+
template (value) Gtp1cUnitdata ts_GTPC_SGSNContextAck(Gtp1cPeer peer,
OCT4 teid, uint16_t seq,
- template (value)
GTPC_PDUs SGSNContextAckPDU :=
ts_SGSNContextAckPDU(GTP_CAUSE_REQUEST_ACCEPTED)) := {
+ template (value)
GTPC_PDUs SGSNContextAckPDU := ts_SGSNContextAckPDU) := {
peer := peer,
gtpc := ts_GTP1C_PDU(sgsnContextAcknowledge, teid,
valueof(SGSNContextAckPDU), seq)
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?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: I9b0c948f295fd73fad79c8d09b45fd992c90a015
Gerrit-Change-Number: 36598
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36599?usp=email )
Change subject: library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
..
library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
Set the values according to 3GPP TS 29.060 version 17.4.0 Release 17.
* Field 'spare' is defined as 'Spare ' in Table 40 (missing '1').
* Field 'spare1' is defined as 'Spare 111' in Table 41.
* Field 'security' must be set as per Table 47.
Change-Id: Ic8abb048f7c1fa795ee472820c5b88de0073dc66
Fixes: f95460b55 "GTP_Templates: Add templates for some GTPv1C IEs"
Fixes: fdde16846 "library: GTPv1C add ts_MM_ContextGSM"
---
M library/GTPv1C_Templates.ttcn
1 file changed, 22 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/99/36599/1
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 0dc30be..e9cf797 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -346,10 +346,10 @@
mmcontGSM := {
lengthf := 0, /* overwritten */
cksn := cksn,
- spare := '0'B,
+ spare := '1'B,
usedCipher := gea,
- noofVectors := 0,
- security := '00'B, /* XXX */
+ noofVectors := 0, /* overwritten */
+ security := '01'B, /* GSM key and triplets */
kc := kc,
triplet := ''O,
drx_par := ''O,
@@ -372,9 +372,9 @@
usedGPRSIntegrityAlgorithm := '000'B,
ugipai := '1'B, /* Integrity Protection not
required */
gupii := '1'B, /* Ignore "Used GPRS integrity
protection algorithm" field" */
- spare1 := '000'B,
+ spare1 := '111'B,
noofVectors := 0, /* TODO: fill quintpuplets*/
- security := '01'B, /* UMTS key and quintuplets
*/
+ security := '10'B, /* UMTS key and quintuplets
*/
ck := ck,
ik := ik,
quintupletlength := 0, /* overwritten */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36599?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: Ic8abb048f7c1fa795ee472820c5b88de0073dc66
Gerrit-Change-Number: 36599
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email )
Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE
..
sgsn: TC_sgsn_context_req_in: match PDP Context IE
Change-Id: I965c0200ea380c55dc0cd8d3f8e5110883ce2646
Related: SYS#6603, OS#6294
---
M library/GTPv1C_Templates.ttcn
M sgsn/SGSN_Tests.ttcn
2 files changed, 82 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/01/36601/1
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 2eb1d7e..ecc84ad 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -464,6 +464,51 @@
pdp_addresslength2 := omit,
pdp_Address2 := omit
}
+ template (present) PDP_Context_GTPC tr_PDP_Context_GTPC(template
(present) octetstring pdp_addr := ?,
+ template
(present) octetstring ggsn_gsn_addr := ?,
+ template
(present) octetstring apn := ?,
+ template
(present) OCT4 ggsn_teic := ?,
+ template
(present) OCT4 ggsn_teid := ?) := {
+ type_gtpc := '82'O,
+ lengthf := ?, /* overwritten */
+ nsapi := ?,
+ order := ?,
+ asi := ?,
+ vaa := ?,
+ ea := ?,
+ sapi := ?,
+ spare1 := ?,
+ qos_subLength := ?, /* overwritten */
+ qos_sub := ?,
+ qos_reqLength := ?, /* overwritten */
+ qos_req := ?,
+ qos_negLength := ?, /* overwritten */
+ qos_neg := ?,
+ snd := ?,
+ snu := ?,
+ sendNPDUnum := ?,
+ receiveNPDUnum := ?,
+ uteidControlPlane := ggsn_teic,
+ uteidData1 := ggsn_teid,
+ pdpcontext := ?,
+ pdp_typeorg := ?,
+ spare2 := ?,
+ pdp_typenum := ?,
+ pdp_addressLength := ?, /* overwritten */
+ pdp_address := pdp_addr,
+ ggsn_addressControlPlaneLength := ?, /* overwritten */
+ ggsn_addressControlPlane := ggsn_gsn_addr,
+ ggsn_addressUserPlaneLength := ?, /* overwritten */
+ ggsn_addressUserPlane := ggsn_gsn_addr,
+ apnLength := ?, /* overwritten */
+ apn := apn,
+ transactionId := ?,
+ spare3 := ?,
+ transactionID_cont := ?,
+ pdp_typenum2 := *,
+ pdp_addresslength2 := *,
+ pdp_Address2 := *
+ }
/* template matching reception of GTP-C unit-data */
@@ -1280,7 +1325,9 @@
/* SGSN Context Response - 7.5.4 */
template (present) GTPC_PDUs tr_SGSNContextRespPDU(template (present)
GTP_Cause cause := ?,
- template hexstring
imsi := *) := {
+ template hexstring
imsi := *,
+ template MM_Context
mm_context := *,
+ template
PDP_Context_GTPC_List pdp_ctx_list := *) := {
sgsn_ContextResponse := {
cause := tr_Cause_gtpc(cause),
imsi := f_tr_Imsi(imsi),
@@ -1290,8 +1337,8 @@
radioPriority := *,
packetFlowID := *,
charging_char := *,
- mm_Context := *,
- pdp_Context := *,
+ mm_Context := mm_context,
+ pdp_Context := pdp_ctx_list,
sgsn_addr_controlPlane := *,
pdpContextPriorization := *,
radioPriority_LCS := *,
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index da1511b..6d7079e 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -3730,6 +3730,7 @@
/* SGSN terminated SGSN Context Request procedure (we request, SGSN responds)
* 3GPP TS 23.401, Figure D.3.6-1: "Gn/Gp SGSN to MME Tracking Area Update
procedure" */
private function f_TC_sgsn_context_req_in(charstring id) runs on
BSSGP_ConnHdlr {
+ var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip));
var integer seq_nr := f_rnd_int(65535);
var Gtp1cUnitdata gtpc_ud;
timer T;
@@ -3742,6 +3743,8 @@
/* The MS attaches to GERAN/UTRAN and enjoys the service */
f_gmm_attach(false, false);
+ /* The MS activates a PDP context */
+ f_pdp_ctx_act(apars);
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: sgsn: add testcases for SGSN Context Request procedure .. sgsn: add testcases for SGSN Context Request procedure Change-Id: If71de10897a8a9f6612cd46c760cd89c0299ac2c Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 170 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/36589/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c Gerrit-Change-Number: 36589 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Make tag collisions harder
Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36597?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: SIP_Templates: Make tag collisions harder .. SIP_Templates: Make tag collisions harder It was spotted during some test runs that the same tag was assigned to 2 different components. Let's make this way more difficult by adding some time to it. Asterisk uses longer strings for instance, since 32bits is the minimum. Change-Id: Iba26259fd48da1c2558451fe5f7014151d4935c8 --- M asterisk/gen_links.sh M asterisk/regen_makefile.sh M library/SIP_Templates.ttcn M sip/gen_links.sh M sip/regen_makefile.sh 5 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/36597/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36597?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: Iba26259fd48da1c2558451fe5f7014151d4935c8 Gerrit-Change-Number: 36597 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email )
Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
..
ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Recent commits applied changes to the default scenario, but forgot to
apply them to the 'with-pfcp' subdir.
Fixes: 6de89a5fb529928ce9b7b3320e0ca2e3e568d458
Fixes: 3736d31fc0314cb5d39c707374eecdcfe33241c9
Fixes: 0bdbcd6815358a7b1c4b0bb4575a585c45a01e57
Fixes: 2c22a96355b8e057dbd85ac1922ae84cc63f8b1e
Fixes: d3711e67103691171d7ed3e224c050e78c1f5bc4
Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264
---
M ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
2 files changed, 35 insertions(+), 4 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
index 16173de..ac6141f 100644
--- a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
@@ -11,11 +11,13 @@
[TESTPORT_PARAMETERS]
*.HNBGWVTY.CTRL_HOSTNAME := "172.18.35.20"
+*.STATSVTY.CTRL_HOSTNAME := "172.18.35.20"
[MODULE_PARAMETERS]
HNBGW_Tests.mp_hnodeb_ip := "172.18.35.203";
HNBGW_Tests.mp_hnbgw_ip := "172.18.35.20";
HNBGW_Tests.mp_mgw_ip := "172.18.35.203";
+HNBGW_Tests.mp_local_statsd_ip := "172.18.35.203";
HNBGW_Tests.mp_cn_cfg := {
{
transport := RANAP_TRANSPORT_IuCS,
@@ -114,6 +116,8 @@
HNBGW_Tests.mp_pfcp_ip_local := "172.18.35.203";
HNBGW_Tests.mp_pfcp_ip_remote := "172.18.35.20";
HNBGW_Tests.mp_validate_talloc_asn1 := true;
+# keep in sync with osmo-hnbgw.cfg "timer hnbgw x31":
+HNBGW_Tests.mp_hnbgw_timer_x31 := 5;
[MAIN_CONTROLLER]
diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
index d10ea6d..50ac7bf 100644
--- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
@@ -8,7 +8,7 @@
!
log stderr
logging filter all 1
- logging color 0
+ logging color 1
logging print category-hex 0
logging print category 1
logging print level 1
@@ -19,10 +19,20 @@
!
line vty
no login
- bind 0.0.0.0
+ bind 172.18.35.20
ctrl
- bind 0.0.0.0
+ bind 172.18.35.20
!
+stats interval 0
+stats reporter statsd
+ prefix TTCN3
+ level subscriber
+ remote-ip 172.18.35.203
+ remote-port 8125
+ flush-period 1
+ mtu 1024
+ enable
+
cs7 instance 0
asp asp-clnt-msc-0 2905 2905 m3ua
local-ip 172.18.35.20
@@ -68,7 +78,7 @@
local-ip 172.18.35.20
local-port 29169
hnbap-allow-tmsi 1
- mgcp
+ mgw 0
mgw local-ip 172.18.35.20
mgw remote-ip 172.18.35.203
# don't spam RANAP RESET messages for up to eight CN links across all tests
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264
Gerrit-Change-Number: 36590
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: neels
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Attention is currently required from: daniel, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email ) Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 18 Apr 2024 18:07:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for...
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email ) Change subject: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for new API param .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a Gerrit-Change-Number: 36576 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 18:05:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email )
Change subject: cbsp_link.c: Update somo_stream read_cb2 functions to
accommodate for new API param
..
cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for new API
param
libosmo-netif (not yet released) stream_{cli,srv} osmo_io read_cb API was
updated to provide read result status. Hence, now API users
can account for lower layer errors and act properly, like it used to
do with the previous ofd backend.
This commit partially reverts some error code paths removed in
85687bf176e4b9663f2396a27c28b49221c72fa3 when converting code to use
osmo_io osmo_stream backend.
Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a
Depends: libosmo-netif.git Change-Id I395c75ff1e9904757ce1d767a9ac2f779593c4c8
---
M src/osmo-bsc/cbsp_link.c
1 file changed, 54 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c
index 98f25d3..9e17ef3 100644
--- a/src/osmo-bsc/cbsp_link.c
+++ b/src/osmo-bsc/cbsp_link.c
@@ -62,11 +62,28 @@
return 0;
}
-static int cbsp_srv_read_cb(struct osmo_stream_srv *conn, struct msgb *msg)
+static int cbsp_srv_read_cb(struct osmo_stream_srv *conn, int res, struct msgb
*msg)
{
struct bsc_cbc_link *cbc = osmo_stream_srv_get_data(conn);
struct osmo_cbsp_decoded *decoded;
+ if (res <= 0) {
+ if (res == -EAGAIN || res == -EINTR) {
+ msgb_free(msg);
+ return 0;
+ }
+ /*
+ if (rc == -EPIPE || rc == -ECONNRESET) {
+ // lost connection
+ } else if (rc == 0) {
+ // connection closed
+ } */
+ msgb_free(msg);
+ osmo_stream_srv_destroy(conn);
+ cbc->server.srv = NULL;
+ return -EBADF;
+ }
+
OSMO_ASSERT(msg);
decoded = osmo_cbsp_decode(conn, msg);
if (decoded) {
@@ -148,11 +165,27 @@
return 0;
}
-static int cbsp_client_read_cb(struct osmo_stream_cli *cli, struct msgb *msg)
+static int cbsp_client_read_cb(struct osmo_stream_cli *cli, int res, struct
msgb *msg)
{
struct bsc_cbc_link *cbc = osmo_stream_cli_get_data(cli);
struct osmo_cbsp_decoded *decoded;
+ if (res <= 0) {
+ if (res == -EAGAIN || res == -EINTR) {
+ msgb_free(msg);
+ return 0;
+ }
+ /*
+ if (rc == -EPIPE || rc == -ECONNRESET) {
+ // lost connection
+ } else if (rc == 0) {
+ // connection closed
+ } */
+ msgb_free(msg);
+ osmo_stream_cli_reconnect(cli);
+ return -EBADF;
+ }
+
OSMO_ASSERT(msg);
decoded = osmo_cbsp_decode(cli, msg);
if (decoded) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a
Gerrit-Change-Number: 36576
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-bsc[master]: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for...
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email ) Change subject: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for new API param .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a Gerrit-Change-Number: 36576 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 18:05:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for...
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email ) Change subject: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for new API param .. Patch Set 2: (1 comment) Patchset: PS2: It seems I somehow forgot to push the new version of the patch here in gerrit. I'm merging it now in order to avoid build failures. Please give it a review and if something's wrong I can fix it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a Gerrit-Change-Number: 36576 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 18:04:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[XL] Change in osmo-ttcn3-hacks[master]: asterisk: Split SIPConnHdlr to its own file
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?usp=email ) Change subject: asterisk: Split SIPConnHdlr to its own file .. Patch Set 3: Code-Review+2 (1 comment) File asterisk/SIP_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596/comment/1cc172a9_f30df66c PS2, Line 707: } > `No newline at end of right file. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?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: I168920887bfd05c0a1785c5cb7ac485edaef0df2 Gerrit-Change-Number: 36596 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 17:57:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[XL] Change in osmo-ttcn3-hacks[master]: asterisk: Split SIPConnHdlr to its own file
Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Code-Review+2 by pespin, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: asterisk: Split SIPConnHdlr to its own file .. asterisk: Split SIPConnHdlr to its own file Change-Id: I168920887bfd05c0a1785c5cb7ac485edaef0df2 --- M asterisk/Asterisk_Tests.ttcn A asterisk/SIP_ConnectionHandler.ttcn 2 files changed, 741 insertions(+), 691 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/36596/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?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: I168920887bfd05c0a1785c5cb7ac485edaef0df2 Gerrit-Change-Number: 36596 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for...
Attention is currently required from: fixeria, osmith, pespin.
Hello Jenkins Builder, fixeria, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified-1 by Jenkins Builder
Change subject: cbsp_link.c: Update somo_stream read_cb2 functions to
accommodate for new API param
..
cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for new API
param
libosmo-netif (not yet released) stream_{cli,srv} osmo_io read_cb API was
updated to provide read result status. Hence, now API users
can account for lower layer errors and act properly, like it used to
do with the previous ofd backend.
This commit partially reverts some error code paths removed in
85687bf176e4b9663f2396a27c28b49221c72fa3 when converting code to use
osmo_io osmo_stream backend.
Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a
Depends: libosmo-netif.git Change-Id I395c75ff1e9904757ce1d767a9ac2f779593c4c8
---
M src/osmo-bsc/cbsp_link.c
1 file changed, 54 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/36576/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a
Gerrit-Change-Number: 36576
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Attention: osmith
Gerrit-Attention: fixeria
Gerrit-Attention: pespin
Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Make tag collisions harder
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36597?usp=email )
Change subject: SIP_Templates: Make tag collisions harder
..
SIP_Templates: Make tag collisions harder
It was spotted during some test runs that the same tag was assigned to 2
different components. Let's make this way more difficult by adding some
time to it. Asterisk uses longer strings for instance, since 32bits is
the minimum.
Change-Id: Iba26259fd48da1c2558451fe5f7014151d4935c8
---
M asterisk/SIP_ConnectionHandler.ttcn
M asterisk/gen_links.sh
M asterisk/regen_makefile.sh
M library/SIP_Templates.ttcn
4 files changed, 22 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/97/36597/1
diff --git a/asterisk/SIP_ConnectionHandler.ttcn
b/asterisk/SIP_ConnectionHandler.ttcn
index 77ebebb..13b5f04 100644
--- a/asterisk/SIP_ConnectionHandler.ttcn
+++ b/asterisk/SIP_ConnectionHandler.ttcn
@@ -704,4 +704,4 @@
[fail_others] as_SIP_fail_req(sip_expect_str);
}
-}
\ No newline at end of file
+}
diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh
index 97df3a2..c342e51 100755
--- a/asterisk/gen_links.sh
+++ b/asterisk/gen_links.sh
@@ -7,6 +7,7 @@
DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src
FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn
TCCConversion.cc TCCInterface.cc TCCInterface_ip.h "
FILES+="TCCOpenSecurity_Functions.ttcn TCCOpenSecurity.cc
TCCOpenSecurity_Functions.hh "
+FILES+="TCCDateTime.cc TCCDateTime_Functions.ttcn"
gen_links $DIR $FILES
DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src
diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh
index 1aa18ae..5d5538e 100755
--- a/asterisk/regen_makefile.sh
+++ b/asterisk/regen_makefile.sh
@@ -15,6 +15,7 @@
TCCConversion.cc
TCCInterface.cc
TCCOpenSecurity.cc
+ TCCDateTime.cc
TELNETasp_PT.cc
"
diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn
index be07196..e115bb7 100644
--- a/library/SIP_Templates.ttcn
+++ b/library/SIP_Templates.ttcn
@@ -3,6 +3,7 @@
import from SIPmsg_Types all;
import from TCCConversion_Functions all;
import from TCCOpenSecurity_Functions all;
+import from TCCDateTime_Functions all;
import from Native_Functions all;
import from Osmocom_Types all;
import from Misc_Helpers all;
@@ -1151,10 +1152,12 @@
req.msgHeader.cSeq.seqNumber :=
f_sip_next_seq_nr(valueof(req.msgHeader.cSeq.seqNumber));
}
-/* Tags shall have at least 32 bit of randomness */
function f_sip_rand_tag() return charstring {
+ /* Tags shall have at least 32 bit of randomness */
var integer rnd_int := f_rnd_int(4294967296);
- return hex2str(int2hex(rnd_int, 8));
+ /* Make collisions harder by appending time to the final string: */
+ var integer ts_int := f_time_ms() mod 4294967296;
+ return hex2str(int2hex(rnd_int, 8)) & "-" & hex2str(int2hex(ts_int, 8));
}
/* Generate a "branch" tag value.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36597?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: Iba26259fd48da1c2558451fe5f7014151d4935c8
Gerrit-Change-Number: 36597
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[XL] Change in osmo-ttcn3-hacks[master]: asterisk: Split SIPConnHdlr to its own file
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?usp=email ) Change subject: asterisk: Split SIPConnHdlr to its own file .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?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: I168920887bfd05c0a1785c5cb7ac485edaef0df2 Gerrit-Change-Number: 36596 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 17:46:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email )
Change subject: ss7_asp: Update osmo_stream read_cb2 functions to accommodate
for new API param
..
ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new API param
libosmo-netif (not yet released) stream_{cli,srv} osmo_io read_cb API was
updated to provide read result status. Hence, now API users (ss7_asp)
can account for lower layer errors and act properly, like it used to
do with the previous ofd backend.
This commit partially reverts some error code paths removed in
9257cd896e255403822bee6f87f5487a92fd3c11 when converting code to use
osmo_io osmo_stream backend.
Change-Id: I579f4101a9e2874e310ff78e4571f38cfe8dfab0
Depends: libosmo-netif.git Change-Id I395c75ff1e9904757ce1d767a9ac2f779593c4c8
---
M src/osmo_ss7_asp.c
M src/ss7_internal.h
2 files changed, 79 insertions(+), 15 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
jolly: Looks good to me, but someone else must approve
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 1ce159a..9bb4b40 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -602,9 +602,9 @@
talloc_free(asp);
}
-static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg);
-static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg);
-static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, struct msgb
*msg);
+static int xua_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb
*msg);
+static int ipa_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb
*msg);
+static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, int res, struct
msgb *msg);
static int xua_cli_connect_cb(struct osmo_stream_cli *cli);
static int xua_cli_close_and_reconnect(struct osmo_stream_cli *cli);
@@ -796,10 +796,20 @@
}
/* netif code tells us we can read something from the socket */
-int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg)
+int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct
msgb *msg)
{
struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn);
+ if (res <= 0) {
+ if (res == -EAGAIN) {
+ msgb_free(msg);
+ return 0;
+ }
+ msgb_free(msg);
+ osmo_stream_srv_destroy(conn);
+ return res;
+ }
+
msg->dst = asp;
rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
/* we simply use the lower 4 bits of the asp_id, which is initialized
to a pseudo-random value upon
@@ -808,7 +818,7 @@
}
/* netif code tells us we can read something from the socket */
-int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg)
+int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct
msgb *msg)
{
struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn);
unsigned int ppid;
@@ -834,7 +844,13 @@
default:
break;
}
- goto out;
+ msgb_free(msg);
+ return 0;
+ }
+ if (res <= 0) {
+ msgb_free(msg);
+ osmo_stream_srv_destroy(conn);
+ return rc;
}
ppid = msgb_sctp_ppid(msg);
@@ -848,7 +864,6 @@
else
rc = ss7_asp_rx_unknown(asp, ppid, msg);
-out:
msgb_free(msg);
return rc;
}
@@ -868,12 +883,22 @@
}
/* netif code tells us we can read something from the socket */
-int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb
*msg)
+int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res,
struct msgb *msg)
{
struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn);
const struct xua_common_hdr *hdr;
int rc;
+ if (res <= 0) {
+ if (res == -EAGAIN) {
+ msgb_free(msg);
+ return 0;
+ }
+ msgb_free(msg);
+ osmo_stream_srv_destroy(conn);
+ return res;
+ }
+
msg->dst = asp;
rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL);
@@ -953,11 +978,21 @@
}
/* read call-back for IPA/SCCPlite socket */
-static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg)
+static int ipa_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb
*msg)
{
int fd = osmo_stream_cli_get_fd(conn);
struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn);
+ if (res <= 0) {
+ if (res == -EAGAIN) {
+ msgb_free(msg);
+ return 0;
+ }
+ msgb_free(msg);
+
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email ) Change subject: Asterisk: Initial AMI support .. Patch Set 2: (1 comment) File asterisk/AMI_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594/comment/eb4276c1_c703068e PS2, Line 109: var integer pos := f_strstr(str, ": ", 0); > Damn, I am late to the party :( I'll have a look tomorrow, thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee Gerrit-Change-Number: 36594 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 17:39:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[XL] Change in osmo-ttcn3-hacks[master]: asterisk: Split SIPConnHdlr to its own file
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?usp=email ) Change subject: asterisk: Split SIPConnHdlr to its own file .. Patch Set 2: Code-Review+1 (1 comment) File asterisk/SIP_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596/comment/de90ac34_91ef5b88 PS2, Line 707: } `No newline at end of right file.` -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?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: I168920887bfd05c0a1785c5cb7ac485edaef0df2 Gerrit-Change-Number: 36596 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:38:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new...
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email ) Change subject: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new API param .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I579f4101a9e2874e310ff78e4571f38cfe8dfab0 Gerrit-Change-Number: 36575 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:36:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: cbsp_link.c: Update stream_cli read_cb2 functions to accommodate for ...
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email ) Change subject: cbsp_link.c: Update stream_cli read_cb2 functions to accommodate for new API param .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a Gerrit-Change-Number: 36576 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:35:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email ) Change subject: Asterisk: Initial AMI support .. Patch Set 2: (1 comment) File asterisk/AMI_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594/comment/0706ff2c_22efea22 PS2, Line 109: var integer pos := f_strstr(str, ": ", 0); > Looks like you could use TITAN's TEXT encoder for doing this: […] Damn, I am late to the party :( -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee Gerrit-Change-Number: 36594 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:32:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
Attention is currently required from: pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email )
Change subject: Asterisk: Initial AMI support
..
Patch Set 2:
(1 comment)
File asterisk/AMI_Functions.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594/comment/fbca309d_39ffd603
PS2, Line 109: var integer pos := f_strstr(str, ": ", 0);
Looks like you could use TITAN's TEXT encoder for doing this:
```
type record AMI_Field {
charstring key,
charstring val
} with {
encode "TEXT"
variant "SEPARATOR(':')"
};
type set of AMI_Field AMI_Msg with {
encode "TEXT"
variant "SEPARATOR('\r\n')"
variant "END('\r\n')"
};
external function enc_AMI_Msg(in AMI_Msg msg) return charstring
with { extension "prototype(convert) encode(TEXT)" }
external function dec_AMI_Msg(in charstring stream) return AMI_Msg
with { extension "prototype(convert) decode(TEXT)" }
```
See
https://gitlab.eclipse.org/eclipse/titan/titan.core/-/blob/master/usrguide/referenceguide/4-ttcn3_language_extensions.adoc?ref_type=heads#user-content-text-encoder-and-decoder.
Not saying you have to do it this way, but if we can offload some work to TITAN
- why not.
I have a small self-test:
```
private type component dummy_CT { };
testcase TC_tuwat() runs on dummy_CT {
var AMI_Msg msg := {
{ "field1", "value1" },
{ "field2", "value2" },
{ "field3", "value3" }
};
var charstring text := enc_AMI_Msg(msg);
log("AMI msg encoded: ", text);
var AMI_Msg msg_dec := dec_AMI_Msg(text);
log("AMI msg decoded: ", msg_dec);
}
```
and here is the output it produces:
```
MTC@LEGION: AMI msg encoded:
"field1:value1\r\nfield2:value2\r\nfield3:value3\r\n"
MTC@LEGION: AMI msg decoded: { { key := "field1", val := "value1" }, { key :=
"field2", val := "value2" }, { key := "field3", val := "value3" } }
```
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee
Gerrit-Change-Number: 36594
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 18 Apr 2024 16:31:38 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email ) Change subject: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 Gerrit-Change-Number: 36595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:07:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[XL] Change in osmo-ttcn3-hacks[master]: asterisk: Split SIPConnHdlr to its own file
Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?usp=email ) Change subject: asterisk: Split SIPConnHdlr to its own file .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?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: I168920887bfd05c0a1785c5cb7ac485edaef0df2 Gerrit-Change-Number: 36596 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 13:49:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email ) Change subject: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests .. ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests The Asterisk_tests testsuite recently gained initial AMI support. Configure it with the proper IP address. Depends: osmo-ttcn3-hacks.git Change-Id I2c570e4d04e7ab8c44962cf484e4bbc946209aee Change-Id: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index c8744bb..a734c22 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -5,6 +5,7 @@ [LOGGING] [TESTPORT_PARAMETERS] +*.AMI.CTRL_HOSTNAME := "172.18.11.10" *.SIP.default_local_address := "172.18.11.103" *.SIP.local_sip_port := "5060" *.SIP.default_dest_address := "172.18.11.10" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 Gerrit-Change-Number: 36595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests
Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email ) Change subject: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Merging together with osmo-ttcn3-hacks.git patch which got merged. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 Gerrit-Change-Number: 36595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 13:47:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email )
Change subject: Asterisk: Initial AMI support
..
Asterisk: Initial AMI support
Introduce config and functions around TELNETasp_PT to implement an AMI
interface client to interact with Asterisk.
So far only the "Action: Login" case is implemented.
Change-Id: I2c570e4d04e7ab8c44962cf484e4bbc946209aee
---
A asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.default
M asterisk/Asterisk_Tests.ttcn
M asterisk/gen_links.sh
M asterisk/regen_makefile.sh
5 files changed, 257 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
jolly: Looks good to me, but someone else must approve
diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
new file mode 100644
index 000..53a7964
--- /dev/null
+++ b/asterisk/AMI_Functions.ttcn
@@ -0,0 +1,212 @@
+/* Asterisk's AMI interface functions in TTCN-3
+ * (C) 2024 by sysmocom - s.f.m.c. GmbH
+ * Author: Pau Espin Pedrol
+ * All rights reserved.
+ *
+ * Released under the terms of GNU General Public License, Version 2 or
+ * (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+/*
+ *
https://docs.asterisk.org/Configuration/Interfaces/Asterisk-Manager-Interface-AMI/AMI-v2-Specification/
+ */
+module AMI_Functions {
+
+import from Misc_Helpers all;
+import from TELNETasp_PortType all;
+import from Osmocom_Types all;
+import from TCCConversion_Functions all;
+import from Socket_API_Definitions all;
+
+modulepar {
+ float mp_ami_prompt_timeout := 10.0;
+}
+
+const charstring AMI_FIELD_ACTION := "Action";
+const charstring AMI_FIELD_USERNAME := "Username";
+const charstring AMI_FIELD_SECRET := "Secret";
+const charstring AMI_FIELD_RESPONSE := "Response";
+
+type record AMI_Field {
+ charstring key,
+ charstring val
+};
+type set of AMI_Field AMI_Msg;
+
+template (value) AMI_Field
+ts_AMI_Field(template (value) charstring key,
+template (value) charstring val) := {
+ key := key,
+ val := val
+};
+
+template (present) AMI_Field
+tr_AMI_Field(template (present) charstring key := ?,
+template (present) charstring val := ?) := {
+ key := key,
+ val := val
+};
+
+/*
+ * Field Templates:
+ */
+
+template (value) AMI_Field
+ts_AMI_Field_Action(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_ACTION, val);
+template (value) AMI_Field
+ts_AMI_Field_Username(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_USERNAME, val);
+template (value) AMI_Field
+ts_AMI_Field_Secret(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_SECRET, val);
+
+template (present) AMI_Field
+tr_AMI_Field_Action(template (present) charstring val := ?) :=
tr_AMI_Field(AMI_FIELD_ACTION, val);
+template (present) AMI_Field
+tr_AMI_Field_Username(template (present) charstring val := ?) :=
tr_AMI_Field(AMI_FIELD_USERNAME, val);
+template (present) AMI_Field
+tr_AMI_Field_Secret(template (present) charstring val := ?) :=
tr_AMI_Field(AMI_FIELD_SECRET, val);
+template (present) AMI_Field
+tr_AMI_Field_Response(template (present) charstring val := ?) :=
tr_AMI_Field(AMI_FIELD_RESPONSE, val);
+
+
+template (present) AMI_Field
+tr_AMI_Field_ResponseSuccess := tr_AMI_Field(AMI_FIELD_RESPONSE, "Success");
+
+
+/*
+ * Message Templates:
+ */
+
+template (value) AMI_Msg
+ts_AMI_Action_Login(charstring username, charstring secret) := {
+ ts_AMI_Field_Action("Login"),
+ ts_AMI_Field_Username(username),
+ ts_AMI_Field_Secret(secret)
+};
+
+template (present) AMI_Msg
+tr_AMI_Action_Login(template(present) charstring username := ?,
+ template(present) charstring secret := ?) := superset(
+ tr_AMI_Field_Action("Login"),
+ tr_AMI_Field_Username(username),
+ tr_AMI_Field_Secret(secret)
+);
+
+template (present) AMI_Msg
+tr_AMI_Response_Success := superset(
+ tr_AMI_Field_ResponseSuccess
+);
+
+/*
+ * Functions:
+ */
+
+function f_AMI_Field_from_str(charstring str) return AMI_Field {
+ var AMI_Field field;
+ /* "each field is a key value pair delineated by a ':'.
+* A single space MUST follow the ':' and precede the value. "*/
+ var integer pos := f_strstr(str, ": ", 0);
+ if (pos < 0) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Failed parsing AMI_Field: ",
str));
+ }
+ field.key := substr(str, 0, pos);
+ /* skip ": " */
+ pos := pos + 2;
+ field.val := substr(str, pos, lengthof(str) - pos);
+ return field;
+}
+
+function f_AMI_Msg_from_str(charstring str) return AMI_Msg {
+ var AMI_Msg msg := {};
+ var Misc_Helpers.ro_charstring lines := f_str_split(str, "\n");
+
+
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email ) Change subject: Asterisk: Initial AMI support .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee Gerrit-Change-Number: 36594 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 13:46:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email )
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
stream_{cli,srv}: Add 'res' param to read_cb2
Notify user about read errors, similar to what is supported in the
earlier ofd cb backend of osmo_stream_cli/srv:
https://osmocom.org/issues/6405#note-15
Related: OS#6405
Fixes: 5fec34a9f20c3b8769373d1b28ae2062e5e2bdd6
Fixes: 0245cf5e07855abea72693272c55b50b5a93aff4
Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
---
M examples/ipa-stream-client.c
M examples/ipa-stream-server.c
M examples/stream-client.c
M examples/stream-server.c
M include/osmocom/netif/stream.h
M src/stream_cli.c
M src/stream_srv.c
M tests/stream/stream_test.c
8 files changed, 176 insertions(+), 58 deletions(-)
Approvals:
jolly: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/examples/ipa-stream-client.c b/examples/ipa-stream-client.c
index 720fe66..b58370e 100644
--- a/examples/ipa-stream-client.c
+++ b/examples/ipa-stream-client.c
@@ -102,13 +102,19 @@
return 0;
}
-static int read_cb(struct osmo_stream_cli *conn, struct msgb *msg)
+static int read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg)
{
int num;
struct msg_sent *cur, *tmp, *found = NULL;
LOGP(DIPATEST, LOGL_DEBUG, "received message from stream (payload
len=%d)\n", msgb_length(msg));
+ if (res <= 0) {
+ LOGP(DIPATEST, LOGL_ERROR, "Event with no data! %d\n", res);
+ msgb_free(msg);
+ return 0;
+ }
+
if (osmo_ipa_process_msg(msg) < 0) {
LOGP(DIPATEST, LOGL_ERROR, "bad IPA message\n");
msgb_free(msg);
diff --git a/examples/ipa-stream-server.c b/examples/ipa-stream-server.c
index 5317921..e87eab4 100644
--- a/examples/ipa-stream-server.c
+++ b/examples/ipa-stream-server.c
@@ -47,8 +47,15 @@
exit(EXIT_SUCCESS);
}
-int read_cb(struct osmo_stream_srv *conn, struct msgb *msg)
+int read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg)
{
+ if (res <= 0) {
+ LOGP(DSTREAMTEST, LOGL_ERROR, "cannot receive message (%d)\n",
res);
+ msgb_free(msg);
+ osmo_stream_srv_destroy(conn);
+ return -EBADF;
+ }
+
LOGP(DSTREAMTEST, LOGL_DEBUG, "received message from stream (payload
len=%d)\n", msgb_length(msg));
osmo_ipa_msg_push_headers(msg, osmo_ipa_msgb_cb_proto(msg),
osmo_ipa_msgb_cb_proto_ext(msg));
diff --git a/examples/stream-client.c b/examples/stream-client.c
index cae0153..6d20263 100644
--- a/examples/stream-client.c
+++ b/examples/stream-client.c
@@ -54,10 +54,17 @@
return 0;
}
-static int read_cb(struct osmo_stream_cli *conn, struct msgb *msg)
+static int read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg)
{
LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... ");
+ if (res < 0) {
+ LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message (res =
%d)\n", res);
+ msgb_free(msg);
+ return 0;
+ }
+
+
LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d bytes: %s\n", msg->len,
msgb_hexdump(msg));
msgb_free(msg);
diff --git a/examples/stream-server.c b/examples/stream-server.c
index f6332dc..5295c2b 100644
--- a/examples/stream-server.c
+++ b/examples/stream-server.c
@@ -3,6 +3,7 @@
#include
#include
#include
+#include
#include
#include
@@ -44,10 +45,20 @@
signal(SIGINT, SIG_DFL);
}
-int read_cb(struct osmo_stream_srv *conn, struct msgb *msg)
+int read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg)
{
LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... ");
+ if (res <= 0) {
+ if (res < 0)
+ LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message:
%s\n", strerror(-res));
+ else
+ LOGPC(DSTREAMTEST, LOGL_ERROR, "client closed
connection\n");
+ msgb_free(msg);
+ osmo_stream_srv_destroy(conn);
+ return -EBADF;
+ }
+
LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d bytes: %s\n", msg->len,
msgb_hexdump(msg));
msgb_free(msg);
diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h
index 398b277..3c4ec7e 100644
--- a/include/osmocom/netif/stream.h
+++ b/include/osmocom/netif/stream.h
@@ -102,7 +102,14 @@
typedef int (*osmo_stream_srv_read_cb_t)(struct osmo_stream_srv *conn);
typedef int (*osmo_stream_srv_closed_cb_t)(struct osmo_stream_srv *conn);
-typedef int (*osmo_stream_srv_read_cb2_t)(struct osmo_stream_srv *conn, struct
msgb *msg);
+
+/*! Completion
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
Attention is currently required from: laforge.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email )
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
Patch Set 5: Code-Review+2
(1 comment)
Patchset:
PS5:
MSC_Tests also passed fine (216 success, 1 more than last nightly in jenkins).
I'm merging this one now and I'll retrigger the dependant patches
gerrit-jenkins job after OBS have built them.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
Gerrit-Change-Number: 36574
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: laforge
Gerrit-Comment-Date: Thu, 18 Apr 2024 13:45:58 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new...
Attention is currently required from: fixeria, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email ) Change subject: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new API param .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I579f4101a9e2874e310ff78e4571f38cfe8dfab0 Gerrit-Change-Number: 36575 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 13:39:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
Attention is currently required from: laforge, pespin.
jolly has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email )
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
Patch Set 5: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
Gerrit-Change-Number: 36574
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 18 Apr 2024 13:35:41 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
Attention is currently required from: fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email ) Change subject: Asterisk: Initial AMI support .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee Gerrit-Change-Number: 36594 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 13:33:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[XL] Change in osmo-ttcn3-hacks[master]: asterisk: Split SIPConnHdlr to its own file
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?usp=email to look at the new patch set (#2). Change subject: asterisk: Split SIPConnHdlr to its own file .. asterisk: Split SIPConnHdlr to its own file Change-Id: I168920887bfd05c0a1785c5cb7ac485edaef0df2 --- M asterisk/Asterisk_Tests.ttcn A asterisk/SIP_ConnectionHandler.ttcn 2 files changed, 741 insertions(+), 691 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/36596/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?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: I168920887bfd05c0a1785c5cb7ac485edaef0df2 Gerrit-Change-Number: 36596 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: add HOST field to header lines.
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36503?usp=email )
Change subject: HTTP_Adapter: add HOST field to header lines.
..
HTTP_Adapter: add HOST field to header lines.
In HTTP 1.1 (this is what the HTTP_Adapter uses), the Host header field
is mandatory, see also: RFC 2616, section 14.23.
Related: SYS#6824
Change-Id: Id4b2220da4b2b5fbe74cdc2776cf66d6b34ddbcf
---
M library/HTTP_Adapter.ttcn
1 file changed, 19 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn
index a957fdd..0885f05 100644
--- a/library/HTTP_Adapter.ttcn
+++ b/library/HTTP_Adapter.ttcn
@@ -37,7 +37,8 @@
}
template (value) Close ts_HTTP_Close := { client_id := omit };
-template (value) HeaderLines ts_HTTP_Header(charstring body) := {
+template (value) HeaderLines ts_HTTP_Header(charstring body, charstring host)
:= {
+ { header_name := "Host", header_value := host },
{ header_name := "Content-Type", header_value := "application/json" },
{ header_name := "Content-Length", header_value :=
int2str(lengthof(body)) }
}
@@ -45,14 +46,15 @@
template (value) HTTPMessage ts_HTTP_Req(charstring url,
charstring method := "GET",
charstring body := "",
-integer v_maj := 1, integer v_min :=
1) := {
+integer v_maj := 1, integer v_min := 1,
+charstring host) := {
request := {
client_id := omit,
method := method,
uri := url,
version_major := v_maj,
version_minor := v_min,
- header := ts_HTTP_Header(body),
+ header := valueof(ts_HTTP_Header(body, host)),
body := body
}
}
@@ -75,7 +77,7 @@
runs on http_CT {
HTTP.send(ts_HTTP_Connect(g_http_host, g_http_port));
HTTP.receive(Connect_result:?);
- HTTP.send(ts_HTTP_Req(url, method, body));
+ HTTP.send(ts_HTTP_Req(url, method, body, host := g_http_host & ":" &
int2str(g_http_port)));
}
function f_http_rx_response(template HTTPMessage exp := tr_HTTP_Resp2xx, float
tout := 2.0)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36503?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: Id4b2220da4b2b5fbe74cdc2776cf66d6b34ddbcf
Gerrit-Change-Number: 36503
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests
Attention is currently required from: fixeria, jolly, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email ) Change subject: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 Gerrit-Change-Number: 36595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 11:31:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
Attention is currently required from: fixeria, jolly, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email ) Change subject: Asterisk: Initial AMI support .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee Gerrit-Change-Number: 36594 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 11:30:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email ) Change subject: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests .. ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests The Asterisk_tests testsuite recently gained initial AMI support. Configure it with the proper IP address. Depends: osmo-ttcn3-hacks.git Change-Id I2c570e4d04e7ab8c44962cf484e4bbc946209aee Change-Id: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/36595/1 diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index c8744bb..a734c22 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -5,6 +5,7 @@ [LOGGING] [TESTPORT_PARAMETERS] +*.AMI.CTRL_HOSTNAME := "172.18.11.10" *.SIP.default_local_address := "172.18.11.103" *.SIP.local_sip_port := "5060" *.SIP.default_dest_address := "172.18.11.10" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 Gerrit-Change-Number: 36595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email )
Change subject: Asterisk: Initial AMI support
..
Asterisk: Initial AMI support
Introduce config and functions around TELNETasp_PT to implement an AMI
interface client to interact with Asterisk.
So far only the "Action: Login" case is implemented.
Change-Id: I2c570e4d04e7ab8c44962cf484e4bbc946209aee
---
A asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.default
M asterisk/Asterisk_Tests.ttcn
M asterisk/gen_links.sh
M asterisk/regen_makefile.sh
5 files changed, 257 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/94/36594/1
diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
new file mode 100644
index 000..53a7964
--- /dev/null
+++ b/asterisk/AMI_Functions.ttcn
@@ -0,0 +1,212 @@
+/* Asterisk's AMI interface functions in TTCN-3
+ * (C) 2024 by sysmocom - s.f.m.c. GmbH
+ * Author: Pau Espin Pedrol
+ * All rights reserved.
+ *
+ * Released under the terms of GNU General Public License, Version 2 or
+ * (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+/*
+ *
https://docs.asterisk.org/Configuration/Interfaces/Asterisk-Manager-Interface-AMI/AMI-v2-Specification/
+ */
+module AMI_Functions {
+
+import from Misc_Helpers all;
+import from TELNETasp_PortType all;
+import from Osmocom_Types all;
+import from TCCConversion_Functions all;
+import from Socket_API_Definitions all;
+
+modulepar {
+ float mp_ami_prompt_timeout := 10.0;
+}
+
+const charstring AMI_FIELD_ACTION := "Action";
+const charstring AMI_FIELD_USERNAME := "Username";
+const charstring AMI_FIELD_SECRET := "Secret";
+const charstring AMI_FIELD_RESPONSE := "Response";
+
+type record AMI_Field {
+ charstring key,
+ charstring val
+};
+type set of AMI_Field AMI_Msg;
+
+template (value) AMI_Field
+ts_AMI_Field(template (value) charstring key,
+template (value) charstring val) := {
+ key := key,
+ val := val
+};
+
+template (present) AMI_Field
+tr_AMI_Field(template (present) charstring key := ?,
+template (present) charstring val := ?) := {
+ key := key,
+ val := val
+};
+
+/*
+ * Field Templates:
+ */
+
+template (value) AMI_Field
+ts_AMI_Field_Action(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_ACTION, val);
+template (value) AMI_Field
+ts_AMI_Field_Username(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_USERNAME, val);
+template (value) AMI_Field
+ts_AMI_Field_Secret(template (value) charstring val) :=
ts_AMI_Field(AMI_FIELD_SECRET, val);
+
+template (present) AMI_Field
+tr_AMI_Field_Action(template (present) charstring val := ?) :=
tr_AMI_Field(AMI_FIELD_ACTION, val);
+template (present) AMI_Field
+tr_AMI_Field_Username(template (present) charstring val := ?) :=
tr_AMI_Field(AMI_FIELD_USERNAME, val);
+template (present) AMI_Field
+tr_AMI_Field_Secret(template (present) charstring val := ?) :=
tr_AMI_Field(AMI_FIELD_SECRET, val);
+template (present) AMI_Field
+tr_AMI_Field_Response(template (present) charstring val := ?) :=
tr_AMI_Field(AMI_FIELD_RESPONSE, val);
+
+
+template (present) AMI_Field
+tr_AMI_Field_ResponseSuccess := tr_AMI_Field(AMI_FIELD_RESPONSE, "Success");
+
+
+/*
+ * Message Templates:
+ */
+
+template (value) AMI_Msg
+ts_AMI_Action_Login(charstring username, charstring secret) := {
+ ts_AMI_Field_Action("Login"),
+ ts_AMI_Field_Username(username),
+ ts_AMI_Field_Secret(secret)
+};
+
+template (present) AMI_Msg
+tr_AMI_Action_Login(template(present) charstring username := ?,
+ template(present) charstring secret := ?) := superset(
+ tr_AMI_Field_Action("Login"),
+ tr_AMI_Field_Username(username),
+ tr_AMI_Field_Secret(secret)
+);
+
+template (present) AMI_Msg
+tr_AMI_Response_Success := superset(
+ tr_AMI_Field_ResponseSuccess
+);
+
+/*
+ * Functions:
+ */
+
+function f_AMI_Field_from_str(charstring str) return AMI_Field {
+ var AMI_Field field;
+ /* "each field is a key value pair delineated by a ':'.
+* A single space MUST follow the ':' and precede the value. "*/
+ var integer pos := f_strstr(str, ": ", 0);
+ if (pos < 0) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Failed parsing AMI_Field: ",
str));
+ }
+ field.key := substr(str, 0, pos);
+ /* skip ": " */
+ pos := pos + 2;
+ field.val := substr(str, pos, lengthof(str) - pos);
+ return field;
+}
+
+function f_AMI_Msg_from_str(charstring str) return AMI_Msg {
+ var AMI_Msg msg := {};
+ var Misc_Helpers.ro_charstring lines := f_str_split(str, "\n");
+
+ for (var integer i := 0; i < lengthof(lines); i := i + 1) {
+ var charstring line
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Attention is currently required from: daniel, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email ) Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario .. Patch Set 2: (4 comments) Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/36590/comment/de6191fe_fe4953a8 PS1, Line 12: Fixes: 6de89a5fb529928ce9b7b3320e0ca2e3e568d458 > > A commit hash should be "Related:", and "Fixes:" is for redmine issues, > > right?? […] Done Patchset: PS2: All tests passed now. File ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg: https://gerrit.osmocom.org/c/docker-playground/+/36590/comment/312975ba_efc2fc74 PS1, Line 120: + > Thanks, I'll fix it. […] Done File ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg: https://gerrit.osmocom.org/c/docker-playground/+/36590/comment/efc4f529_ec19e739 PS1, Line 26: + > Ack Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 18 Apr 2024 10:18:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Attention is currently required from: daniel, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email ) Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 18 Apr 2024 10:15:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Attention is currently required from: daniel, neels, osmith. Hello Jenkins Builder, daniel, fixeria, neels, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by neels, Verified+1 by Jenkins Builder Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario .. ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario Recent commits applied changes to the default scenario, but forgot to apply them to the 'with-pfcp' subdir. Fixes: 6de89a5fb529928ce9b7b3320e0ca2e3e568d458 Fixes: 3736d31fc0314cb5d39c707374eecdcfe33241c9 Fixes: 0bdbcd6815358a7b1c4b0bb4575a585c45a01e57 Fixes: 2c22a96355b8e057dbd85ac1922ae84cc63f8b1e Fixes: d3711e67103691171d7ed3e224c050e78c1f5bc4 Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 --- M ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg 2 files changed, 35 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/36590/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: sgsn: derive altsteps from f_routing_area_update()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?usp=email )
Change subject: sgsn: derive altsteps from f_routing_area_update()
..
sgsn: derive altsteps from f_routing_area_update()
Change-Id: I7d5ec9c42a37a5746c36745ac738fd77e1632675
Related: SYS#6603, OS#6294
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 57 insertions(+), 26 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index b8b5735..92b744f 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -2630,46 +2630,67 @@
f_cleanup();
}
-friend function f_routing_area_update(RoutingAreaIdentificationV old_ra,
integer ran_index := 0) runs on BSSGP_ConnHdlr {
+friend altstep as_routing_area_update_gb(integer ran_index := 0) runs on
BSSGP_ConnHdlr {
var PDU_L3_SGSN_MS l3_mt;
- var PDU_DTAP_PS_MT mt;
- var template (omit) OCT4 p_tmsi := omit;
- if (is_iu(ran_index)) {
- p_tmsi := g_pars.p_tmsi;
- }
- /* then send RAU */
- f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false,
omit, omit, p_tmsi), ran_index);
- alt {
- [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value
l3_mt {
+ [] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt {
f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);
f_send_l3(ts_GMM_RAU_COMPL, ran_index);
setverdict(pass);
}
- [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT))
-> value mt {
+ [] BSSGP[ran_index].receive(tr_GMM_RAU_REJECT) {
+ setverdict(fail, "Unexpected RAU Reject");
+ mtc.stop;
+ }
+}
+friend altstep as_routing_area_update_iu(integer ran_index := 0) runs on
BSSGP_ConnHdlr {
+ var PDU_DTAP_PS_MT mt;
+
+ [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT)) -> value mt {
f_process_rau_accept(mt.dtap.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);
f_send_l3(ts_GMM_RAU_COMPL, ran_index);
setverdict(pass);
}
-
- [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_REJECT) {
+ [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {
setverdict(fail, "Unexpected RAU Reject");
mtc.stop;
}
- [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {
- setverdict(fail, "Unexpected RAU Reject");
- mtc.stop;
- }
+ [] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?,
+ uia_key :=
oct2bit(g_pars.vec.ik),
+ key_sts := ?)) {
+ var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 =
standard_UMTS_integrity_algorithm_UIA1 */
+ BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));
+ BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)))
+ repeat;
+ }
+}
+friend altstep as_routing_area_update(integer ran_index := 0) runs on
BSSGP_ConnHdlr {
+ [is_gb(ran_index)] as_routing_area_update_gb(ran_index);
+ [is_iu(ran_index)] as_routing_area_update_iu(ran_index);
+}
- [is_iu(ran_index)] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs :=
?, uia_key := oct2bit(g_pars.vec.ik),
- key_sts := ?)) {
- var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0
= standard_UMTS_integrity_algorithm_UIA1 */
- BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));
-
BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)))
- repeat;
- }
+friend function f_routing_area_update(RoutingAreaIdentificationV old_ra,
+ GprsUpdateType upd_type := GPRS_UPD_T_RA,
+ integer ran_index := 0,
+ float Tval := 2.0) runs on BSSGP_ConnHdlr
{
+ var template (omit) OCT4 p_tmsi := omit;
+ timer T := Tval;
+
+ if (is_iu(ran_index)) {
+ p_tmsi := g_pars.p_tmsi;
+ }
+
+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), upd_type, old_ra, p_tmsi :=
p_tmsi), ran_index);
+
+ T.start;
+ alt {
+ [] as_routing_area_update(ran_index) { setverdict(pass); }
[is_gb(ran_index)] BSSGP[ran_index].receive { repeat; }
[is_iu(ran_index)] BSSAP.receive { repeat; }
+ [] T.timeout {
+ setverdict(fail, "Timeout completing the RAU
[S] Change in osmo-ttcn3-hacks[master]: sgsn: fix unused param in f_routing_area_update()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?usp=email )
Change subject: sgsn: fix unused param in f_routing_area_update()
..
sgsn: fix unused param in f_routing_area_update()
Change-Id: I582b2836eba3188cfd4c640b1febbd25c50001e0
Related: SYS#6603, OS#6294
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 64ba981..b8b5735 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -2630,7 +2630,7 @@
f_cleanup();
}
-friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer
ran_index := 0) runs on BSSGP_ConnHdlr {
+friend function f_routing_area_update(RoutingAreaIdentificationV old_ra,
integer ran_index := 0) runs on BSSGP_ConnHdlr {
var PDU_L3_SGSN_MS l3_mt;
var PDU_DTAP_PS_MT mt;
var template (omit) OCT4 p_tmsi := omit;
@@ -2639,7 +2639,7 @@
p_tmsi := g_pars.p_tmsi;
}
/* then send RAU */
- f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra,
false, omit, omit, p_tmsi), ran_index);
+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false,
omit, omit, p_tmsi), ran_index);
alt {
[is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value
l3_mt {
f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?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: I582b2836eba3188cfd4c640b1febbd25c50001e0
Gerrit-Change-Number: 36587
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C add ts_MM_ContextGSM
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36586?usp=email )
Change subject: library: GTPv1C add ts_MM_ContextGSM
..
library: GTPv1C add ts_MM_ContextGSM
Change-Id: I483fdd0dee6e0ee92fcee798d8e85a80d1e0be8b
Related: SYS#6603, OS#6294
---
M library/GTPv1C_Templates.ttcn
1 file changed, 34 insertions(+), 0 deletions(-)
Approvals:
osmith: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 4a0c8b2..dcb8e60 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -338,6 +338,30 @@
}
/* 7.7.28 MM Context */
+ template (value) MM_Context ts_MM_ContextGSM(template (value) OCT8 kc,
+template (value) BIT3 cksn
:= '000'B,
+template (value) BIT3 gea
:= '000'B) := {
+ type_gtpc := '81'O,
+ context := {
+ mmcontGSM := {
+ lengthf := 0, /* overwritten */
+ cksn := cksn,
+ spare := '0'B,
+ usedCipher := gea,
+ noofVectors := 0,
+ security := '00'B, /* XXX */
+ kc := kc,
+ triplet := ''O,
+ drx_par := ''O,
+ msNetW_cap_length := 0, /* overwritten */
+ msNetw_cap := omit,
+ containerLength := 0, /* overwritten */
+ container := omit,
+ access_restriction_data_length := 0,
+ access_restriction_data := omit
+ }
+ }
+ }
template (value) MM_Context ts_MM_ContextUMTS(template (value) OCT16 ck,
template (value) OCT16
ik) := {
type_gtpc := '81'O,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36586?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: I483fdd0dee6e0ee92fcee798d8e85a80d1e0be8b
Gerrit-Change-Number: 36586
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: library: cosmetic: fix code formatting
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36585?usp=email )
Change subject: library: cosmetic: fix code formatting
..
library: cosmetic: fix code formatting
Change-Id: Ic87f6e8dcb8e507d21082f28217c015ff2e5204b
Related: SYS#6603, OS#6294
---
M library/GTPv1C_CodecPort.ttcn
1 file changed, 11 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/library/GTPv1C_CodecPort.ttcn b/library/GTPv1C_CodecPort.ttcn
index 956a674..bf14723 100644
--- a/library/GTPv1C_CodecPort.ttcn
+++ b/library/GTPv1C_CodecPort.ttcn
@@ -28,7 +28,7 @@
/* Decoded GTP1C (Control Plane), used in send and receive direction */
type record Gtp1cUnitdata {
- Gtp1cPeer peer,
+ Gtp1cPeer peer,
PDU_GTPCgtpc
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36585?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: Ic87f6e8dcb8e507d21082f28217c015ff2e5204b
Gerrit-Change-Number: 36585
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: sgsn: derive altsteps from f_routing_area_update()
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?usp=email ) Change subject: sgsn: derive altsteps from f_routing_area_update() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?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: I7d5ec9c42a37a5746c36745ac738fd77e1632675 Gerrit-Change-Number: 36588 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 09:56:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: Move f_str_split() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36593?usp=email )
Change subject: Move f_str_split() Osmocom_VTY_Functions.ttcn ->
Misc_Helpers.ttcn
..
Move f_str_split() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn
This is quite a generic string handling function which fits better
in a generic utility file like Misc_Helpers.ttcn.
Change-Id: I54eff3eea60ed0624919baebfe0ff7393414d6b8
---
M library/Misc_Helpers.ttcn
M library/Osmocom_VTY_Functions.ttcn
M upf/UPF_Tests.ttcn
3 files changed, 39 insertions(+), 26 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn
index cbc1e70..fd2e7bb 100644
--- a/library/Misc_Helpers.ttcn
+++ b/library/Misc_Helpers.ttcn
@@ -79,4 +79,24 @@
return count;
}
+type record of charstring ro_charstring;
+function f_str_split(charstring str, charstring delim := "\n") return
ro_charstring
+{
+ var integer pos := 0;
+ var ro_charstring parts := {};
+ var integer delim_pos;
+ var integer end := lengthof(str);
+ while (pos < end) {
+ delim_pos := f_strstr(str, delim, pos);
+ if (delim_pos < 0) {
+ delim_pos := end;
+ }
+ if (delim_pos > pos) {
+ parts := parts & { substr(str, pos, delim_pos - pos) };
+ }
+ pos := delim_pos + 1;
+ }
+ return parts;
+}
+
}
diff --git a/library/Osmocom_VTY_Functions.ttcn
b/library/Osmocom_VTY_Functions.ttcn
index 6b0883f..b982a8f 100644
--- a/library/Osmocom_VTY_Functions.ttcn
+++ b/library/Osmocom_VTY_Functions.ttcn
@@ -274,26 +274,7 @@
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "talloc count
mismatch");
}
-public function f_str_split(charstring str, charstring delim := "\n") return
ro_charstring
-{
- var integer pos := 0;
- var ro_charstring parts := {};
- var integer delim_pos;
- var integer end := lengthof(str);
- while (pos < end) {
- delim_pos := f_strstr(str, delim, pos);
- if (delim_pos < 0) {
- delim_pos := end;
- }
- if (delim_pos > pos) {
- parts := parts & { substr(str, pos, delim_pos - pos) };
- }
- pos := delim_pos + 1;
- }
- return parts;
-}
-
-public function f_verify_talloc_bytes(TELNETasp_PT pt, ro_charstring
object_strs, integer expect_bytes := 0,
+public function f_verify_talloc_bytes(TELNETasp_PT pt,
Misc_Helpers.ro_charstring object_strs, integer expect_bytes := 0,
integer attempts := 5, float wait_time
:= 3.0)
{
var charstring show_cmd := "show talloc-context application brief";
@@ -302,7 +283,7 @@
attempts := attempts - 1;
var charstring ret := f_vty_transceive_ret(pt, show_cmd);
- var ro_charstring lines := f_str_split(ret);
+ var Misc_Helpers.ro_charstring lines := f_str_split(ret);
var boolean ok := true;
for (var integer i := 0; i < lengthof(object_strs); i := i + 1)
{
@@ -315,7 +296,7 @@
if (f_strstr(line, object_str) < 0) {
continue;
}
- var ro_charstring tokens := f_str_split(line, "
");
+ var Misc_Helpers.ro_charstring tokens :=
f_str_split(line, " ");
if (lengthof(tokens) < 4) {
continue;
}
diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn
index 140e81b..cb8c489 100644
--- a/upf/UPF_Tests.ttcn
+++ b/upf/UPF_Tests.ttcn
@@ -125,7 +125,7 @@
if (not f_get_name_val(token, str, name)) {
return false;
}
- var ro_charstring nrl := f_str_split(token, delim);
+ var Misc_Helpers.ro_charstring nrl := f_str_split(token, delim);
if (lengthof(nrl) != 2) {
return false;
}
@@ -270,7 +270,7 @@
private function f_vty_get_gtp_actions(TELNETasp_PT vty_pt) return
GTP_Action_List {
var charstring gtp_str := f_vty_transceive_ret(vty_pt, "show gtp");
- var ro_charstring lines := f_str_split(gtp_str, "\n");
+ var Misc_Helpers.ro_charstring lines := f_str_split(gtp_str, "\n");
var GTP_Action_List gtps := {};
for (var integer i := 0; i < lengthof(lines); i := i + 1) {
var charstring line := lines[i];
@@ -399,7 +399,7 @@
private function f_vty_get_sessions(TELNETasp_PT vty_pt) return
PFCP_Session_Status_List {
var charstring sessions_str :=
[M] Change in osmo-ttcn3-hacks[master]: Move f_strstr_count() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36592?usp=email )
Change subject: Move f_strstr_count() Osmocom_VTY_Functions.ttcn ->
Misc_Helpers.ttcn
..
Move f_strstr_count() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn
This is quite a generic string handling function which fits better
in a generic utility file like Misc_Helpers.ttcn.
Change-Id: I105844d2bcab6c24624be1224c1ba78b69d4b44c
---
M ccid/gen_links.sh
M ccid/regen_makefile.sh
M library/Misc_Helpers.ttcn
M library/Osmocom_VTY_Functions.ttcn
M simtrace/gen_links.sh
M simtrace/regen_makefile.sh
6 files changed, 38 insertions(+), 23 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/ccid/gen_links.sh b/ccid/gen_links.sh
index e53954b..593f624 100755
--- a/ccid/gen_links.sh
+++ b/ccid/gen_links.sh
@@ -4,9 +4,9 @@
. ../gen_links.sh.inc
-#DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src
-#FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn
TCCConversion.cc TCCInterface.cc TCCInterface_ip.h"
-#gen_links $DIR $FILES
+DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src
+FILES="TCCConversion_Functions.ttcn TCCConversion.cc"
+gen_links $DIR $FILES
DIR=$BASEDIR/titan.TestPorts.USB/src
FILES="USB_PT.cc USB_PT.hh USB_PortType.ttcn USB_PortTypes.ttcn
USB_Templates.ttcn USB_Types.ttcn USB_Component.ttcn "
diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh
index bbb7f33..c91ac12 100755
--- a/ccid/regen_makefile.sh
+++ b/ccid/regen_makefile.sh
@@ -5,6 +5,7 @@
FILES="
*.ttcn
Native_FunctionDefs.cc
+ TCCConversion.cc
USB_PT.cc
"
diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn
index dda2c2c..cbc1e70 100644
--- a/library/Misc_Helpers.ttcn
+++ b/library/Misc_Helpers.ttcn
@@ -1,6 +1,7 @@
module Misc_Helpers {
import from Native_Functions all;
+import from TCCConversion_Functions all;
modulepar {
charstring mp_osmo_repo := "nightly";
@@ -61,4 +62,21 @@
}
}
+/* Return a count of how many times sub_str occurs in str. */
+function f_strstr_count(in charstring str, in charstring sub_str) return
integer
+{
+ var integer count := 0;
+ var integer pos := 0;
+
+ while (true) {
+ var integer at := f_strstr(str, sub_str, pos);
+ if (at < 0) {
+ break;
+ }
+ count := count + 1;
+ pos := at + 1;
+ }
+ return count;
+}
+
}
diff --git a/library/Osmocom_VTY_Functions.ttcn
b/library/Osmocom_VTY_Functions.ttcn
index 3dd0429..6b0883f 100644
--- a/library/Osmocom_VTY_Functions.ttcn
+++ b/library/Osmocom_VTY_Functions.ttcn
@@ -228,23 +228,6 @@
return "";
}
-/* Return a count of how many times sub_str occurs in str. */
-function f_strstr_count(in charstring str, in charstring sub_str) return
integer
-{
- var integer count := 0;
- var integer pos := 0;
-
- while (true) {
- var integer at := f_strstr(str, sub_str, pos);
- if (at < 0) {
- break;
- }
- count := count + 1;
- pos := at + 1;
- }
- return count;
-}
-
private type record of charstring StrList;
/* Perform a 'show talloc-context' to get a count of the given object_strs
that are still allocated.
diff --git a/simtrace/gen_links.sh b/simtrace/gen_links.sh
index eef1fea..3bce04d 100755
--- a/simtrace/gen_links.sh
+++ b/simtrace/gen_links.sh
@@ -4,9 +4,9 @@
. ../gen_links.sh.inc
-#DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src
-#FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn
TCCConversion.cc TCCInterface.cc TCCInterface_ip.h"
-#gen_links $DIR $FILES
+DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src
+FILES="TCCConversion_Functions.ttcn TCCConversion.cc"
+gen_links $DIR $FILES
DIR=$BASEDIR/titan.TestPorts.USB/src
FILES="USB_PT.cc USB_PT.hh USB_PortType.ttcn USB_PortTypes.ttcn
USB_Templates.ttcn USB_Types.ttcn USB_Component.ttcn "
diff --git a/simtrace/regen_makefile.sh b/simtrace/regen_makefile.sh
index baecf7d..04c8397 100755
--- a/simtrace/regen_makefile.sh
+++ b/simtrace/regen_makefile.sh
@@ -5,6 +5,7 @@
FILES="
*.ttcn
Native_FunctionDefs.cc
+ TCCConversion.cc
USB_PT.cc
"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36592?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: I105844d2bcab6c24624be1224c1ba78b69d4b44c
Gerrit-Change-Number: 36592
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-netif[master]: tests/stream: Fix missing msgb_free()
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email )
Change subject: tests/stream: Fix missing msgb_free()
..
tests/stream: Fix missing msgb_free()
Rework a bit the function to early free the rx msg when it is no longer
needed.
Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc
---
M tests/stream/stream_test.c
1 file changed, 22 insertions(+), 4 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c
index e50752b..d73dd1d 100644
--- a/tests/stream/stream_test.c
+++ b/tests/stream/stream_test.c
@@ -572,15 +572,21 @@
struct ipa_head *ih = (struct ipa_head *)msg->l1h;
unsigned char *data;
struct msgb *m;
- uint8_t *msgt = msg->l2h; /* Octet right after IPA header */
+ uint8_t msgt;
+
LOGSRV(conn, "[%u-srv] Received IPA message from stream (payload len =
%" PRIu16 ")\n",
++msgnum_srv, msgb_length(msg));
LOGSRV(conn, "\tmsg buff data (including stripped headers): %s\n",
osmo_hexdump((unsigned char *)ih, osmo_ntohs(ih->len) +
sizeof(*ih)));
LOGSRV(conn, "\tIPA payload: %s\n", osmo_hexdump(ih->data,
osmo_ntohs(ih->len)));
- LOGSRV(conn, "\tType: %s\n", IPAC_MSG_TYPES[*msgt]);
+
+ msgt = *msg->l2h; /* Octet right after IPA header */
+ LOGSRV(conn, "\tType: %s\n", IPAC_MSG_TYPES[msgt]);
LOGSRV(conn, "\t(msg dump: %s)\n", osmo_hexdump(msg->l1h, msg->len +
sizeof(struct ipa_head)));
- if (*msgt == IPAC_MSGT_ID_RESP) { /* */
+
+ msgb_free(msg);
+
+ if (msgt == IPAC_MSGT_ID_RESP) { /* */
LOGSRV(conn, "Send IPAC_MSGT_ID_GET to trigger client to send
next third\n\n");
m = osmo_ipa_msg_alloc(128);
if (m == NULL) {
@@ -590,7 +596,7 @@
put_ipa_msg(data, m, ipac_msg_idreq_payload);
osmo_ipa_msg_push_headers(m, IPAC_PROTO_IPACCESS, -1);
osmo_stream_srv_send(conn, m);
- } else if (msgnum_srv == 7 && *msgt == IPAC_MSGT_PONG) {
+ } else if (msgnum_srv == 7 && msgt == IPAC_MSGT_PONG) {
test_segm_ipa_stream_srv_all_msgs_processed = true;
osmo_stream_srv_destroy(conn);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc
Gerrit-Change-Number: 36583
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-bsc[master]: cbsp_link.c: Update stream_cli read_cb2 functions to accommodate for ...
Attention is currently required from: osmith.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email )
Change subject: cbsp_link.c: Update stream_cli read_cb2 functions to
accommodate for new API param
..
Patch Set 1:
(1 comment)
File src/osmo-bsc/cbsp_link.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/36576/comment/37a19e47_6b045711
PS1, Line 166: } */
> maybe add log messages instead of having the commented out code?
I'm basically leaving the code which was there before and got removed when
moving to osmo_io, but simply commenting it out since it really is a no-op.
Still I think it's useful keeping it in case someone wants to do more
fine-grained error handling.
85687bf176e4b9663f2396a27c28b49221c72fa3:
- /* READ */
- rc = osmo_cbsp_recv_buffered(cbc, ofd->fd, , >client.msg);
- if (rc <= 0) {
- if (rc == -EAGAIN || rc == -EINTR) {
- /* more data needs to be read */
- return 0;
- } else if (rc == -EPIPE || rc == -ECONNRESET) {
- /* lost connection */
- } else if (rc == 0) {
- /* connection closed */
- }
- osmo_stream_cli_reconnect(cli);
- return -EBADF;
- }
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a
Gerrit-Change-Number: 36576
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Attention: osmith
Gerrit-Comment-Date: Thu, 18 Apr 2024 09:54:24 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new...
Attention is currently required from: pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email )
Change subject: ss7_asp: Update osmo_stream read_cb2 functions to accommodate
for new API param
..
Patch Set 6:
(1 comment)
File src/osmo_ss7_asp.c:
https://gerrit.osmocom.org/c/libosmo-sccp/+/36575/comment/c86ac41e_6711d50f
PS6, Line 1050: if (res < 0) {
: xua_cli_close_and_reconnect(conn);
: goto out;
: } else if (res == 0) {
: xua_cli_close_and_reconnect(conn);
:
: goto out;
: }
> Yes I know but I wanted to keep the two conditions separated in general, one
> for regular socket clos […]
Ack
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I579f4101a9e2874e310ff78e4571f38cfe8dfab0
Gerrit-Change-Number: 36575
Gerrit-PatchSet: 6
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 18 Apr 2024 09:52:30 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new...
Attention is currently required from: osmith.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email )
Change subject: ss7_asp: Update osmo_stream read_cb2 functions to accommodate
for new API param
..
Patch Set 6:
(1 comment)
File src/osmo_ss7_asp.c:
https://gerrit.osmocom.org/c/libosmo-sccp/+/36575/comment/e8ab38b5_1a8636d7
PS6, Line 1050: if (res < 0) {
: xua_cli_close_and_reconnect(conn);
: goto out;
: } else if (res == 0) {
: xua_cli_close_and_reconnect(conn);
:
: goto out;
: }
> could be changed to "if (res <= 0)"
Yes I know but I wanted to keep the two conditions separated in general, one
for regular socket close and other one for errors. Makes it easier to extend
later if neeeded.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I579f4101a9e2874e310ff78e4571f38cfe8dfab0
Gerrit-Change-Number: 36575
Gerrit-PatchSet: 6
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Attention: osmith
Gerrit-Comment-Date: Thu, 18 Apr 2024 09:51:31 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: derive altsteps from f_routing_area_update()
Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?usp=email ) Change subject: sgsn: derive altsteps from f_routing_area_update() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?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: I7d5ec9c42a37a5746c36745ac738fd77e1632675 Gerrit-Change-Number: 36588 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 09:35:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: sgsn: fix unused param in f_routing_area_update()
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?usp=email ) Change subject: sgsn: fix unused param in f_routing_area_update() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?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: I582b2836eba3188cfd4c640b1febbd25c50001e0 Gerrit-Change-Number: 36587 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 09:33:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C add ts_MM_ContextGSM
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36586?usp=email ) Change subject: library: GTPv1C add ts_MM_ContextGSM .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36586?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: I483fdd0dee6e0ee92fcee798d8e85a80d1e0be8b Gerrit-Change-Number: 36586 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 09:31:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email ) Change subject: sgsn: add testcases for SGSN Context Request procedure .. Patch Set 1: Code-Review+1 (2 comments) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/2f872cb2_56334b02 PS1, Line 3772: Contect Context https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/5eaa740c_b687c06b PS1, Line 3814: Contect Context -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c Gerrit-Change-Number: 36589 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 09:31:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: Move f_str_split() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36593?usp=email ) Change subject: Move f_str_split() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36593?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: I54eff3eea60ed0624919baebfe0ff7393414d6b8 Gerrit-Change-Number: 36593 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 09:20:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: Move f_strstr_count() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36592?usp=email ) Change subject: Move f_strstr_count() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36592?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: I105844d2bcab6c24624be1224c1ba78b69d4b44c Gerrit-Change-Number: 36592 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 09:19:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
Attention is currently required from: jolly, laforge, pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email )
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
Patch Set 5: Code-Review+1
(1 comment)
Patchset:
PS5:
Letting the others to take a look at this patch (would do CR+2 otherwise).
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
Gerrit-Change-Number: 36574
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: jolly
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 18 Apr 2024 09:17:50 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: tests/stream: Fix missing msgb_free()
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email ) Change subject: tests/stream: Fix missing msgb_free() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc Gerrit-Change-Number: 36583 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 09:16:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: cbsp_link.c: Update stream_cli read_cb2 functions to accommodate for ...
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email ) Change subject: cbsp_link.c: Update stream_cli read_cb2 functions to accommodate for new API param .. Patch Set 1: Code-Review+1 (1 comment) File src/osmo-bsc/cbsp_link.c: https://gerrit.osmocom.org/c/osmo-bsc/+/36576/comment/315e878b_2f3b2037 PS1, Line 166: } */ maybe add log messages instead of having the commented out code? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a Gerrit-Change-Number: 36576 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 09:16:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new...
Attention is currently required from: pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email )
Change subject: ss7_asp: Update osmo_stream read_cb2 functions to accommodate
for new API param
..
Patch Set 6: Code-Review+1
(1 comment)
File src/osmo_ss7_asp.c:
https://gerrit.osmocom.org/c/libosmo-sccp/+/36575/comment/d6329ab0_00d3cf79
PS6, Line 1050: if (res < 0) {
: xua_cli_close_and_reconnect(conn);
: goto out;
: } else if (res == 0) {
: xua_cli_close_and_reconnect(conn);
:
: goto out;
: }
could be changed to "if (res <= 0)"
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I579f4101a9e2874e310ff78e4571f38cfe8dfab0
Gerrit-Change-Number: 36575
Gerrit-PatchSet: 6
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 18 Apr 2024 09:14:14 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: .gitignore: Add .vscode/ directory
pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36591?usp=email ) Change subject: .gitignore: Add .vscode/ directory .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36591?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: I8a5c5ca50591a0f531258dd59df462ec2ff5f81c Gerrit-Change-Number: 36591 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-MessageType: abandon
[S] Change in osmo-ttcn3-hacks[master]: .gitignore: Add .vscode/ directory
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36591?usp=email ) Change subject: .gitignore: Add .vscode/ directory .. Patch Set 1: (1 comment) Patchset: PS1: Fine, abandoning. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36591?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: I8a5c5ca50591a0f531258dd59df462ec2ff5f81c Gerrit-Change-Number: 36591 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 18 Apr 2024 09:06:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: .gitignore: Add .vscode/ directory
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36591?usp=email ) Change subject: .gitignore: Add .vscode/ directory .. Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: as discussed, IMHO makes more sense to put this in your global gitignore -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36591?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: I8a5c5ca50591a0f531258dd59df462ec2ff5f81c Gerrit-Change-Number: 36591 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 09:06:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Attention is currently required from: daniel, neels, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email ) Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario .. Patch Set 1: (3 comments) Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/36590/comment/ff16ef31_956a0211 PS1, Line 12: Fixes: 6de89a5fb529928ce9b7b3320e0ca2e3e568d458 > A commit hash should be "Related:", and "Fixes:" is for redmine issues, > right?? I think I already shared with you previously that this is common pattern in projects like linux kernel, which is useful to track with scripts follow-up patches which fix bugs in patches one want to cherry-pick. So I see no problem with it and I actually invite others to do the same. File ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg: https://gerrit.osmocom.org/c/docker-playground/+/36590/comment/390a3f2a_cfdfb6ac PS1, Line 120: + Thanks, I'll fix it. > IMHO we should have one fixed config in osmo-hnbgw.cfg, or only ttcn3 code > that adjusts config via VTY. Yeah probably, but out of the scope for this patch, this needs quite a lot of work, I'm just fixing the running tests because it showed up during weekly meeting this week. In this case the "duplication" is simply that it needs to match what osmo-hnbgw was cofnigured with, not really "sync" between TTCN3 config files. > this "+" seems to be a copy paste bug -- let me guess, you haven't actually > tested this patch.. Yeah I didn't test it, sorry for that, I just wrote the patch while running other ttcn3 testsuites validating the osmo_io fixes I submitted. I'll give them a run today. File ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg: https://gerrit.osmocom.org/c/docker-playground/+/36590/comment/95d9d823_ff9add2c PS1, Line 26: + > "+" artifact Ack -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 18 Apr 2024 09:03:46 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
Attention is currently required from: fixeria, jolly, laforge, pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email )
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
Patch Set 5: Code-Review+1
(1 comment)
File include/osmocom/netif/stream.h:
https://gerrit.osmocom.org/c/libosmo-netif/+/36574/comment/6e03d594_c6ec07c7
PS4, Line 107: srv
> Ack
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
Gerrit-Change-Number: 36574
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: jolly
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Thu, 18 Apr 2024 08:57:43 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: tests/stream: Fix missing msgb_free()
Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email ) Change subject: tests/stream: Fix missing msgb_free() .. Patch Set 2: Code-Review+1 (1 comment) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36583/comment/83535a54_61618e26 PS1, Line 598: return 0; > Oh I thought it was actualy forwaded with "osmo_stream_srv_send(conn, m);", > but now that you mention […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc Gerrit-Change-Number: 36583 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 18 Apr 2024 08:57:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
Attention is currently required from: fixeria, jolly, laforge, osmith.
Hello Jenkins Builder, fixeria, jolly, laforge, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
to look at the new patch set (#5).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified+1 by Jenkins Builder
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
stream_{cli,srv}: Add 'res' param to read_cb2
Notify user about read errors, similar to what is supported in the
earlier ofd cb backend of osmo_stream_cli/srv:
https://osmocom.org/issues/6405#note-15
Related: OS#6405
Fixes: 5fec34a9f20c3b8769373d1b28ae2062e5e2bdd6
Fixes: 0245cf5e07855abea72693272c55b50b5a93aff4
Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
---
M examples/ipa-stream-client.c
M examples/ipa-stream-server.c
M examples/stream-client.c
M examples/stream-server.c
M include/osmocom/netif/stream.h
M src/stream_cli.c
M src/stream_srv.c
M tests/stream/stream_test.c
8 files changed, 176 insertions(+), 58 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/74/36574/5
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
Gerrit-Change-Number: 36574
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: osmith
Gerrit-Attention: jolly
Gerrit-Attention: laforge
Gerrit-Attention: fixeria
Gerrit-MessageType: newpatchset
[S] Change in libosmo-netif[master]: tests/stream: Fix missing msgb_free()
Attention is currently required from: fixeria, osmith. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: tests/stream: Fix missing msgb_free() .. tests/stream: Fix missing msgb_free() Rework a bit the function to early free the rx msg when it is no longer needed. Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc --- M tests/stream/stream_test.c 1 file changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/83/36583/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc Gerrit-Change-Number: 36583 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
Attention is currently required from: jolly, laforge, osmith.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email )
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
Patch Set 4:
(1 comment)
File include/osmocom/netif/stream.h:
https://gerrit.osmocom.org/c/libosmo-netif/+/36574/comment/577dacb6_d221ee2c
PS4, Line 107: srv
> conn
Ack
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
Gerrit-Change-Number: 36574
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: osmith
Gerrit-Attention: jolly
Gerrit-Attention: laforge
Gerrit-Comment-Date: Thu, 18 Apr 2024 08:45:47 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: tests/stream: Fix missing msgb_free()
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email ) Change subject: tests/stream: Fix missing msgb_free() .. Patch Set 1: (1 comment) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36583/comment/3d2c7684_5e80345a PS1, Line 598: return 0; > how does it get freed in the other code paths? (if (*msgt == > IPAC_MSGT_ID_RESP) and when both if and […] Oh I thought it was actualy forwaded with "osmo_stream_srv_send(conn, m);", but now that you mention it, another msgb is actually allocated, so the "msg" is leaked. Good catch! I'll change it. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc Gerrit-Change-Number: 36583 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 18 Apr 2024 08:45:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream: Define types for each API callback
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36581?usp=email ) Change subject: stream: Define types for each API callback .. stream: Define types for each API callback The amount and complexity of callbacks is increasing over time. Use typedefs to define each of them so that callbacks: - Are easier to identify (which types is used where) - Are easier to document (have a 1st class place to write doxygen documentation) Change-Id: Ib0c4a9713fa4c755e457b8c2cbde6a7724d36e28 --- M include/osmocom/netif/stream.h M src/stream_cli.c M src/stream_srv.c 3 files changed, 65 insertions(+), 33 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 61bc1ad..398b277 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -62,6 +62,8 @@ /*! \brief Osmocom Stream Server Link: A server socket listening/accepting */ struct osmo_stream_srv_link; +typedef int (*osmo_stream_srv_link_accept_cb_t)(struct osmo_stream_srv_link *link, int fd); + struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx); void osmo_stream_srv_link_destroy(struct osmo_stream_srv_link *link); @@ -74,7 +76,7 @@ void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto); int osmo_stream_srv_link_set_type(struct osmo_stream_srv_link *link, int type); int osmo_stream_srv_link_set_domain(struct osmo_stream_srv_link *link, int domain); -void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb)(struct osmo_stream_srv_link *link, int fd)); +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, osmo_stream_srv_link_accept_cb_t accept_cb); void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data); void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link); char *osmo_stream_srv_link_get_sockname(const struct osmo_stream_srv_link *link); @@ -98,12 +100,20 @@ * osmo_stream_srv_link */ struct osmo_stream_srv; -struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, int fd, int (*read_cb)(struct osmo_stream_srv *conn), int (*closed_cb)(struct osmo_stream_srv *conn), void *data); +typedef int (*osmo_stream_srv_read_cb_t)(struct osmo_stream_srv *conn); +typedef int (*osmo_stream_srv_closed_cb_t)(struct osmo_stream_srv *conn); +typedef int (*osmo_stream_srv_read_cb2_t)(struct osmo_stream_srv *conn, struct msgb *msg); +typedef int (*osmo_stream_srv_segmentation_cb_t)(struct msgb *msg); + +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, int fd, + osmo_stream_srv_read_cb_t read_cb, + osmo_stream_srv_closed_cb_t closed_cb, + void *data); struct osmo_stream_srv *osmo_stream_srv_create2(void *ctx, struct osmo_stream_srv_link *link, int fd, void *data); void osmo_stream_srv_set_name(struct osmo_stream_srv *conn, const char *name); const char *osmo_stream_srv_get_name(const struct osmo_stream_srv *conn); -void osmo_stream_srv_set_read_cb(struct osmo_stream_srv *conn, int (*read_cb)(struct osmo_stream_srv *conn, struct msgb *msg)); -void osmo_stream_srv_set_closed_cb(struct osmo_stream_srv *conn, int (*closed_cb)(struct osmo_stream_srv *conn)); +void osmo_stream_srv_set_read_cb(struct osmo_stream_srv *conn, osmo_stream_srv_read_cb2_t read_cb); +void osmo_stream_srv_set_closed_cb(struct osmo_stream_srv *conn, osmo_stream_srv_closed_cb_t close_cb); void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn); struct osmo_stream_srv_link *osmo_stream_srv_get_master(struct osmo_stream_srv *conn); const char *osmo_stream_srv_get_sockname(const struct osmo_stream_srv *conn); @@ -115,8 +125,7 @@ void osmo_stream_srv_set_flush_and_destroy(struct osmo_stream_srv *conn); void osmo_stream_srv_set_data(struct osmo_stream_srv *conn, void *data); -void osmo_stream_srv_set_segmentation_cb(struct osmo_stream_srv *conn, - int (*segmentation_cb)(struct msgb *msg)); +void osmo_stream_srv_set_segmentation_cb(struct osmo_stream_srv *conn, osmo_stream_srv_segmentation_cb_t segmentation_cb); void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg); int osmo_stream_srv_recv(struct osmo_stream_srv *conn, struct msgb *msg); @@ -160,6 +169,12 @@ /*! \brief Osmocom Stream Client: Single client connection */ struct osmo_stream_cli; +typedef int (*osmo_stream_cli_connect_cb_t)(struct osmo_stream_cli *cli); +typedef int (*osmo_stream_cli_disconnect_cb_t)(struct osmo_stream_cli *cli); +typedef int (*osmo_stream_cli_read_cb_t)(struct osmo_stream_cli
[S] Change in libosmo-netif[master]: stream_cli: Remove unused write_cb field
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36580?usp=email ) Change subject: stream_cli: Remove unused write_cb field .. stream_cli: Remove unused write_cb field Change-Id: I50bee754d01d8de01f4a25c14abf90275a1ac78e --- M src/stream_cli.c 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/stream_cli.c b/src/stream_cli.c index 11c88ae..0427032 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -107,7 +107,6 @@ int (*disconnect_cb)(struct osmo_stream_cli *cli); int (*read_cb)(struct osmo_stream_cli *cli); int (*iofd_read_cb)(struct osmo_stream_cli *cli, struct msgb *msg); - int (*write_cb)(struct osmo_stream_cli *cli); int (*segmentation_cb)(struct msgb *msg); void*data; int flags; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36580?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I50bee754d01d8de01f4a25c14abf90275a1ac78e Gerrit-Change-Number: 36580 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
Attention is currently required from: jolly, laforge, pespin.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email )
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
Patch Set 4: Code-Review+1
(1 comment)
File include/osmocom/netif/stream.h:
https://gerrit.osmocom.org/c/libosmo-netif/+/36574/comment/cbf86b49_65d439b6
PS4, Line 107: srv
conn
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
Gerrit-Change-Number: 36574
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: jolly
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 18 Apr 2024 08:22:01 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: tests/stream: Fix missing msgb_free()
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email ) Change subject: tests/stream: Fix missing msgb_free() .. Patch Set 1: Code-Review+1 (1 comment) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36583/comment/6d5e7ae0_68930d6e PS1, Line 598: return 0; how does it get freed in the other code paths? (if (*msgt == IPAC_MSGT_ID_RESP) and when both if and else if conditions are not met?) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc Gerrit-Change-Number: 36583 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 08:14:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream_cli: Remove unused write_cb field
Attention is currently required from: daniel, jolly, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36580?usp=email ) Change subject: stream_cli: Remove unused write_cb field .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36580?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I50bee754d01d8de01f4a25c14abf90275a1ac78e Gerrit-Change-Number: 36580 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 18 Apr 2024 08:05:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
