[M] Change in osmo-msc[master]: fix msc_vlr_test_call SDP mncc_rtp

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32068 ) Change subject: fix msc_vlr_test_call SDP mncc_rtp ...................................................................... fix msc_vlr_test_call SDP mncc_rtp In msc_vlr_test_call, we fail to send the right MNCC struct for MNCC_RTP_CREATE. We should pass a struct gsm_mncc_rtp. Fix that. Change-Id: Ia0b3253f85c716e45f925da3f58f025af1f15ec9 --- M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err 2 files changed, 51 insertions(+), 16 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/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 2c67c1e..cb3c77b 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -207,6 +207,7 @@ struct gsm_mncc mncc = { .imsi = IMSI, }; + struct gsm_mncc_rtp mncc_rtp = {}; comment_start(); @@ -259,10 +260,10 @@ cc_to_mncc_expect_tx(IMSI, MNCC_SETUP_IND); crcx_ok(RTP_TO_CN); OSMO_ASSERT(cc_to_mncc_tx_confirmed); - mncc.callref = cc_to_mncc_tx_got_callref; + mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment"); expect_iu_rab_assignment(); @@ -351,6 +352,10 @@ "a=ptime:20\r\n", }; + struct gsm_mncc_rtp mncc_rtp = { + .callref = 0x423, + }; + comment_start(); fake_time_start(); @@ -406,7 +411,7 @@ ms_sends_assignment_complete("AMR"); btw("MNCC sends MNCC_RTP_CREATE, which first waits for the CN side RTP"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("When the CN side RTP address is known, ack MNCC_RTP_CREATE with full SDP"); cc_to_mncc_expect_tx("", MNCC_RTP_CREATE); @@ -477,6 +482,19 @@ "a=ptime:20\r\n", }; + struct gsm_mncc_rtp mncc_rtp = { + .callref = 0x423, + .sdp = "v=0\r\n" + "o=OsmoMSC 0 0 IN IP4 10.23.23.1\r\n" + "s=GSM Call\r\n" + "c=IN IP4 10.23.23.1\r\n" + "t=0 0\r\n" + "m=audio 23 RTP/AVP 112\r\n" + "a=rtpmap:112 AMR/8000\r\n" + "a=fmtp:112 octet-align=1\r\n" + "a=ptime:20\r\n", + }; + comment_start(); fake_time_start(); @@ -522,7 +540,7 @@ OSMO_ASSERT(cc_to_mncc_tx_confirmed); btw("MNCC sends MNCC_RTP_CREATE, which first waits for the CN side RTP"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX to RAN, triggering Assignment"); expect_iu_rab_assignment(); @@ -570,6 +588,8 @@ .imsi = IMSI, }; + struct gsm_mncc_rtp mncc_rtp = {}; + comment_start(); fake_time_start(); @@ -621,10 +641,10 @@ cc_to_mncc_expect_tx(IMSI, MNCC_SETUP_IND); crcx_ok(RTP_TO_CN); OSMO_ASSERT(cc_to_mncc_tx_confirmed); - mncc.callref = cc_to_mncc_tx_got_callref; + mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment"); expect_iu_rab_assignment(); @@ -665,6 +685,7 @@ struct gsm_mncc mncc = { .imsi = IMSI, }; + struct gsm_mncc_rtp mncc_rtp = {}; comment_start(); @@ -717,10 +738,10 @@ cc_to_mncc_expect_tx(IMSI, MNCC_SETUP_IND); crcx_ok(RTP_TO_CN); OSMO_ASSERT(cc_to_mncc_tx_confirmed); - mncc.callref = cc_to_mncc_tx_got_callref; + mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment"); expect_iu_rab_assignment(); @@ -1171,7 +1192,7 @@ .imsi = IMSI, }; - struct gsm_mncc_rtp *mncc_rtp = (void *)&mncc; + struct gsm_mncc_rtp mncc_rtp = {}; BTW("======================== MO call: %s", t->desc); btw("CM Service Request with Codec List (BSS Supported) =%s", @@ -1205,12 +1226,12 @@ cc_to_mncc_expect_tx(IMSI, MNCC_SETUP_IND); crcx_ok(RTP_TO_CN); OSMO_ASSERT(cc_to_mncc_tx_confirmed); - mncc.callref = cc_to_mncc_tx_got_callref; + mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; VALIDATE_SDP(cc_to_mncc_tx_last_sdp, t->mo_tx_sdp_mncc_setup_ind); btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); - sdp_str_from_subtype_names(mncc_rtp->sdp, sizeof(mncc_rtp->sdp), t->mo_rx_sdp_mncc_rtp_create); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + sdp_str_from_subtype_names(mncc_rtp.sdp, sizeof(mncc_rtp.sdp), t->mo_rx_sdp_mncc_rtp_create); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment with%s", perm_speech_name(t->mo_tx_assignment_perm_speech)); expect_bssap_assignment(); @@ -1283,7 +1304,9 @@ .speech_ver = { GSM48_BCAP_SV_FR, -1, }, }, }; - struct gsm_mncc_rtp *mncc_rtp = (void *)&mncc; + struct gsm_mncc_rtp mncc_rtp = { + .callref = 0x423, + }; BTW("======================== MT call: %s", t->desc); @@ -1373,8 +1396,8 @@ ms_sends_assignment_complete(t->mt_rx_assigned_codec); btw("MNCC sends MNCC_RTP_CREATE, which first waits for the CN side RTP"); - sdp_str_from_subtype_names(mncc_rtp->sdp, sizeof(mncc_rtp->sdp), t->mt_rx_sdp_mncc_rtp_create); - mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc); + sdp_str_from_subtype_names(mncc_rtp.sdp, sizeof(mncc_rtp.sdp), t->mt_rx_sdp_mncc_rtp_create); + mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("When the CN side RTP address is known, ack MNCC_RTP_CREATE"); cc_to_mncc_expect_tx("", MNCC_RTP_CREATE); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 2527ee0..0fb396d 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -1348,7 +1348,7 @@ a=fmtp:112 octet-align=1 a=ptime:20 -DMNCC trans(CC:MO_TERM_CALL_CONF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) rx MNCC_RTP_CREATE +DMNCC trans(CC:MO_TERM_CALL_CONF IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) rx MNCC_RTP_CREATE (RTP=10.23.23.1:23{AMR:octet-align=1#112}) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Assignment for this trans already started earlier - MGW acknowledges the CRCX to RAN, triggering Assignment MGW --CRCX OK to RTP_TO_RAN--> MSC -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia0b3253f85c716e45f925da3f58f025af1f15ec9 Gerrit-Change-Number: 32068 Gerrit-PatchSet: 1 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