neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31708 )
Change subject: msc: CC Re-Est: allow MNCC_RTP_CREATE upon Assgmt
......................................................................
msc: CC Re-Est: allow MNCC_RTP_CREATE upon Assgmt
In f_tc_call_re_establishment_2(), after Assignment Complete, optionally
allow an MNCC_RTP_CREATE.
When Re-Establishing a call, the Assignment Complete usually affects
codec and RTP address, so an MNCC_RTP_CREATE should happen after the
Assignment Complete message.
Current osmo-msc master does not send this MNCC_RTP_CREATE. This is
unlikely to be correct (would be ok if no RTP port changes), likely
omitted due to a bug.
An upcoming patch adds the MNCC_RTP_CREATE in Call Re-Establishment to
osmo-msc.
Related: Ie433db1ba0c46d4b97538a969233c155cefac21c (osmo-msc)
Change-Id: I06d19947ba2e9b6696269db0e4f3d47d4b98bde6
---
M msc/MSC_Tests.ttcn
1 file changed, 31 insertions(+), 0 deletions(-)
Approvals:
neels: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 0372ec7..1767761 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -6670,6 +6670,10 @@
vc_conn.done;
}
+private altstep as_mncc_rx_rtp_create(CallParameters cpars) runs on BSC_ConnHdlr {
+ [] MNCC.receive(tr_MNCC_RTP_CREATE(cpars.mncc_callref));
+}
+
const charstring REEST_LOST_CONNECTION := "REEST_LOST_CONNECTION";
const charstring REEST_CLEARED := "REEST_CLEARED";
@@ -6734,12 +6738,15 @@
* Apparently osmo-msc currently also sends an MDCX to the CN side, just repeating the same configuration that
* is already in use. This test accepts any number of or even lack of MDCX. */
var default ack_mdcx := activate(as_mgcp_ack_all_mdcx(cpars));
+ var default optional_rtp_create := activate(as_mncc_rx_rtp_create(cpars));
BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, tla, codec));
+
/* The call has been fully re-established.
* Let a bit of time pass before hanging up, for everything to settle. */
f_sleep(3.0);
+ deactivate(optional_rtp_create);
deactivate(ack_mdcx);
/* Hang up the call and clear the new, second A connection */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31708
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: I06d19947ba2e9b6696269db0e4f3d47d4b98bde6
Gerrit-Change-Number: 31708
Gerrit-PatchSet: 4
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: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: msuraev.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31708 )
Change subject: msc: CC Re-Est: allow MNCC_RTP_CREATE upon Assgmt
......................................................................
Patch Set 3: Code-Review+2
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31708/comment/94bf95b5_b95d…
PS2, Line 16: Current osmo-msc master does not send this MNCC_RTP_CREATE. This is is
> typo: is is
Done
Patchset:
PS3:
re-add votes after commit log tweak
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31708
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: I06d19947ba2e9b6696269db0e4f3d47d4b98bde6
Gerrit-Change-Number: 31708
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: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 14 Mar 2023 20:17:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: comment
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31771 )
Change subject: error log: osmo_sock_init2_multiaddr() v4/v6 mix
......................................................................
Patch Set 2:
(1 comment)
File src/core/socket.c:
https://gerrit.osmocom.org/c/libosmocore/+/31771/comment/9f9a65ab_030d0e02
PS1, Line 776: ((flags & OSMO_SOCK_F_BIND) && (flags & OSMO_SOCK_F_CONNECT)) &&
: !addrinfo_has_in6addr_any((const struct addrinfo **)res_loc, local_hosts_cnt) &&
: (loc_has_v4addr != rem_has_v4addr || loc_has_v6addr != rem_has_v6addr)) {
> general note about this (unrelated to the patch): It appeasr to ignore IPv4-mapped IPv6 addresses (h […]
i guess we need a new issue for this if it shouldn't be forgotten in this comment...
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31771
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0fd12b08e0788ce3af6dc519ff8c82ad196a115f
Gerrit-Change-Number: 31771
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-Comment-Date: Tue, 14 Mar 2023 20:15:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31771 )
Change subject: error log: osmo_sock_init2_multiaddr() v4/v6 mix
......................................................................
error log: osmo_sock_init2_multiaddr() v4/v6 mix
Provide some more information for the error case when local and remote
addresses mix v4 and v6.
Change-Id: I0fd12b08e0788ce3af6dc519ff8c82ad196a115f
---
M src/core/socket.c
M tests/socket/socket_sctp_test.err
2 files changed, 21 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/core/socket.c b/src/core/socket.c
index 9e0f84e..1b14794 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -776,7 +776,11 @@
if (((flags & OSMO_SOCK_F_BIND) && (flags & OSMO_SOCK_F_CONNECT)) &&
!addrinfo_has_in6addr_any((const struct addrinfo **)res_loc, local_hosts_cnt) &&
(loc_has_v4addr != rem_has_v4addr || loc_has_v6addr != rem_has_v6addr)) {
- LOGP(DLGLOBAL, LOGL_ERROR, "Invalid v4 vs v6 in local vs remote addresses\n");
+ LOGP(DLGLOBAL, LOGL_ERROR, "Invalid v4 vs v6 in local vs remote addresses: "
+ "local:%s%s remote:%s%s\n",
+ loc_has_v4addr ? " v4" : "", loc_has_v6addr ? " v6" : "",
+ rem_has_v4addr ? " v4" : "", rem_has_v6addr ? " v6" : ""
+ );
rc = -EINVAL;
goto ret_freeaddrinfo;
}
diff --git a/tests/socket/socket_sctp_test.err b/tests/socket/socket_sctp_test.err
index 996d092..7583a2a 100644
--- a/tests/socket/socket_sctp_test.err
+++ b/tests/socket/socket_sctp_test.err
@@ -1,8 +1,8 @@
invalid: you have to specify either BIND or CONNECT flags
-Invalid v4 vs v6 in local vs remote addresses
-Invalid v4 vs v6 in local vs remote addresses
+Invalid v4 vs v6 in local vs remote addresses: local: v4 remote: v6
+Invalid v4 vs v6 in local vs remote addresses: local: v6 remote: v4
invalid: you have to specify either BIND or CONNECT flags
-Invalid v4 vs v6 in local vs remote addresses
-Invalid v4 vs v6 in local vs remote addresses
+Invalid v4 vs v6 in local vs remote addresses: local: v4 remote: v6
+Invalid v4 vs v6 in local vs remote addresses: local: v6 remote: v4
getaddrinfo(::1, 0) failed: Address family for hostname not supported
getaddrinfo(127.0.0.1, 0) failed: Address family for hostname not supported
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31771
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0fd12b08e0788ce3af6dc519ff8c82ad196a115f
Gerrit-Change-Number: 31771
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-MessageType: merged