Change in osmo-mgw[master]: network: independently initalize state->out_stream
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9197 ) Change subject: network: independently initalize state->out_stream .. network: independently initalize state->out_stream The struct state->out_stream.ssrc is initalized by first initalizing state->in_stream and then copying state->in_stream over to state->out_stream. This works as long as no pointers to other objects are added to struct mgcp_rtp_stream_state but we may add pointers to struct mgcp_rtp_stream_state in the future. - Initalize out_stream and in_stream independently from each other Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Related: OS#2517 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 6923b97..49e51a1 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -511,7 +511,9 @@ state->in_stream.last_tsdelta = 0; state->packet_duration = mgcp_rtp_packet_duration(endp, rtp_end); - state->out_stream = state->in_stream; + state->out_stream.last_seq = seq - 1; + state->out_stream.ssrc = state->patch.orig_ssrc = ssrc; + state->out_stream.last_tsdelta = 0; state->out_stream.last_timestamp = timestamp; state->out_stream.ssrc = ssrc - 1; /* force output SSRC change */ LOGP(DRTP, LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/9197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Gerrit-Change-Number: 9197 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
Change in osmo-mgw[master]: network: independently initalize state->out_stream
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9197 ) Change subject: network: independently initalize state->out_stream .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Gerrit-Change-Number: 9197 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 16 May 2018 11:09:50 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-mgw[master]: network: independently initalize state->out_stream
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9197 Change subject: network: independently initalize state->out_stream .. network: independently initalize state->out_stream The struct state->out_stream.ssrc is initalized by first initalizing state->in_stream and then copying state->in_stream over to state->out_stream. This works as long as no pointers to other objects are added to struct mgcp_rtp_stream_state but we may add pointers to struct mgcp_rtp_stream_state in the future. - Initalize out_stream and in_stream independently from each other Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Related: OS#2517 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/97/9197/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 6923b97..49e51a1 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -511,7 +511,9 @@ state->in_stream.last_tsdelta = 0; state->packet_duration = mgcp_rtp_packet_duration(endp, rtp_end); - state->out_stream = state->in_stream; + state->out_stream.last_seq = seq - 1; + state->out_stream.ssrc = state->patch.orig_ssrc = ssrc; + state->out_stream.last_tsdelta = 0; state->out_stream.last_timestamp = timestamp; state->out_stream.ssrc = ssrc - 1; /* force output SSRC change */ LOGP(DRTP, LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/9197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Gerrit-Change-Number: 9197 Gerrit-PatchSet: 1 Gerrit-Owner: dexter
