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

[M] Change in osmo-bts[master]: Move trx->rsl_link to trx->bb_transc.rsl.link

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34441?usp=email ) Change subject: Move trx->rsl_link to trx->bb_transc.rsl.link ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I62937cbd81c27274b9f5f70d454d5319a6898c7b Gerrit-Change-Number: 34441 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 18:21:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email ) Change subject: sip: tweak failure reporting for SIP messages ...................................................................... Patch Set 3: (1 comment) File sip/SIP_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/e7e11706_2703… PS1, Line 195: og("FAIL: expected SIP message ", sip_expect); : setverdict(fail, "Received unexpected SIP message"); > I'm not sure that f_shutdown() should always dup the log in addition to setverdict(), it only makes sense for logs that contain a message dump. IMO, there should be no duplication at all. `log()` is for logging various events happening during the testcase execution, not for indicating the failure reason. There exists `setverdict()` for that purpose. > Maybe f_shutdown() could get args expected_msg and got_msg, and log those only when present. I don't like this idea. Ideally, `f_shutdown()` should do what its name suggests - shutdown everything. The already existing additional feature for setting the verdict and the respective message by passing optional argument looks ideologically wrong to me. And you're suggesting to overload this function with even more stuff that can be done by calling `setverdict()`. > That would make most sense if ttcn3 could somehow output the exact reason why a msg does not match a template. (So far I just compare manually, or paste into a diff invocation, cumbersome) This can be achieved by adding `TTCN_MATCHING` to the logging mask in the testcase config file. TITAN would highlight the exact message part(s) which did not match the template. Quite useful. > I confirmed that a message dump in the verdict doesn't get picked up properly by logformat. I pasted below a comparison of 'log("FAIL: foo ", msg)' and 'f_shutdown(..., log2str("foo ", msg))'. Did you try what I suggested? If the problem is that TITAN does not format the verdict message (set by `setverdict()`) properly, then I believe TITAN needs to be fixed/improved? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6 Gerrit-Change-Number: 34415 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 18:10:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-msc[master]: make two functions static

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34435?usp=email ) Change subject: make two functions static ...................................................................... make two functions static Change-Id: I1de0f35f1606c997777f34bbf4033e069aadbc64 --- M include/osmocom/msc/mncc.h M src/libmsc/gsm_04_08_cc.c M src/osmo-msc/msc_main.c 3 files changed, 12 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index 8a1e4ad..c8f3bfd 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -219,7 +219,6 @@ const char *get_mncc_name(int value); void mncc_set_cause(struct gsm_mncc *data, int loc, int val); -void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg); /* input from CC code into mncc_builtin */ int int_mncc_recv(struct gsm_network *net, struct msgb *msg); diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 5908db9..6148bbd 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -129,7 +129,7 @@ /* Call Control */ -void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg) +static void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg) { net->mncc_recv(net, msg); } diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 9808e86..913bd21 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -242,8 +242,8 @@ } } -struct gsm_network *msc_network_alloc(void *ctx, - mncc_recv_cb_t mncc_recv) +static struct gsm_network *msc_network_alloc(void *ctx, + mncc_recv_cb_t mncc_recv) { struct gsm_network *net = gsm_network_init(ctx, mncc_recv); if (!net) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1de0f35f1606c997777f34bbf4033e069aadbc64 Gerrit-Change-Number: 34435 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: make mncc_with_sdp := true the default

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34418?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: sip: make mncc_with_sdp := true the default ...................................................................... sip: make mncc_with_sdp := true the default A preceding patch has added mncc_with_sdp, defaulting to false. So far just two new tests use mncc_with_sdp := true, but operation without SDP is now merely the legacy compatibility mode, and I would rather nudge new tests towards mncc_with_sdp := true. So switch the default to mncc_with_sdp := true. Change-Id: Ic9871917c57a9ab81b2fff0af7f569b09015910c --- M sip/SIP_Tests.ttcn 1 file changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/34418/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34418?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: Ic9871917c57a9ab81b2fff0af7f569b09015910c Gerrit-Change-Number: 34418 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: drop unused var

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34414?usp=email ) Change subject: sip: drop unused var ...................................................................... sip: drop unused var Change-Id: Id09760238c0e46de2c06e2cc5e7cfd1ffe84cb64 --- M sip/SIP_Tests.ttcn 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 1e3c43f..58000d5 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -192,7 +192,6 @@ function f_establish_mt(inout CallPars cp) runs on ConnHdlr { var template SipAddr sip_addr_gsm := tr_SipAddr_from_val(cp.comp.sip_url_gsm); var template SipAddr sip_addr_ext := tr_SipAddr_from_val(cp.comp.sip_url_ext); - var PDU_SIP_Request sip_req; var PDU_SIP_Response sip_resp; var MNCC_PDU mncc; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34414?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: Id09760238c0e46de2c06e2cc5e7cfd1ffe84cb64 Gerrit-Change-Number: 34414 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: tweak log msg

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34413?usp=email ) Change subject: sip: tweak log msg ...................................................................... sip: tweak log msg Change-Id: Icf8a88306bf08d6e0d2c62f6c09ce89b36a40254 --- M sip/SIP_Tests.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 37c158e..1e3c43f 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -212,7 +212,7 @@ cp.mncc_call_id := mncc.u.signal.callref; } [] SIP.receive { - setverdict(fail, "Received unexpected respose"); + setverdict(fail, "Received unexpected SIP response"); SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, cp.comp.sip_seq_nr, omit)); mtc.stop; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34413?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: Icf8a88306bf08d6e0d2c62f6c09ce89b36a40254 Gerrit-Change-Number: 34413 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email ) Change subject: sip: tweak failure reporting for SIP messages ...................................................................... sip: tweak failure reporting for SIP messages Help developers by logging message matching failures in detail. Change-Id: Id48016657ebb83953fe74f65332f318edf8f75e6 --- M sip/SIP_Tests.ttcn 1 file changed, 57 insertions(+), 33 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 58000d5..935eed3 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -188,11 +188,32 @@ g_cp := omit } +altstep as_SIP_expect_resp(template PDU_SIP_Response sip_expect) runs on ConnHdlr +{ + [] SIP.receive(sip_expect); + [] SIP.receive { + log("FAIL: expected SIP message ", sip_expect); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected SIP message"); + } +} + +function f_SIP_expect_req(template PDU_SIP_Request sip_expect) runs on ConnHdlr return PDU_SIP_Request +{ + var PDU_SIP_Request rx; + alt { + [] SIP.receive(sip_expect) -> value rx; + [] SIP.receive { + log("FAIL: expected SIP message ", sip_expect); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected SIP message"); + } + } + return rx; +} + /* Establish a mobile terminated call described in 'cp' */ function f_establish_mt(inout CallPars cp) runs on ConnHdlr { var template SipAddr sip_addr_gsm := tr_SipAddr_from_val(cp.comp.sip_url_gsm); var template SipAddr sip_addr_ext := tr_SipAddr_from_val(cp.comp.sip_url_ext); - var PDU_SIP_Response sip_resp; var MNCC_PDU mncc; /* Ask MNCC_Emulation to "expect" a call to the given called number */ @@ -202,8 +223,8 @@ SIP.send(ts_SIP_INVITE(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, cp.comp.sip_seq_nr, cp.comp.sip_body)); /* OSC -> SIP */ - SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, - "INVITE", 100, ?, "Trying", *)); + as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, + "INVITE", 100, ?, "Trying", *)); alt { /* MSC <- OSC: OSC generates MNCC_SETUP_REQ from INVITE */ @@ -231,33 +252,23 @@ /* MSC -> OSC: After MS is ringing and sent CC ALERTING */ MNCC.send(ts_MNCC_ALERT_ind(cp.mncc_call_id)); SIP.clear; - alt { - [] SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, - "INVITE", 180, ?, "Ringing", *)); - [] SIP.receive { - setverdict(fail, "Received unexpected respose"); - SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, - cp.comp.sip_seq_nr, omit)); - mtc.stop; - } - } + + as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, + "INVITE", 180, ?, "Ringing", *)); /* MSC -> OSC: After MT user has picked up and sent CC CONNECT */ MNCC.send(ts_MNCC_SETUP_CNF(cp.mncc_call_id)); SIP.clear; - interleave { /* MSC <- OSC: OSC asks MSC to connect its RTP stream to remote end */ - [] MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id, f_addrstr2addr(cp.sip_rtp_addr), cp.sip_rtp_port)) {} + MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id, f_addrstr2addr(cp.sip_rtp_addr), cp.sip_rtp_port)); + /* OSC -> SIP: OSC confirms call establishment to SIP side */ - [] SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, ?, - "INVITE", 200, ?, "OK", ?)) -> value sip_resp { - if (not match(sip_resp.messageBody, pattern "*" & cp.cn_rtp_addr & "*")) { - setverdict(fail, "wrong ip addr sent in SIP SDP, not containing ", cp.cn_rtp_addr); - mtc.stop; - } - } - } + as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, contact_addr := ?, + method := "INVITE", status_code := 200, + seq_nr := ?, reason := "OK", + body := pattern "*" & cp.cn_rtp_addr & "*")); + /* OSC <- SIP: SIP world acknowledges "200 OK" */ SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, cp.comp.sip_url_gsm, cp.comp.sip_seq_nr, omit)); @@ -287,12 +298,13 @@ mncc.u.rtp.rtp_port := cp.cn_rtp_port; MNCC.send(mncc); } + /* OSC -> SIP: Send INVITE with GSM side IP/Port in SDP */ - SIP.receive(tr_SIP_INVITE(?, sip_addr_gsm, sip_addr_ext, ?, ?)) -> value sip_req { - cp.comp.sip_url_gsm.params := sip_req.msgHeader.fromField.fromParams; - cp.comp.sip_call_id := sip_req.msgHeader.callId.callid; - seq_nr := sip_req.msgHeader.cSeq.seqNumber; - } + sip_req := f_SIP_expect_req(tr_SIP_INVITE(?, sip_addr_gsm, sip_addr_ext, ?, ?)); + cp.comp.sip_url_gsm.params := sip_req.msgHeader.fromField.fromParams; + cp.comp.sip_call_id := sip_req.msgHeader.callId.callid; + seq_nr := sip_req.msgHeader.cSeq.seqNumber; + /* OSC <- SIP: Notify call is proceeding */ SIP.send(ts_SIP_Response(cp.comp.sip_call_id, cp.comp.sip_url_gsm, cp.comp.sip_url_ext, "INVITE", 100, seq_nr, "Trying", sip_req.msgHeader.via)); @@ -328,10 +340,11 @@ SIP.clear; /* MSC -> OSC: Simulate a CC DISCONNET from the MT user */ MNCC.send(ts_MNCC_DISC_ind(cp.mncc_call_id, ts_MNCC_cause(0))); + /* OSC -> SIP: Expect BYE from OSC to SIP side */ - SIP.receive(tr_SIP_BYE(cp.comp.sip_call_id, sip_addr_gsm, sip_addr_ext, ?, *)) -> value sip_req { - cp.comp.sip_url_gsm.params := sip_req.msgHeader.fromField.fromParams; - } + sip_req := f_SIP_expect_req(tr_SIP_BYE(cp.comp.sip_call_id, sip_addr_gsm, sip_addr_ext, ?, *)); + cp.comp.sip_url_gsm.params := sip_req.msgHeader.fromField.fromParams; + /* OSC <- SIP: Acknowledge the BYE */ SIP.send(ts_SIP_Response(cp.comp.sip_call_id, cp.comp.sip_url_gsm, cp.comp.sip_url_ext, "BYE", 200, sip_req.msgHeader.cSeq.seqNumber, "OK", @@ -354,8 +367,8 @@ /* MSC -> OSC: Indicate GSM side release */ MNCC.send(ts_MNCC_REL_ind(cp.mncc_call_id, ts_MNCC_cause(0))); /* OSC -> SIP: Confirmation to SIP side */ - SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, - "BYE", 200, cp.comp.sip_seq_nr, "OK", omit)); + as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, sip_addr_gsm, *, + "BYE", 200, cp.comp.sip_seq_nr, "OK", omit)); } /* Successful MT Call, which is subsequently released by GSM side */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6 Gerrit-Change-Number: 34415 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: pass CallPars into f_TC_*()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34416?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: sip: pass CallPars into f_TC_*() ...................................................................... sip: pass CallPars into f_TC_*() Move composition of CallPars out of all f_* functions into their TC_* functions, so that future tests can reuse the f_* functions with different CallPars. An upcoming patch wants to call f_TC_mo_success_rel_sip() with different CallPars. Change-Id: Icdcaa7a8a0fadcd6f5715ad052e286b904ded570 --- M sip/SIP_Tests.ttcn 1 file changed, 22 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 935eed3..67e7818 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -410,7 +410,7 @@ /* Successful MT Call, which is subsequently released by SIP side */ private function f_TC_mt_success_rel_sip(charstring id) runs on ConnHdlr { - var CallPars cp := valueof(t_CallPars(false)); + var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & @@ -429,6 +429,7 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); + pars.g_cp := valueof(t_CallPars(false)); vc_conn := f_start_handler(refers(f_TC_mt_success_rel_sip), pars); vc_conn.done; } @@ -473,7 +474,7 @@ /* Successful MO Call, which is subsequently released by SIP side */ private function f_TC_mo_success_rel_sip(charstring id) runs on ConnHdlr { - var CallPars cp := valueof(t_CallPars(true)); + var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & @@ -492,13 +493,14 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); + pars.g_cp := valueof(t_CallPars(is_mo := true)); vc_conn := f_start_handler(refers(f_TC_mo_success_rel_sip), pars); vc_conn.done; } /* SETUP followed by DISC results in lingering B-leg (OS#3518)*/ private function f_TC_mo_setup_disc_late_rtp(charstring id) runs on ConnHdlr { - var CallPars cp := valueof(t_CallPars(true)); + var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & @@ -546,6 +548,7 @@ var ConnHdlr vc_conn; f_init(); pars := valueof(t_Pars); + pars.g_cp := valueof(t_CallPars(is_mo := true)); vc_conn := f_start_handler(refers(f_TC_mo_setup_disc_late_rtp), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34416?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: Icdcaa7a8a0fadcd6f5715ad052e286b904ded570 Gerrit-Change-Number: 34416 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

by neels

Attention is currently required from: fixeria, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email ) Change subject: sip: tweak failure reporting for SIP messages ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: combine votes -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6 Gerrit-Change-Number: 34415 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 14:50:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

by neels

Attention is currently required from: fixeria, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email ) Change subject: sip: tweak failure reporting for SIP messages ...................................................................... Patch Set 2: (1 comment) File sip/SIP_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/ac33c3aa_deff… PS1, Line 195: og("FAIL: expected SIP message ", sip_expect); : setverdict(fail, "Received unexpected SIP message"); > FYI, you can still do it like this: […] Ah interesting, thanks for log2str(), didn't know about it. I'm not sure that f_shutdown() should always dup the log in addition to setverdict(), it only makes sense for logs that contain a message dump. Maybe f_shutdown() could get args expected_msg and got_msg, and log those only when present. That would make most sense if ttcn3 could somehow output the exact reason why a msg does not match a template. (So far I just compare manually, or paste into a diff invocation, cumbersome) I like fixeria's example, f_shutdown() for shutdown only and set the verdict separately. I confirmed that a message dump in the verdict doesn't get picked up properly by logformat. I pasted below a comparison of 'log("FAIL: foo ", msg)' and 'f_shutdown(..., log2str("foo ", msg))'. log from msg dump in setverdict possibly gets mixed up because of double quotes, and it prints the msg twice, so it's very noisy: ``` 16:28:12.217318 5 Misc_Helpers.ttcn:32 setverdict(fail): none -> fail reason: ""SIP_Tests.ttcn:300 : foo { msg_type := MNCC_SETUP_REQ (257), u := { signal := { callref := 5001, bearer_cap := omit, called := { number_type := GSM48_TON_UNKNOWN (0), plan := GSM48_NUMPLAN_E164 (1), presence := GSM48_PRES_IND_ALLOWED (0), screen := GSM48_SCR_IND_NOT_SCREENED (0), number := \"98766\" }, calling := { number_type := GSM48_TON_UNKNOWN (0), plan := GSM48_NUMPLAN_E164 (1), presence := GSM48_PRES_IND_ALLOWED (0), screen := GSM48_SCR_IND_NOT_SCREENED (0), number := \"12345\" }, redirecting := omit, connected := omit, cause := omit, progress := omit, useruser := omit, facility := omit, cccap := omit, ssversion := omit, clir_sup := 0, clir_inv := 0, signal := omit, keypad := omit, more := 0, notify := 0, emergency := omit, imsi := \"\", lchan_type := 0, lchan_mode := 0, gcr := omit, sdp := \"v=0\\r\ o=Osmocom 0 0 IN IP4 1.1.1.1\\r\ s=GSM Call\\r\ c=IN IP4 1.2.3.4\\r\ t=0 0\\r\ m=audio 1234 RTP/AVP 0\\r\ a=rtpmap:0 GSM/8000\\r\ \" } } }"", new component reason: ""SIP_Tests.ttcn:300 : foo { msg_type := MNCC_SETUP_REQ (257), u := { signal := { callref := 5001, bearer_cap := omit, called := { number_type := GSM48_TON_UNKNOWN (0), plan := GSM48_NUMPLAN_E164 (1), presence := GSM48_PRES_IND_ALLOWED (0), screen := GSM48_SCR_IND_NOT_SCREENED (0), number := \"98766\" }, calling := { number_type := GSM48_TON_UNKNOWN (0), plan := GSM48_NUMPLAN_E164 (1), presence := GSM48_PRES_IND_ALLOWED (0), screen := GSM48_SCR_IND_NOT_SCREENED (0), number := \"12345\" }, redirecting := omit, connected := omit, cause := omit, progress := omit, useruser := omit, facility := omit, cccap := omit, ssversion := omit, clir_sup := 0, clir_inv := 0, signal := omit, keypad := omit, more := 0, notify := 0, emergency := omit, imsi := \"\", lchan_type := 0, lchan_mode := 0, gcr := omit, sdp := \"v=0\\r\ o=Osmocom 0 0 IN IP4 1.1.1.1\\r\ s=GSM Call\\r\ c=IN IP4 1.2.3.4\\r\ t=0 0\\r\ m=audio 1234 RTP/AVP 0\\r\ a=rtpmap:0 GSM/8000\\r\ \" } } }"" 16:28:12.217445 5 Misc_Helpers.ttcn:35 Stopping testcase execution from "SIP_Tests.ttcn":300 ``` output from log() looks nice and clean: ``` 16:28:12.217026 5 SIP_Tests.ttcn:299 FAIL: foo { msg_type := MNCC_SETUP_REQ (257), u := { signal := { callref := 5001, bearer_cap := omit, called := { number_type := GSM48_TON_UNKNOWN (0), plan := GSM48_NUMPLAN_E164 (1), presence := GSM48_PRES_IND_ALLOWED (0), screen := GSM48_SCR_IND_NOT_SCREENED (0), number := "98766" }, calling := { number_type := GSM48_TON_UNKNOWN (0), plan := GSM48_NUMPLAN_E164 (1), presence := GSM48_PRES_IND_ALLOWED (0), screen := GSM48_SCR_IND_NOT_SCREENED (0), number := "12345" }, redirecting := omit, connected := omit, cause := omit, progress := omit, useruser := omit, facility := omit, cccap := omit, ssversion := omit, clir_sup := 0, clir_inv := 0, signal := omit, keypad := omit, more := 0, notify := 0, emergency := omit, imsi := "", lchan_type := 0, lchan_mode := 0, gcr := omit, sdp := "v=0\r o=Osmocom 0 0 IN IP4 1.1.1.1\r s=GSM Call\r c=IN IP4 1.2.3.4\r t=0 0\r m=audio 1234 RTP/AVP 0\r a=rtpmap:0 GSM/8000\r " } } } ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6 Gerrit-Change-Number: 34415 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 14:48:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023