February 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp4_act_update_teid/teic

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27197 ) Change subject: ggsn: Introduce test TC_pdp4_act_update_teid/teic ...................................................................... ggsn: Introduce test TC_pdp4_act_update_teid/teic This test validates that changing the local TEID through UpdatePDPContext is correctly followed by the GGSN. Change-Id: Ic6af25866bf7efc2cabf029e49abaf15d5857592 --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 160 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 8f4e709..48e87bf 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -376,6 +376,22 @@ } } + function f_handle_update_req(inout PdpContext ctx, in Gtp1cUnitdata ud, in OCT1 exp_cause := '80'O) runs on GT_CT { + var UpdatePDPContextResponseGGSN upr := ud.gtpc.gtpc_pdu.updatePDPContextResponse.updatePDPContextResponseGGSN; + if (exp_cause == '80'O and exp_cause == upr.cause.causevalue) { + ctx.teid_remote := upr.teidDataI.teidDataI; + ctx.teic_remote := upr.teidControlPlane.teidControlPlane; + if (ispresent(upr.protConfigOptions)) { + ctx.pco_neg := upr.protConfigOptions; + } + setverdict(pass); + } else if (exp_cause != '80'O and exp_cause == upr.cause.causevalue) { + setverdict(pass); + } else { + setverdict(fail); + } + } + private altstep as_DIA_CCR(DCC_NONE_CC_Request_Type req_type) runs on GT_CT { var PDU_DIAMETER rx_dia; [] DIAMETER_UNIT.receive(tr_DIA_CCR(req_type := req_type)) -> value rx_dia { @@ -481,6 +497,34 @@ deactivate(d); T_default.stop; } + + /* send a Update PdP Context Request, expect Response */ + function f_pdp_ctx_update(inout PdpContext ctx, OCT1 exp_cause := '80'O, template (omit) OCT4 new_teid := omit, template (omit) OCT4 new_teic := omit) runs on GT_CT { + var Gtp1cUnitdata ud; + var default d; + + if (not istemplatekind(new_teid, "omit")) { + ctx.teid := valueof(new_teid); + } + if (not istemplatekind(new_teic, "omit")) { + ctx.teic := valueof(new_teic); + } + + log("sending UpdatePDP"); + f_send_gtpc(ts_GTPC_UpdatePDP(g_peer_c, ctx.teic_remote, g_c_seq_nr, ctx.imsi, g_restart_ctr, + ctx.teid, ctx.teic, ctx.nsapi, g_sgsn_ip_c, g_sgsn_ip_u, + ctx.pco_req, ctx.ratType, ctx.uli)); + T_default.start; + d := activate(pingpong()); + alt { + [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, updatePDPContextResponse, ctx.teic)) -> value ud { + f_handle_update_req(ctx, ud, exp_cause); + } + } + deactivate(d); + T_default.stop; + } + /* IPv6 router solicitation fe80::2 -> ff02::2 from 02:88:b5:1f:25:59 */ const octetstring c_router_solicit := '6000000000103afffe800000000000000000000000000002ff02000000000000000000000000000285009f2b0000000001010288b51f2559'O; /* IPv6 neighbor solicitation fe80::2 -> ff02::1:ff00:2 from 02:88:b5:1f:25:59 */ @@ -810,7 +854,7 @@ var Gtp1uUnitdata ud; T_default.start; alt { - [] GTPU.receive(tr_GTPU_GPDU(g_peer_u, ?)) -> value ud { + [] GTPU.receive(tr_GTPU_GPDU(g_peer_u, ctx.teid)) -> value ud { if (f_verify_gtpu_txseq(ud.gtpu, use_gtpu_txseq) == false) { setverdict(fail); stop; @@ -825,6 +869,10 @@ repeat; } } + [] GTPU.receive(tr_GTPU_GPDU(g_peer_u, ?)) -> value ud { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Received wrong local TEID"); + } [] GTPU.receive { setverdict(fail); } [] T_default.timeout { setverdict(fail); } } @@ -1384,6 +1432,48 @@ f_pdp_ctx_del(ctx, '1'B); } + /* Validate that SUT updates remote TEIC when requested through UpdatePDPContextRequest */ + testcase TC_pdp4_act_update_teic() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + /* UpdatePDPContestRequest changing the local TEIC */ + var OCT4 new_teic := ctx.teic; + new_teic[3] := new_teic[3] xor4b '11'O; + f_pdp_ctx_update(ctx, new_teic := new_teic); + + f_pdp_ctx_del(ctx, '1'B); + } + + /* Validate that SUT updates remote TEID when requested through UpdatePDPContextRequest */ + testcase TC_pdp4_act_update_teid() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + f_PCO_ensure_no_duplicates(ctx.pco_neg); + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4.ipv4_address; + + /* Data is sent (back) to the local TEID established during CreatePDPContext */ + f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); + f_wait_icmp4_echo_reply(ctx); + + /* UpdatePDPContestRequest changing the local TEID */ + var OCT4 new_teid := ctx.teid; + new_teid[3] := new_teid[3] xor4b '11'O; + f_pdp_ctx_update(ctx, new_teid := new_teid); + + /* Check if we can send data after updating the PDP context. Answer should be sent to the new TEID */ + f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); + f_wait_icmp4_echo_reply(ctx); + + f_pdp_ctx_del(ctx, '1'B); + } + /* Test IPv4v6 context activation for dynamic IPv4v6 EUA without DNS request */ testcase TC_pdp46_act_deact() runs on GT_CT { f_init(); @@ -1717,6 +1807,8 @@ execute(TC_pdp4_clients_interact_without_txseq()); execute(TC_pdp4_act_deact_with_single_dns()); execute(TC_pdp4_act_deact_with_separate_dns()); + execute(TC_pdp4_act_update_teic()); + execute(TC_pdp4_act_update_teid()); execute(TC_pdp6_act_deact()); execute(TC_pdp6_act_deact_pcodns()); diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 0a9c5e9..73d0bf0 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -394,6 +394,73 @@ } + template GTPC_PDUs ts_UpdatePdpPDU(hexstring imsi, OCT1 restart_ctr, OCT4 teid_data, OCT4 teid_ctrl, + BIT4 nsapi, + octetstring sgsn_ip_sign, octetstring sgsn_ip_data, + template ProtConfigOptions pco := omit, + template (omit) OCT1 ratType := omit, + template (omit) UserLocationInformation uli := omit) := { + updatePDPContextRequest := { + updatePDPContextRequestSGSN := { + imsi := ts_Imsi(imsi), + rai := omit, + recovery := ts_Recovery(restart_ctr), + teidDataI := { + type_gtpc := '00'O, + teidDataI := teid_data + }, + teidControlPlane := { + type_gtpc := '00'O, + teidControlPlane := teid_ctrl + }, + nsapi := { + type_gtpc := '00'O, + nsapi := nsapi, + unused := '0000'B + }, + trace_ref := omit, + trace_type := omit, + protConfigOptions := pco, + sgsn_addr_controlPlane := ts_GsnAddr(sgsn_ip_sign), + sgsn_addr_traffic := ts_GsnAddr(sgsn_ip_data), + alt_ggsn_addr_controlPane := omit, + alt_ggsn_addr_traffic := omit, + qualityOfServiceProfile := ts_QosDefault, + tft := omit, + triggerId := omit, + omcId := omit, + commonFlags := omit, + ratType := f_ts_RATType(ratType), + userLocationInformation := uli, + mS_TimeZone := omit, + additionalTraceInfo := omit, + directTunnelFlags := omit, + evolvedAllocationRetentionPriorityI := omit, + extendedCommonFlags := omit, + userCSGInformation := omit, + aPN_AMBR := omit, + signallingPriorityIndication := omit, + cN_OperatorSelectionEntity := omit, + private_extension_gtpc := omit + } + } + } + + template Gtp1cUnitdata ts_GTPC_UpdatePDP(GtpPeer peer, OCT4 teid, uint16_t seq, hexstring imsi, + OCT1 restart_ctr, OCT4 teid_data, + OCT4 teid_ctrl, BIT4 nsapi, octetstring sgsn_ip_sign, + octetstring sgsn_ip_data, + template ProtConfigOptions pco := omit, + template (omit) OCT1 ratType := omit, + template (omit) UserLocationInformation uli := omit) := { + peer := peer, + gtpc := ts_GTP1C_PDU(updatePDPContextRequest, teid, + valueof(ts_UpdatePdpPDU(imsi, restart_ctr, teid_data, teid_ctrl, + nsapi, sgsn_ip_sign, + sgsn_ip_data, pco, ratType, uli)), seq) + } + + template NSAPI_GTPC ts_NSAPI(BIT4 nsapi) := { type_gtpc := '14'O, nsapi := nsapi, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27197 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: Ic6af25866bf7efc2cabf029e49abaf15d5857592 Gerrit-Change-Number: 27197 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp4_act_update_teid/teic

by pespin

Attention is currently required from: neels, fixeria, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27197 ) Change subject: ggsn: Introduce test TC_pdp4_act_update_teid/teic ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27197 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: Ic6af25866bf7efc2cabf029e49abaf15d5857592 Gerrit-Change-Number: 27197 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Feb 2022 17:29:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in libosmocore[master]: gsm: [ABI BREAK] Support CellId SAI, change CellId CGI-PS id number

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27224 ) Change subject: gsm: [ABI BREAK] Support CellId SAI, change CellId CGI-PS id number ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id25e563febdb7640174540136225f399515a0089 Gerrit-Change-Number: 27224 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Feb 2022 17:21:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in libosmocore[master]: gsm0808: Test if we properly decode a SRVCC cell identifier list

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27212 ) Change subject: gsm0808: Test if we properly decode a SRVCC cell identifier list ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I608220e8e5dd5a44f85c6bc5ea04622a2cad24ec Gerrit-Change-Number: 27212 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Feb 2022 17:20:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in libosmocore[master]: gsm: [ABI BREAK] Support CellId SAI, change CellId CGI-PS id number

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27224 ) Change subject: gsm: [ABI BREAK] Support CellId SAI, change CellId CGI-PS id number ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id25e563febdb7640174540136225f399515a0089 Gerrit-Change-Number: 27224 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Feb 2022 17:20:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-mgw[master]: mgcp_codec: do not differentiate between oa and bwe when comparing codec

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27223 ) Change subject: mgcp_codec: do not differentiate between oa and bwe when comparing codec ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: I have the feeling this patch is going in the wrong direction. or maybe it's that other stuff is missing in osmo-mgw. See a sample of an SDP: """ MDCX 1817 rtpbridge/1@mgw MGCP 1.0 C: 10a I: 1654DE0D M: sendrecv v=0 o=- 10a 23 IN IP4 127.0.0.1 s=- c=IN IP4 192.168.33.2 t=0 0 m=audio 17076 RTP/AVP 98 a=fmtp:98 octet-align=1 a=rtpmap:98 AMR/8000/1 a=ptime:20 """ So IIUC that means: Hey I have a peer available on 192.168.33.2:17076 which wants to talk AMR OA using Payload Type 98. The peer could also announce support for AMR BE in a different Payload Type if he wanted: """ a=fmtp:99 octet-align=0 a=rtpmap:99 AMR/8000/1 """ So my understanding is that octet_aligned information should be checked when picking up the proper Payload Type. With your patch, IIUC, you would pick the first one, regardless of the AMR OA/BE support announced by the peer? So ideally you should first check if the BE/OA info matches,and if not, pick one even if it doesn't match, and do "transcoding" BE<->OA. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I64731570c287a75d39c79c10e1bc09a37bdd54d6 Gerrit-Change-Number: 27223 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Feb 2022 17:13:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-mgw[2021q4]: mgcp_codec: do not differentiate between oa and bwe when comparing codec

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27227 ) Change subject: mgcp_codec: do not differentiate between oa and bwe when comparing codec ...................................................................... mgcp_codec: do not differentiate between oa and bwe when comparing codec AMR that has the payload format bandwith-efficient is the same codec as AMR that has the payload format octet-aligned. Its the same codec, and a comparison of the codec info with the function codecs_same() should return true (=equal). The affected function codecs_same() is used by mgcp_codec_pt_translate(). When the egress payload type number is looked up, the ingress and egress codec information is compared. When one end is using AMR in bandwith-efficient format and the other end is using it in octet-alingned format. Then the codec still must be recognized as the same codec. Othersiwse the payload type number translation would not work, even though the codec is the same on both sides. Change-Id: I64731570c287a75d39c79c10e1bc09a37bdd54d6 Related: SYS#5834 --- M src/libosmo-mgcp/mgcp_codec.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 13 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 1b835c9..36a64f9 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -378,10 +378,10 @@ return false; if (strcmp(codec_a->subtype_name, codec_b->subtype_name)) return false; - if (!strcmp(codec_a->subtype_name, "AMR")) { - if (mgcp_codec_amr_is_octet_aligned(codec_a) != mgcp_codec_amr_is_octet_aligned(codec_b)) - return false; - } + + /* Note: AMR allows to set the RTP payload format to octet-aligned or bandwith-efficient (octet-aligned=0) + * via SDP. This difference concerns payload format only, but not the actual codec. It is not a difference + * within the meaning of this function. */ return true; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index a8aad14..e6ff0a5 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1896,16 +1896,13 @@ .codecs = { { { 111, "AMR/8000", &amr_param_octet_aligned_true, }, - { 112, "AMR/8000", &amr_param_octet_aligned_false, }, }, { { 122, "AMR/8000", &amr_param_octet_aligned_false, }, - { 121, "AMR/8000", &amr_param_octet_aligned_true, }, }, }, .expect = { - { .payload_type_map = {111, 121}, }, - { .payload_type_map = {112, 122} }, + { .payload_type_map = {111, 122}, }, { .end = true }, }, }, @@ -1914,15 +1911,13 @@ .codecs = { { { 111, "AMR/8000", &amr_param_octet_aligned_true, }, - { 112, "AMR/8000", &amr_param_octet_aligned_false, }, }, { { 122, "AMR/8000", &amr_param_octet_aligned_unset, }, }, }, .expect = { - { .payload_type_map = {111, -EINVAL}, }, - { .payload_type_map = {112, 122} }, + { .payload_type_map = {111, 122}, }, { .end = true }, }, }, @@ -1931,15 +1926,13 @@ .codecs = { { { 111, "AMR/8000", &amr_param_octet_aligned_true, }, - { 112, "AMR/8000", &amr_param_octet_aligned_false, }, }, { { 122, "AMR/8000", NULL, }, }, }, .expect = { - { .payload_type_map = {111, -EINVAL}, }, - { .payload_type_map = {112, 122} }, + { .payload_type_map = {111, 122}, }, { .end = true }, }, }, diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 94fada3..5b8d558 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1347,32 +1347,24 @@ #5: test AMR with differing octet-aligned settings - add codecs on conn0: 0: 111 AMR/8000 octet-aligned=1 -> rc=0 - 1: 112 AMR/8000 octet-aligned=0 -> rc=0 - add codecs on conn1: 0: 122 AMR/8000 octet-aligned=0 -> rc=0 - 1: 121 AMR/8000 octet-aligned=1 -> rc=0 - - mgcp_codec_pt_translate(conn0, conn1, 111) -> 121 - - mgcp_codec_pt_translate(conn1, conn0, 121) -> 111 - - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 - - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 122 + - mgcp_codec_pt_translate(conn1, conn0, 122) -> 111 #6: test AMR with missing octet-aligned settings (defaults to 0) - add codecs on conn0: 0: 111 AMR/8000 octet-aligned=1 -> rc=0 - 1: 112 AMR/8000 octet-aligned=0 -> rc=0 - add codecs on conn1: 0: 122 AMR/8000 octet-aligned=unset -> rc=0 - - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 - - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 - - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 122 + - mgcp_codec_pt_translate(conn1, conn0, 122) -> 111 #7: test AMR with NULL param (defaults to 0) - add codecs on conn0: 0: 111 AMR/8000 octet-aligned=1 -> rc=0 - 1: 112 AMR/8000 octet-aligned=0 -> rc=0 - add codecs on conn1: 0: 122 AMR/8000 -> rc=0 - - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22 - - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122 - - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112 + - mgcp_codec_pt_translate(conn0, conn1, 111) -> 122 + - mgcp_codec_pt_translate(conn1, conn0, 122) -> 111 #8: match FOO/8000/1 and FOO/8000 as identical, single channel is implicit - add codecs on conn0: 0: 0 PCMU/8000/1 -> rc=0 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: 2021q4 Gerrit-Change-Id: I64731570c287a75d39c79c10e1bc09a37bdd54d6 Gerrit-Change-Number: 27227 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-mgw[2021q4]: mgcp_codec: do not differentiate between oa and bwe when comparing codec

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27227 ) Change subject: mgcp_codec: do not differentiate between oa and bwe when comparing codec ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: 2021q4 Gerrit-Change-Id: I64731570c287a75d39c79c10e1bc09a37bdd54d6 Gerrit-Change-Number: 27227 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Feb 2022 17:04:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-mgw[2021q4]: Make function amr_is_octet_aligned publicly available

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27229 ) Change subject: Make function amr_is_octet_aligned publicly available ...................................................................... Make function amr_is_octet_aligned publicly available it will be used by mgcp_iuup.c in follow-up patch. Change-Id: Iffaf90c1f713feef0c609a7581a346f5f28141d9 --- M include/osmocom/mgcp/mgcp_codec.h M src/libosmo-mgcp/mgcp_codec.c 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/mgcp/mgcp_codec.h b/include/osmocom/mgcp/mgcp_codec.h index 97650e4..97e6b8d 100644 --- a/include/osmocom/mgcp/mgcp_codec.h +++ b/include/osmocom/mgcp/mgcp_codec.h @@ -17,3 +17,4 @@ int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type); const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn, const char *subtype_name, unsigned int match_nr); +bool mgcp_codec_amr_is_octet_aligned(const struct mgcp_rtp_codec *codec); diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 7ab2a17..1b835c9 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -355,7 +355,7 @@ * * https://tools.ietf.org/html/rfc4867 */ -static bool amr_is_octet_aligned(const struct mgcp_rtp_codec *codec) +bool mgcp_codec_amr_is_octet_aligned(const struct mgcp_rtp_codec *codec) { if (!codec->param_present) return false; @@ -379,7 +379,7 @@ if (strcmp(codec_a->subtype_name, codec_b->subtype_name)) return false; if (!strcmp(codec_a->subtype_name, "AMR")) { - if (amr_is_octet_aligned(codec_a) != amr_is_octet_aligned(codec_b)) + if (mgcp_codec_amr_is_octet_aligned(codec_a) != mgcp_codec_amr_is_octet_aligned(codec_b)) return false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: 2021q4 Gerrit-Change-Id: Iffaf90c1f713feef0c609a7581a346f5f28141d9 Gerrit-Change-Number: 27229 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-mgw[2021q4]: Make function amr_is_octet_aligned publicly available

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27229 ) Change subject: Make function amr_is_octet_aligned publicly available ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: 2021q4 Gerrit-Change-Id: Iffaf90c1f713feef0c609a7581a346f5f28141d9 Gerrit-Change-Number: 27229 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Feb 2022 17:02:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022