<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24871">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">constify some function arg pointers<br><br>Change-Id: I7a7560fad96719da01f1ee30eea0be0e52c60e99<br>---<br>M include/osmocom/mgcp/mgcp_network.h<br>M include/osmocom/mgcp/mgcp_protocol.h<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>M tests/mgcp/mgcp_test.c<br>5 files changed, 20 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h</span><br><span>index 0487b91..1ed00e4 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_network.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_network.h</span><br><span>@@ -152,7 +152,7 @@</span><br><span> int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port,</span><br><span> struct mgcp_conn_rtp *conn);</span><br><span> void mgcp_free_rtp_port(struct mgcp_rtp_end *end);</span><br><span style="color: hsl(0, 100%, 40%);">-void mgcp_patch_and_count(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_patch_and_count(const struct mgcp_endpoint *endp,</span><br><span> struct mgcp_rtp_state *state,</span><br><span> struct mgcp_rtp_end *rtp_end,</span><br><span> struct osmo_sockaddr *addr, struct msgb *msg);</span><br><span>@@ -172,6 +172,6 @@</span><br><span> struct mgcp_conn_rtp *conn);</span><br><span> </span><br><span> /* internal RTP Annex A counting */</span><br><span style="color: hsl(0, 100%, 40%);">-void mgcp_rtp_annex_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state,</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_rtp_annex_count(const struct mgcp_endpoint *endp, struct mgcp_rtp_state *state,</span><br><span> const uint16_t seq, const int32_t transit,</span><br><span> const uint32_t ssrc);</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_protocol.h b/include/osmocom/mgcp/mgcp_protocol.h</span><br><span>index abd264c..edd0554 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_protocol.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_protocol.h</span><br><span>@@ -23,5 +23,5 @@</span><br><span> void mgcp_rtp_end_config(struct mgcp_endpoint *endp, int expect_ssrc_change,</span><br><span> struct mgcp_rtp_end *rtp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t mgcp_rtp_packet_duration(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_end *rtp);</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t mgcp_rtp_packet_duration(const struct mgcp_endpoint *endp,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_end *rtp);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index cac8ef0..46cb0fd 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -240,7 +240,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Compute timestamp alignment error */</span><br><span style="color: hsl(0, 100%, 40%);">-static int32_t ts_alignment_error(struct mgcp_rtp_stream_state *sstate,</span><br><span style="color: hsl(120, 100%, 40%);">+static int32_t ts_alignment_error(const struct mgcp_rtp_stream_state *sstate,</span><br><span> int ptime, uint32_t timestamp)</span><br><span> {</span><br><span> int32_t timestamp_delta;</span><br><span>@@ -255,11 +255,11 @@</span><br><span> }</span><br><span> </span><br><span> /* Check timestamp and sequence number for plausibility */</span><br><span style="color: hsl(0, 100%, 40%);">-static int check_rtp_timestamp(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_stream_state *sstate,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_end *rtp_end,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+static int check_rtp_timestamp(const struct mgcp_endpoint *endp,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_state *state,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_stream_state *sstate,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_end *rtp_end,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *addr,</span><br><span> uint16_t seq, uint32_t timestamp,</span><br><span> const char *text, int32_t * tsdelta_out)</span><br><span> {</span><br><span>@@ -344,10 +344,10 @@</span><br><span> }</span><br><span> </span><br><span> /* Set the timestamp offset according to the packet duration. */</span><br><span style="color: hsl(0, 100%, 40%);">-static int adjust_rtp_timestamp_offset(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(120, 100%, 40%);">+static int adjust_rtp_timestamp_offset(const struct mgcp_endpoint *endp,</span><br><span> struct mgcp_rtp_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_end *rtp_end,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_end *rtp_end,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *addr,</span><br><span> int16_t delta_seq, uint32_t in_timestamp)</span><br><span> {</span><br><span> int32_t tsdelta = state->packet_duration;</span><br><span>@@ -394,10 +394,10 @@</span><br><span> }</span><br><span> </span><br><span> /* Set the timestamp offset according to the packet duration. */</span><br><span style="color: hsl(0, 100%, 40%);">-static int align_rtp_timestamp_offset(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(120, 100%, 40%);">+static int align_rtp_timestamp_offset(const struct mgcp_endpoint *endp,</span><br><span> struct mgcp_rtp_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_end *rtp_end,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_end *rtp_end,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *addr,</span><br><span> uint32_t timestamp)</span><br><span> {</span><br><span> char ipbuf[INET6_ADDRSTRLEN];</span><br><span>@@ -475,7 +475,7 @@</span><br><span> *fmtp_extra = conn->end.fmtp_extra;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void mgcp_rtp_annex_count(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_rtp_annex_count(const struct mgcp_endpoint *endp,</span><br><span> struct mgcp_rtp_state *state, const uint16_t seq,</span><br><span> const int32_t transit, const uint32_t ssrc)</span><br><span> {</span><br><span>@@ -556,7 +556,7 @@</span><br><span> * is only one source.</span><br><span> * There is also no probation period for new sources. Every RTP header</span><br><span> * we receive will be seen as a switch in streams. */</span><br><span style="color: hsl(0, 100%, 40%);">-void mgcp_patch_and_count(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_patch_and_count(const struct mgcp_endpoint *endp,</span><br><span> struct mgcp_rtp_state *state,</span><br><span> struct mgcp_rtp_end *rtp_end,</span><br><span> struct osmo_sockaddr *addr, struct msgb *msg)</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 3014048..8d6f6f5 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -611,8 +611,8 @@</span><br><span> rtp->force_constant_ssrc ? ", force constant ssrc" : "");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t mgcp_rtp_packet_duration(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_end *rtp)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t mgcp_rtp_packet_duration(const struct mgcp_endpoint *endp,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_end *rtp)</span><br><span> {</span><br><span> int f = 0;</span><br><span> </span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 2ca0b4c..e6862e5 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -1261,11 +1261,6 @@</span><br><span> "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void mgcp_patch_and_count(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_end *rtp_end,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *addr, struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void test_packet_error_detection(int patch_ssrc, int patch_ts)</span><br><span> {</span><br><span> int i;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24871">change 24871</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-mgw/+/24871"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7a7560fad96719da01f1ee30eea0be0e52c60e99 </div>
<div style="display:none"> Gerrit-Change-Number: 24871 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>