July 2024 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-abis[master]: build config: add --disable-ortp option

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email ) Change subject: build config: add --disable-ortp option ...................................................................... build config: add --disable-ortp option Having ortp as a mandatory dependency for Osmocom CNI suite is very burdensome for users of OS distributions that don't provide zero-effort readily installable packages for every piece of software under the sun. Furthermore, the actual usage of this dependency in Osmocom is quite minimal: in a complete Osmocom 2G network, only OsmoBTS uses the osmo_ortp layer provided by libosmo-abis, and even that dependency may become optional in the future if we implement an alternative jitter buffer mechanism natively in Osmocom. Add --disable-ortp option to libosmo-abis configure that does what it says, similar to the numerous --disable-* options in libosmocore. When libosmo-abis is built with this option, osmo_ortp module is excluded from libosmotrau, and <osmocom/trau/osmo_ortp.h> is omitted from the installation. Packages that require osmo_ortp will then fail to build, but other Osmocom CNI components that require libosmoabis and/or libosmotrau (but not osmo_ortp) will build and work with ortp dependency eliminated. Related: OS#6474 Change-Id: I554260483b94d812ac3a957c969a902870f53883 --- M configure.ac M include/Makefile.am M src/Makefile.am 3 files changed, 94 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified falconia: Looks good to me, approved fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 085bb83..cab95cf 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,20 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.9.0) PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.9.0) -PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) + +AC_ARG_ENABLE([ortp], [AS_HELP_STRING([--disable-ortp], [Build without ortp support])], + [ + ENABLE_ORTP=$enableval + ], + [ + ENABLE_ORTP="yes" + ]) +AS_IF([test "x$ENABLE_ORTP" = "xyes"], [ + PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) + AC_DEFINE([HAVE_ORTP],[1],[Build with ortp support]) +]) +AM_CONDITIONAL(ENABLE_ORTP, test "x$ENABLE_ORTP" = "xyes") +AC_SUBST(ENABLE_ORTP) AC_ARG_ENABLE([dahdi], AC_HELP_STRING([--disable-dahdi], @@ -134,45 +147,50 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi -_cflags_save=$CFLAGS -CFLAGS="$CFLAGS $ORTP_CFLAGS" -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <ortp/ortp.h>]], - [[ortp_set_log_level_mask(NULL, 0xffff);]] - )], - [AC_DEFINE([HAVE_ORTP_LOG_DOMAIN], [1], - [ortp_set_log_level_mask requires domain parameter])], - [AC_DEFINE([HAVE_ORTP_LOG_DOMAIN], [0], - [ortp_set_log_level_mask has no domain parameter])]) -CFLAGS=$_cflags_save +if test x"$ENABLE_ORTP" = x"yes" +then -_cflags_save=$CFLAGS -CFLAGS="$CFLAGS $ORTP_CFLAGS -Werror" -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <ortp/ortp.h> - void fake_cb(struct _RtpSession *r, void *arg1, void *arg2, void *arg3) { return; }]], - [[rtp_session_signal_connect(NULL, "", fake_cb, (void*) fake_cb);]] - )], - [AC_DEFINE([RTP_SIGNAL_PTR_CAST(arg)], [(void*)(arg)], - [rtp_session_signal_connect requires pointer parameter])], - [AC_DEFINE([RTP_SIGNAL_PTR_CAST(arg)], [(unsigned long)(arg)], - [rtp_session_signal_connect requires ulong parameter])]) -CFLAGS=$_cflags_save + _cflags_save=$CFLAGS + CFLAGS="$CFLAGS $ORTP_CFLAGS" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <ortp/ortp.h>]], + [[ortp_set_log_level_mask(NULL, 0xffff);]] + )], + [AC_DEFINE([HAVE_ORTP_LOG_DOMAIN], [1], + [ortp_set_log_level_mask requires domain parameter])], + [AC_DEFINE([HAVE_ORTP_LOG_DOMAIN], [0], + [ortp_set_log_level_mask has no domain parameter])]) + CFLAGS=$_cflags_save -_cflags_save=$CFLAGS -CFLAGS="$CFLAGS $ORTP_CFLAGS" -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <ortp/ortp.h>]], - [[OrtpMemoryFunctions memfn = { };]] - )], - [AC_DEFINE([HAVE_ORTP_MEM_FUNC], [1], - [OrtpMemoryFunctions is available, will use talloc])], - [AC_DEFINE([HAVE_ORTP_MEM_FUNC], [0], - [OrtpMemoryFunctions is not available])]) -CFLAGS=$_cflags_save + _cflags_save=$CFLAGS + CFLAGS="$CFLAGS $ORTP_CFLAGS -Werror" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <ortp/ortp.h> + void fake_cb(struct _RtpSession *r, void *arg1, void *arg2, void *arg3) { return; }]], + [[rtp_session_signal_connect(NULL, "", fake_cb, (void*) fake_cb);]] + )], + [AC_DEFINE([RTP_SIGNAL_PTR_CAST(arg)], [(void*)(arg)], + [rtp_session_signal_connect requires pointer parameter])], + [AC_DEFINE([RTP_SIGNAL_PTR_CAST(arg)], [(unsigned long)(arg)], + [rtp_session_signal_connect requires ulong parameter])]) + CFLAGS=$_cflags_save + + _cflags_save=$CFLAGS + CFLAGS="$CFLAGS $ORTP_CFLAGS" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <ortp/ortp.h>]], + [[OrtpMemoryFunctions memfn = { };]] + )], + [AC_DEFINE([HAVE_ORTP_MEM_FUNC], [1], + [OrtpMemoryFunctions is available, will use talloc])], + [AC_DEFINE([HAVE_ORTP_MEM_FUNC], [0], + [OrtpMemoryFunctions is not available])]) + CFLAGS=$_cflags_save + +fi # ENABLE_ORTP AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) diff --git a/include/Makefile.am b/include/Makefile.am index a167ef2..88d66dc 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -3,9 +3,12 @@ nobase_include_HEADERS = osmocom/abis/ipa.h osmocom/abis/trau_frame.h \ osmocom/abis/ipa_proxy.h osmocom/abis/ipaccess.h osmocom/abis/abis.h \ osmocom/abis/subchan_demux.h osmocom/abis/e1_input.h \ - osmocom/abis/lapd.h osmocom/abis/lapd_pcap.h osmocom/trau/osmo_ortp.h \ - osmocom/abis/unixsocket_proto.h \ + osmocom/abis/lapd.h osmocom/abis/lapd_pcap.h osmocom/abis/unixsocket_proto.h \ osmocom/trau/trau_frame.h \ osmocom/trau/trau_sync.h \ osmocom/trau/trau_pcu_ericsson.h \ osmocom/trau/trau_rtp.h + +if ENABLE_ORTP +nobase_include_HEADERS += osmocom/trau/osmo_ortp.h +endif diff --git a/src/Makefile.am b/src/Makefile.am index 927d63f..d72601b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,10 +41,13 @@ -no-undefined \ $(NULL) libosmotrau_la_LIBADD = $(COMMONLIBS) $(LIBOSMOCODEC_LIBS) $(ORTP_LIBS) -libosmotrau_la_SOURCES = trau/osmo_ortp.c \ - trau/trau_frame.c \ +libosmotrau_la_SOURCES = trau/trau_frame.c \ trau/trau_pcu_ericsson.c \ trau/trau_sync.c \ trau/trau_rtp_conv.c +if ENABLE_ORTP +libosmotrau_la_SOURCES += trau/osmo_ortp.c +endif + noinst_HEADERS = trau/ubit_buf.h -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36975?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I554260483b94d812ac3a957c969a902870f53883 Gerrit-Change-Number: 36975 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: Set DedicatedBearerStatus to Down when call finishes

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37312?usp=email ) Change subject: asterisk: Set DedicatedBearerStatus to Down when call finishes ...................................................................... asterisk: Set DedicatedBearerStatus to Down when call finishes Update the correct state so that asterisk doesn't believe the bearer is still up. Change-Id: Idf4d250e6edb830fe7e2d85dc15e0b3c4d8c3a8b --- M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn 2 files changed, 34 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/37312/1 diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index f6b6b3e..3dbb81c 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -65,6 +65,9 @@ port Coord_PT COORD; port IMSCoord_PT IMS_COORD; + + /* Store Channel name obtained from Newchannel AMI event: */ + var charstring g_asterisk_chan_name; } const charstring broadcast_sip_extension := "0500"; @@ -688,8 +691,9 @@ ami_msg := f_ami_wait_rx_msg(AMI_CLIENT, tr_AMI_Event_Newchannel(mp_volte_ims_outbound_registration), fail_others := false); + g_asterisk_chan_name := valueof(f_ami_msg_get_value(ami_msg, AMI_FIELD_CHANNEL)); f_ami_action_DedicatedBearerStatus(AMI_CLIENT, - f_ami_msg_get_value(ami_msg, AMI_FIELD_CHANNEL), + g_asterisk_chan_name, "Up", fail_others := false); COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_sip; @@ -769,6 +773,12 @@ COORD.send(COORD_CMD_HANGUP) to vc_conn_sip; IMS_COORD.receive(IMS_COORD_CMD_CALL_FINISHED) from vc_conn_ims; + /* Notify network released dedicated bearer: */ + AMI_CLIENT.clear; + f_ami_action_DedicatedBearerStatus(AMI_CLIENT, + g_asterisk_chan_name, + "Down", fail_others := false); + /* Trigger unregistration: */ f_sleep(1.0); COORD.send(COORD_CMD_UNREGISTER) to vc_conn_sip; @@ -804,6 +814,7 @@ COORD.receive(IMS_COORD_CMD_HANGUP); f_IMS_do_call_hangup(); setverdict(pass); + COORD.send(IMS_COORD_CMD_CALL_FINISHED); as_IMS_unregister(); } @@ -845,11 +856,12 @@ ami_msg := f_ami_wait_rx_msg(AMI_CLIENT, tr_AMI_Event_Newchannel(mp_volte_ims_outbound_registration), fail_others := false); + g_asterisk_chan_name := valueof(f_ami_msg_get_value(ami_msg, AMI_FIELD_CHANNEL)); if (ims_pars.subscr.cp.mt.tx_coord_cmd_session_progress) { IMS_COORD.receive(IMS_COORD_CMD_CALL_SESSION_PROGRESS) from vc_conn_ims; } f_ami_action_DedicatedBearerStatus(AMI_CLIENT, - f_ami_msg_get_value(ami_msg, AMI_FIELD_CHANNEL), + g_asterisk_chan_name, "Up", fail_others := false); IMS_COORD.receive(IMS_COORD_CMD_CALL_ESTABLISHED) from vc_conn_ims; @@ -860,6 +872,13 @@ IMS_COORD.send(IMS_COORD_CMD_HANGUP) to vc_conn_ims; + /* Notify network released dedicated bearer: */ + IMS_COORD.receive(IMS_COORD_CMD_CALL_FINISHED) from vc_conn_ims; + AMI_CLIENT.clear; + f_ami_action_DedicatedBearerStatus(AMI_CLIENT, + g_asterisk_chan_name, + "Down", fail_others := false); + /* Trigger unregistration: */ f_sleep(1.0); AMI_CLIENT.clear; diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 881240b..afa165e 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -166,6 +166,7 @@ boolean support_precondition_ext, boolean require_precondition_ext, SDP_Message peer_sdp optional, + IMS_CallParsMO mo, IMS_CallParsMT mt } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37312?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: Idf4d250e6edb830fe7e2d85dc15e0b3c4d8c3a8b Gerrit-Change-Number: 37312 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: add TC_crcx_iufp_sendrecv and _recvonly

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37283?usp=email ) Change subject: mgw: add TC_crcx_iufp_sendrecv and _recvonly ...................................................................... mgw: add TC_crcx_iufp_sendrecv and _recvonly Test creating a conn in different MGCP ConnectionModes. Related: Related: SYS#6974 SYS#6907 Related: osmo-mgw Ic089485543c5c97a35c7ae24fe0f622bf57d1976 Change-Id: I00fd854f058f7f53e2f579e8481ca2b9253f08e3 --- M mgw/MGCP_Test.ttcn 1 file changed, 65 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: 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 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 7090b34..7d8c235 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2817,6 +2817,56 @@ setverdict(pass); } + /* test valid CRCX with IUFP in a given MGCP ConnectionMode ("sendrecv", "recvonly") */ + function f_tc_crcx_iufp_mode(charstring mgcp_mode) runs on dummy_CT { + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var template MgcpCommand cmd; + var MgcpResponse resp; + var MgcpCallId call_id := '1234'H; + var MgcpConnectionId conn_id; + + f_init(ep); + + /* create the connection on the MGW. + * Start directly in sendrecv mode, with IUFP and a (so far unknown) audio port == 0. + * The MGCP ConnectionMode 'M:' is mandatory in MGCP in a CRCX. Another a=sendrecv exists in SDP. */ + cmd := ts_CRCX(get_next_trans_id(), ep, mgcp_mode, call_id); + cmd.sdp := ts_SDP("127.0.0.2", "127.0.0.1", "23", "42", 0, { "96" }, + { valueof(ts_SDP_rtpmap(96, "VND.3GPP.IUFP/16000")), + valueof(ts_SDP_ptime(20)) }); + resp := mgcp_transceive_mgw(cmd, tr_CRCX_ACK); + conn_id := extract_conn_id(resp); + if (not match(resp.sdp.connection, ts_SDP_connection_IP("127.0.0.1", "IP4"))) { + setverdict(fail, "Wrong RemoteConnection in CRCX ACK", resp.sdp.connection); + } + + /* Add the audio port in a subsequent MDCX. */ + cmd := ts_MDCX(get_next_trans_id(), ep, "sendrecv", call_id, conn_id); + cmd.sdp := ts_SDP("127.0.0.2", "127.0.0.1", "23", "42", 2344, { "96" }, + { valueof(ts_SDP_rtpmap(96, "VND.3GPP.IUFP/16000")), + valueof(ts_SDP_ptime(20)) }); + resp := mgcp_transceive_mgw(cmd, tr_MDCX_ACK); + + if (not ispresent(resp.sdp) or not ispresent(resp.sdp.connection)) { + setverdict(fail, "No RemoteConnection info found in MDCX ACK"); + } + if (not match(resp.sdp.connection, ts_SDP_connection_IP("127.0.0.1", "IP4"))) { + setverdict(fail, "Wrong RemoteConnection in MDCX ACK", resp.sdp.connection); + } + + /* clean-up */ + f_dlcx_ok(ep, call_id); + setverdict(pass); + } + + testcase TC_crcx_iufp_sendrecv() runs on dummy_CT { + f_tc_crcx_iufp_mode("sendrecv"); + } + + testcase TC_crcx_iufp_recvonly() runs on dummy_CT { + f_tc_crcx_iufp_mode("recvonly"); + } + /* create two local emulations and pass data in both directions */ function f_two_crcx_mdcx_data_transfer(MgcpEndpoint ep, MgcpCallId call_id, inout RtpFlowData flow_a, inout RtpFlowData flow_b, boolean tear_down_rtp := true) runs on dummy_CT { @@ -3356,6 +3406,8 @@ execute(TC_crcx_mdcx_ip4()); execute(TC_crcx_mdcx_ip6()); + execute(TC_crcx_iufp_sendrecv()); + execute(TC_crcx_iufp_recvonly()); execute(TC_two_crcx_mdcx_and_rtp_ipv4_ipv6()); execute(TC_two_crcx_mdcx_and_rtp_ipv6()); execute(TC_two_crcx_and_rtp_osmux_bidir_ipv6()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37283?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: I00fd854f058f7f53e2f579e8481ca2b9253f08e3 Gerrit-Change-Number: 37283 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Validate Accept header in MO INVITE

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37313?usp=email ) Change subject: asterisk: IMS: Validate Accept header in MO INVITE ...................................................................... asterisk: IMS: Validate Accept header in MO INVITE Related: SYS#6968 Change-Id: I7e419ae1cde384590b54c87c198cc411640c4594 --- M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 2 files changed, 42 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/37313/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index afa165e..29a77ec 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -1175,6 +1175,7 @@ via, calling_contact, g_pars.subscr.cp.sip_seq_nr, + accept := ts_Accept({ ts_AcceptBody("application/sdp"), ts_AcceptBody("application/3gpp-ims+xml") }), min_SE := min_SE, session_expires := session_expires, supported := supported, @@ -1401,6 +1402,7 @@ altstep as_IMS_mo_call_accept(boolean exp_update_to_direct_rtp := false, boolean fail_others := true) runs on IMS_ConnHdlr { + /* 3GPP TS 24.229 5.1.3.1 Initial INVITE request */ var template (present) PDU_SIP_Request exp_req := tr_SIP_INVITE(f_tr_SipUrl_opt_defport(ts_SipUrl_from_Addr_Union(g_pars.subscr.cp.called.addr)), ?, @@ -1408,6 +1410,7 @@ tr_To(tr_Addr_Union_from_val(g_pars.subscr.cp.called.addr), *), tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), ?, + accept := tr_Accept(superset(tr_AcceptBody("application/sdp"), tr_AcceptBody("application/3gpp-ims+xml"))), supported := tr_Supported(superset("timer")), body := ?); var charstring sip_expect_str := log2str(exp_req); diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index ffc4550..bfb3655 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -69,6 +69,26 @@ } } +// [20.1, RFC2616 14.1] +template (present) AcceptBody tr_AcceptBody(template (present) charstring mediaRange, + template SemicolonParam_List acceptParam := *) := { + mediaRange := mediaRange, + acceptParam := acceptParam +} +template (value) AcceptBody ts_AcceptBody(template (value) charstring mediaRange, + template (omit) SemicolonParam_List acceptParam := omit) := { + mediaRange := mediaRange, + acceptParam := acceptParam +} +template (present) Accept tr_Accept(template AcceptBody_List acceptArgs := *) := { + fieldName := ACCEPT_E, + acceptArgs := acceptArgs +} +template (value) Accept ts_Accept(template (omit) AcceptBody_List acceptArgs := omit) := { + fieldName := ACCEPT_E, + acceptArgs := acceptArgs +} + // [20.5] template (present) Allow tr_Allow(template Method_List methods := *) := { fieldName := ALLOW_E, @@ -711,7 +731,8 @@ template (value) Via via, template (omit) ContentLength content_length := ts_ContentLength(0), template (omit) ContentType content_type := omit, - template (omit)Authorization authorization := omit, + template (omit) Accept accept := omit, + template (omit) Authorization authorization := omit, template (omit) Allow allow := ts_Allow(c_SIP_defaultMethods), template (omit) Expires expires := omit, template (omit) MinExpires minExpires := omit, @@ -728,6 +749,7 @@ template (omit) UserAgent userAgent := ts_UserAgent({ "osmo-ttcn3-hacks/0.23" }), template (omit) WwwAuthenticate wwwAuthenticate := omit ) modifies ts_SIP_msgHeader_empty := { + accept := accept, allow := allow, authorization := authorization, callId := { @@ -771,6 +793,7 @@ template integer seq_nr := ?, template ContentLength content_length := *, template ContentType content_type := *, + template Accept accept := *, template Allow allow := *, template Authorization authorization := *, template Expires expires := *, @@ -787,6 +810,7 @@ template UserAgent userAgent := *, template WwwAuthenticate wwwAuthenticate := * ) modifies t_SIP_msgHeader_any := { + accept := accept, allow := allow, authorization := authorization, callId := { @@ -880,6 +904,7 @@ template (value) Via via, template (value) Contact contact, integer seq_nr, + template (omit) Accept accept := omit, template (omit) Min_SE min_SE := omit, template (omit) Session_expires session_expires := omit, template (omit) Supported supported := omit, @@ -890,6 +915,7 @@ via, content_length := f_ContentLength(body), content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), + accept := accept, min_SE := min_SE, session_expires := session_expires, supported := supported), @@ -903,6 +929,7 @@ template To to_addr, template Via via := tr_Via_from(f_tr_HostPort_opt_defport(?)), template integer seq_nr, + template Accept accept := *, template Min_SE min_SE := *, template Session_expires session_expires := *, template Supported supported := *, @@ -910,6 +937,7 @@ requestLine := tr_SIP_ReqLine(INVITE_E, uri), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, ?, via, "INVITE", seq_nr, + accept := accept, min_SE := min_SE, session_expires := session_expires), messageBody := body, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37313?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: I7e419ae1cde384590b54c87c198cc411640c4594 Gerrit-Change-Number: 37313 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 3 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: do not FAIL on CRCX in sendrecv mode

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/37282?usp=email ) Change subject: do not FAIL on CRCX in sendrecv mode ...................................................................... do not FAIL on CRCX in sendrecv mode Currently, a CRCX in sendrecv mode results in: DLMGCP ERROR endpoint:rtpbridge/2@mgw CI:7F4C8EDD CRCX: selected connection mode type requires an opposite end! (mgcp_protocol.c:1090) But it is not actually practical, nor logical to require another conn for the 'sendrecv' ConnectionMode. Impractical: If I want to create two conns on an endpoint that both are in 'sendrecv' mode, I have to send two CRCX, one for each conn. At the time of the first CRCX, there cannot be any other conn, so I am currently forced to send a different ConnectionMode in the CRCX, followed by another MDCX later, just to change the first conn to sendrecv. Illogical: In a situation where two conns are currently in sendrecv mode, if I now DLCX one of them, I can legally reach a state with a single conn in sendrecv mode, just as currently forbidden for CRCX. In general, MGCP is not forcing any particular number of connections. Simply start forwarding RTP as soon as there is a remote conn, and not require another explicit MDCX. Related: SYS#6974 SYS#6907 Related: osmo-ttcn3-hacks I00fd854f058f7f53e2f579e8481ca2b9253f08e3 Change-Id: Ic089485543c5c97a35c7ae24fe0f622bf57d1976 --- M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 46 insertions(+), 25 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index ac5c682..16dee03 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1083,17 +1083,6 @@ mgcp_rtp_end_config(endp, 0, &conn->end); - /* check connection mode setting */ - if (conn->conn->mode != MGCP_CONN_LOOPBACK - && conn->conn->mode != MGCP_CONN_RECV_ONLY - && osmo_sockaddr_port(&conn->end.addr.u.sa) == 0) { - LOGPCONN(_conn, DLMGCP, LOGL_ERROR, - "CRCX: selected connection mode type requires an opposite end!\n"); - error_code = 527; - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC)); - goto error2; - } - /* Find a local address for conn based on policy and initial SDP remote information, then find a free port for it */ if (mgcp_get_local_addr(conn->end.local_addr, conn) < 0) { @@ -1295,17 +1284,6 @@ if (conn->type == MGCP_RTP_DEFAULT && strcmp(conn->end.codec->subtype_name, "VND.3GPP.IUFP") == 0) rc = mgcp_conn_iuup_init(conn); - /* check connection mode setting */ - if (conn->conn->mode != MGCP_CONN_LOOPBACK - && conn->conn->mode != MGCP_CONN_RECV_ONLY - && !mgcp_rtp_end_remote_addr_available(&conn->end)) { - LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, - "MDCX: selected connection mode type requires an opposite end!\n"); - error_code = 527; - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC)); - goto error3; - } - if (mgcp_conn_rtp_is_osmux(conn)) { OSMO_ASSERT(conn->osmux.local_cid_allocated); if (remote_osmux_cid < -1) { diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 2e06639..21be037 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -145,7 +145,16 @@ "a=ptime:20\r\n" #define MDCX4_ADDR0000_RET \ - "527 18983216 FAIL\r\n" + "200 18983216 OK\r\n" \ + "\r\n" \ + "v=0\r\n" \ + "o=- %s 23 IN IP4 0.0.0.0\r\n" \ + "s=-\r\n" \ + "c=IN IP4 0.0.0.0\r\n" \ + "t=0 0\r\n" \ + "m=audio 16002 RTP/AVP 99\r\n" \ + "a=rtpmap:99 AMR/8000\r\n" \ + "a=ptime:20\r\n" #define MDCX4 \ "MDCX 18983217 1@mgw MGCP 1.0\r\n" \ diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 5dc00cd..4e72145 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -116,9 +116,9 @@ ---------8<--------- checking response: -using message as statically defined for comparison +using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) ================================================ Testing MDCX4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37282?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic089485543c5c97a35c7ae24fe0f622bf57d1976 Gerrit-Change-Number: 37282 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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

11 months, 3 weeks

1
0
0 0

[L] Change in ...osmo-s1gw[master]: erab_fsm: E-RAB FSM implementation

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37317?usp=email ) Change subject: erab_fsm: E-RAB FSM implementation ...................................................................... Patch Set 1: (2 comments) File src/erab_fsm.erl: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16895): https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37317/comment/2b61d079_e483… PS1, Line 85: %% @param TEID TEID choosen by the eNB. 'choosen' may be misspelled - perhaps 'chosen'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16895): https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37317/comment/2cf240b5_78bb… PS1, Line 96: %% @param TEID TEID choosen by the core. 'choosen' may be misspelled - perhaps 'chosen'? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37317?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic57e14675339b7cadb0cdd7cbc5d3a56288d7297 Gerrit-Change-Number: 37317 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 01 Jul 2024 21:59:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Fix ICSI value encoding

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37315?usp=email ) Change subject: ttcn3-asterisk: Fix ICSI value encoding ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37315?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: I02b3d54003bb02e999b27b533a651299dbb53503 Gerrit-Change-Number: 37315 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Jul 2024 02:05:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: fix E1 TS output when used with osmo-e1d

by neels

Attention is currently required from: falconia. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/37311?usp=email ) Change subject: fix E1 TS output when used with osmo-e1d ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/37311/comment/a937735b_e4490875 PS1, Line 16: correctly. This commit log could just say: "Use proper API e1inp_ts_send_raw() to enqueue messages in ts->raw.tx_queue, so that e1inp driver notification works properly." -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37311?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6ce9a1dea6834632faf75059e85ca9a0c25d57c2 Gerrit-Change-Number: 37311 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Tue, 02 Jul 2024 02:18:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-e1d[master]: mux from not-started raw TS: fill with 0xFF

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/37321?usp=email ) Change subject: mux from not-started raw TS: fill with 0xFF ...................................................................... mux from not-started raw TS: fill with 0xFF When the channelized mux reads from a raw TS, but that raw TS is not in tx_started state yet, the read function returns "fake" data. However, it was actually returning uninitialized memory content, rather than 0xFF filler used everywhere else, thereby transmitting uninit-memory garbage to whatever is connected to the E1 line. Change it to fill with 0xFF, same as the filler used in other cases such as inactive timeslots. Change-Id: I42849a6d19b020bab789853c3b60af6a1c09f92f --- M src/mux_demux.c 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/21/37321/1 diff --git a/src/mux_demux.c b/src/mux_demux.c index a0ae717..72379fe 100644 --- a/src/mux_demux.c +++ b/src/mux_demux.c @@ -55,8 +55,10 @@ /* If we're not started yet, we 'fake' data until the other side * send something */ - if (l < 0 && errno == EAGAIN && !ts->raw.tx_started) + if (l < 0 && errno == EAGAIN && !ts->raw.tx_started) { + memset(buf, 0xFF, len); return len; + } ts->raw.tx_started = true; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/37321?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I42849a6d19b020bab789853c3b60af6a1c09f92f Gerrit-Change-Number: 37321 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

11 months, 3 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp_test: test a=ptime:20, not 40

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/37280?usp=email ) Change subject: mgcp_test: test a=ptime:20, not 40 ...................................................................... mgcp_test: test a=ptime:20, not 40 In our GSM world, the packet time is 20 ms, hence 20 is the typical value that we should test. Maybe we can do one test with 40 at most, but we'll most probably never see anything else than 20 in practice. Change-Id: Ia2292198bf6e3b72912afd69607654ca77fd549d --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 61 insertions(+), 48 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index b2b8b82..c6a0f6e 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -103,7 +103,7 @@ "t=0 0\r\n" \ "m=audio 16002 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX3A_RET \ "200 18983215 OK\r\n" \ @@ -115,7 +115,7 @@ "t=0 0\r\n" \ "m=audio 16002 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX3_FMTP_RET \ "200 18983215 OK\r\n" \ @@ -127,7 +127,7 @@ "t=0 0\r\n" \ "m=audio 16006 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX4_ADDR0000 \ "MDCX 18983216 1@mgw MGCP 1.0\r\n" \ @@ -142,7 +142,7 @@ "t=0 0\r\n" \ "m=audio 4441 RTP/AVP 99\r\n" \ "a=rtpmap:99 AMR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX4_ADDR0000_RET \ "527 18983216 FAIL\r\n" @@ -160,7 +160,7 @@ "t=0 0\r\n" \ "m=audio 4441 RTP/AVP 99\r\n" \ "a=rtpmap:99 AMR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX4_RET(Ident) \ "200 " Ident " OK\r\n" \ @@ -172,7 +172,7 @@ "t=0 0\r\n" \ "m=audio 16002 RTP/AVP 99\r\n" \ "a=rtpmap:99 AMR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX4_RO_RET(Ident) \ "200 " Ident " OK\r\n" \ @@ -184,7 +184,7 @@ "t=0 0\r\n" \ "m=audio 16002 RTP/AVP 112\r\n" \ "a=rtpmap:112 AMR\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX4_PT1 \ "MDCX 18983218 1@mgw MGCP 1.0\r\n" \ @@ -199,7 +199,7 @@ "t=0 0\r\n" \ "m=audio 4441 RTP/AVP 99\r\n" \ "a=rtpmap:99 AMR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX4_PT2 \ "MDCX 18983219 1@mgw MGCP 1.0\r\n" \ @@ -214,7 +214,7 @@ "t=0 0\r\n" \ "m=audio 4441 RTP/AVP 99\r\n" \ "a=rtpmap:99 AMR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX4_PT3 \ "MDCX 18983220 1@mgw MGCP 1.0\r\n" \ @@ -229,7 +229,7 @@ "t=0 0\r\n" \ "m=audio 4441 RTP/AVP 99\r\n" \ "a=rtpmap:99 AMR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" /* Test different upper/lower case in options */ #define MDCX4_PT4 \ @@ -245,7 +245,7 @@ "t=0 0\r\n" \ "m=audio 4441 RTP/AVP 99\r\n" \ "a=rtpmap:99 AMR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX4_SO \ "MDCX 18983222 1@mgw MGCP 1.0\r\n" \ @@ -260,7 +260,7 @@ "t=0 0\r\n" \ "m=audio 4441 RTP/AVP 99\r\n" \ "a=rtpmap:99 AMR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define MDCX4_RO \ "MDCX 18983223 1@mgw MGCP 1.0\r\n" \ @@ -297,7 +297,7 @@ "c=IN IP4 123.12.12.123\r\n" \ "m=audio 5904 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_RET \ "200 2 OK\r\n" \ @@ -310,7 +310,7 @@ "t=0 0\r\n" \ "m=audio 16002 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_RET_NO_RTPMAP \ "200 2 OK\r\n" \ @@ -322,7 +322,7 @@ "c=IN IP4 0.0.0.0\r\n" \ "t=0 0\r\n" \ "m=audio 16002 RTP/AVP 97\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_FMTP_RET \ "200 2 OK\r\n" \ @@ -335,7 +335,7 @@ "t=0 0\r\n" \ "m=audio 16006 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_ZYN \ "CRCX 2 1@mgw MGCP 1.0\r\n" \ @@ -371,7 +371,7 @@ "c=IN IP4 123.12.12.123\r\n" \ "m=audio 5904 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_X_OSMO_IGN_RET \ "200 2 OK\r\n" \ @@ -384,7 +384,7 @@ "t=0 0\r\n" \ "m=audio 16010 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_PORT_0 \ "CRCX 3 1@mgw MGCP 1.0\r\n" \ @@ -396,7 +396,7 @@ "c=IN IP4 123.12.12.123\r\n" \ "m=audio 0 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_PORT_0_RET \ "200 3 OK\r\n" \ @@ -409,7 +409,7 @@ "t=0 0\r\n" \ "m=audio 16014 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_PORT_0_IUFP \ "CRCX 4 1@mgw MGCP 1.0\r\n" \ @@ -421,7 +421,7 @@ "c=IN IP4 123.12.12.123\r\n" \ "m=audio 0 RTP/AVP 96\r\n" \ "a=rtpmap:96 VND.3GPP.IUFP/16000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_PORT_0_IUFP_RET \ "200 4 OK\r\n" \ @@ -434,7 +434,7 @@ "t=0 0\r\n" \ "m=audio 16016 RTP/AVP 96\r\n" \ "a=rtpmap:96 VND.3GPP.IUFP/16000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define DLCX \ "DLCX 7 1@mgw MGCP 1.0\r\n" \ @@ -491,7 +491,7 @@ "m=audio 5904 RTP/AVP 18 97\r\n" \ "a=rtpmap:18 G729/8000\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_MULT_2 \ "CRCX 2 2@mgw MGCP 1.0\r\n" \ @@ -506,7 +506,7 @@ "a=rtpmap:18 G729/8000\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ "a=rtpmap:101 FOO/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_MULT_3 \ "CRCX 2 3@mgw MGCP 1.0\r\n" \ @@ -521,7 +521,7 @@ "a=rtpmap:18 G729/8000\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ "a=rtpmap:101 FOO/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_MULT_4 \ "CRCX 2 4@mgw MGCP 1.0\r\n" \ @@ -536,7 +536,7 @@ "a=rtpmap:18 G729/8000\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ "a=rtpmap:101 FOO/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_MULT_GSM_EXACT \ "CRCX 259260421 5@mgw MGCP 1.0\r\n" \ @@ -625,7 +625,7 @@ "c=IN IP4 123.12.12.123\r\n" \ "m=audio 5904 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=ptime:40\r\n" + "a=ptime:20\r\n" #define CRCX_NULL_RET "502 2 FAIL\r\n" diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 6dfb608..68b9fc7 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -73,7 +73,7 @@ c=IN IP4 123.12.12.123 m=audio 5904 RTP/AVP 97 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -112,7 +112,7 @@ t=0 0 m=audio 4441 RTP/AVP 99 a=rtpmap:99 AMR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -136,7 +136,7 @@ t=0 0 m=audio 4441 RTP/AVP 99 a=rtpmap:99 AMR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -161,7 +161,7 @@ t=0 0 m=audio 4441 RTP/AVP 99 a=rtpmap:99 AMR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -186,7 +186,7 @@ t=0 0 m=audio 4441 RTP/AVP 99 a=rtpmap:99 AMR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -211,7 +211,7 @@ t=0 0 m=audio 4441 RTP/AVP 99 a=rtpmap:99 AMR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -236,7 +236,7 @@ t=0 0 m=audio 4441 RTP/AVP 99 a=rtpmap:99 AMR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -261,7 +261,7 @@ t=0 0 m=audio 4441 RTP/AVP 99 a=rtpmap:99 AMR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -428,7 +428,7 @@ c=IN IP4 123.12.12.123 m=audio 5904 RTP/AVP 97 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -493,7 +493,7 @@ c=IN IP4 123.12.12.123 m=audio 5904 RTP/AVP 97 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -564,7 +564,7 @@ c=IN IP4 123.12.12.123 m=audio 5904 RTP/AVP 97 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -626,7 +626,7 @@ c=IN IP4 123.12.12.123 m=audio 0 RTP/AVP 97 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -647,7 +647,7 @@ c=IN IP4 123.12.12.123 m=audio 0 RTP/AVP 96 a=rtpmap:96 VND.3GPP.IUFP/16000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -668,7 +668,7 @@ c=IN IP4 123.12.12.123 m=audio 5904 RTP/AVP 97 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -686,7 +686,7 @@ c=IN IP4 123.12.12.123 m=audio 5904 RTP/AVP 97 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: @@ -798,7 +798,7 @@ c=IN IP4 123.12.12.123 m=audio 5904 RTP/AVP 97 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- creating message from statically defined input: @@ -1252,7 +1252,7 @@ m=audio 5904 RTP/AVP 18 97 a=rtpmap:18 G729/8000 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- creating message from statically defined input: @@ -1269,7 +1269,7 @@ a=rtpmap:18 G729/8000 a=rtpmap:97 GSM-EFR/8000 a=rtpmap:101 FOO/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- creating message from statically defined input: @@ -1286,7 +1286,7 @@ a=rtpmap:18 G729/8000 a=rtpmap:97 GSM-EFR/8000 a=rtpmap:101 FOO/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- creating message from statically defined input: @@ -1303,7 +1303,7 @@ a=rtpmap:18 G729/8000 a=rtpmap:97 GSM-EFR/8000 a=rtpmap:101 FOO/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- creating message from statically defined input: @@ -1385,7 +1385,7 @@ c=IN IP4 123.12.12.123 m=audio 5904 RTP/AVP 97 a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 +a=ptime:20 ---------8<--------- checking response: -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia2292198bf6e3b72912afd69607654ca77fd549d Gerrit-Change-Number: 37280 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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

11 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024