laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/27606 )
Change subject: mgcp_network: do not try to convert RTCP packets
......................................................................
mgcp_network: do not try to convert RTCP packets
Make sure that RTCP packets do not enter the code path where AMR OA and BWE
is converted. The conversion will fail and the RTCP packet will be
dropped.
Change-Id: Ic850344d8b5f7710d12e4553a4033b733dced52b
Related: SYS#5902
---
M src/libosmo-mgcp/mgcp_network.c
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index 0ea8c25..8ade27d 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -1518,6 +1518,7 @@
return rc;
}
+/* Note: This function is able to handle RTP and RTCP */
static int rx_rtp(struct msgb *msg)
{
struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg);
@@ -1534,7 +1535,8 @@
* framing mode (octet-aligned vs. bandwith-efficient is explicitly
* define, then we check if the incoming payload matches that
* expectation. */
- if (amr_oa_bwe_convert_indicated(conn_src->end.codec)) {
+ if (mc->proto == MGCP_PROTO_RTP &&
+ amr_oa_bwe_convert_indicated(conn_src->end.codec)) {
int oa = amr_oa_check((char*)msgb_data(msg), msgb_length(msg));
if (oa < 0)
return -1;
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/27606
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ic850344d8b5f7710d12e4553a4033b733dced52b
Gerrit-Change-Number: 27606
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27610 )
Change subject: gbproxy: Ensure PtP-BVCs are reset when we reset the SGSN SIG-BVC
......................................................................
gbproxy: Ensure PtP-BVCs are reset when we reset the SGSN SIG-BVC
Related: SYS#5908
Depends-on: If240dd13f0f674693018c93390386b2c8afb97af (libosmocore.git)
Change-Id: I6560d8ce1ee6a0d7d42d625b76f6dd637dedb6c0
---
M TODO-RELEASE
M src/gb_proxy.c
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
lynxis lazus: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 1c5d61f..f17d4ce 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -1 +1,2 @@
#component what description / commit summary line
+configure.ac libosmocore depend on next released libosmocore after 1.6.0 with (struct bssgp_bvc_fsm_ops)->reset_ack_notification
diff --git a/src/gb_proxy.c b/src/gb_proxy.c
index 298e132..b4a53bc 100644
--- a/src/gb_proxy.c
+++ b/src/gb_proxy.c
@@ -848,6 +848,7 @@
const struct bssgp_bvc_fsm_ops sgsn_sig_bvc_fsm_ops = {
.reset_notification = sgsn_sig_bvc_reset_notif,
+ .reset_ack_notification = sgsn_sig_bvc_reset_notif,
};
/***********************************************************************
--
To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27610
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gbproxy
Gerrit-Branch: master
Gerrit-Change-Id: I6560d8ce1ee6a0d7d42d625b76f6dd637dedb6c0
Gerrit-Change-Number: 27610
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27610 )
Change subject: gbproxy: Ensure PtP-BVCs are reset when we reset the SGSN SIG-BVC
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27610
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gbproxy
Gerrit-Branch: master
Gerrit-Change-Id: I6560d8ce1ee6a0d7d42d625b76f6dd637dedb6c0
Gerrit-Change-Number: 27610
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Mar 2022 16:07:01 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment