pespin has uploaded this change for review.

View Change

mgw: Move several params setting to mgcp_rtp_end_init()

There's no need to set those 2 params later on, simply set them during
init() to simplify code.

Change-Id: I38e2cfbe03c1e2de48e48f30a04af746bc2368a4
---
M src/libosmo-mgcp/mgcp_protocol.c
M src/libosmo-mgcp/mgcp_rtp_end.c
2 files changed, 4 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/20/39220/1

diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index 48bb28b..97eb43d 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -729,9 +729,7 @@
 
 	bool patch_ssrc = expect_ssrc_change && trunk->force_constant_ssrc;
 
-	rtp->force_aligned_timing = trunk->force_aligned_timing;
 	rtp->force_constant_ssrc = patch_ssrc ? 1 : 0;
-	rtp->rfc5993_hr_convert = trunk->rfc5993_hr_convert;
 
 	LOGPENDP(endp, DLMGCP, LOGL_DEBUG,
 		 "Configuring RTP endpoint: local port %d%s%s\n",
diff --git a/src/libosmo-mgcp/mgcp_rtp_end.c b/src/libosmo-mgcp/mgcp_rtp_end.c
index c9dbc54..819a922 100644
--- a/src/libosmo-mgcp/mgcp_rtp_end.c
+++ b/src/libosmo-mgcp/mgcp_rtp_end.c
@@ -40,7 +40,8 @@
 
 void mgcp_rtp_end_init(struct mgcp_rtp_end *end, struct mgcp_conn_rtp *conn_rtp)
 {
-	struct mgcp_config *cfg = conn_rtp->conn->endp->trunk->cfg;
+	struct mgcp_trunk *trunk = conn_rtp->conn->endp->trunk;
+	struct mgcp_config *cfg = trunk->cfg;
 
 	end->conn_rtp = conn_rtp;
 	end->rtp = NULL;
@@ -53,6 +54,8 @@
 	end->output_enabled = false;
 	end->maximum_packet_time = -1;
 
+	end->force_aligned_timing = trunk->force_aligned_timing;
+	end->rfc5993_hr_convert = trunk->rfc5993_hr_convert;
 
 	if (cfg->force_ptime) {
 		end->packet_duration_ms = cfg->force_ptime;

To view, visit change 39220. To unsubscribe, or for help writing mail filters, visit settings.