<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13158">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_network: use mgcp_rtp_codec in downlink format callback<br><br>The callback function mgcp_get_format() is used to request the codec<br>parameters for a specific connection. This function returns the<br>parameters as idividual pointers. Since there is a struct that holds all<br>important codec information among the ones which are currently returned<br>by mgcp_get_format, lets just use this codec struct as single return<br>value.<br><br>Change-Id: I348f9141eb59ed1a986447b96ab4a24ddf326936<br>Related: OS#3807<br>---<br>M include/osmocom/mgcp/mgcp.h<br>M include/osmocom/mgcp/mgcp_internal.h<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_sdp.c<br>4 files changed, 13 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h</span><br><span>index 5886a65..71d6342 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp.h</span><br><span>@@ -81,10 +81,11 @@</span><br><span> struct mgcp_conn_rtp *conn_dst,</span><br><span> struct mgcp_conn_rtp *conn_src);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_rtp_codec;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> typedef void (*mgcp_get_format)(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(0, 100%, 40%);">- int *payload_type,</span><br><span style="color: hsl(0, 100%, 40%);">- const char**subtype_name,</span><br><span style="color: hsl(0, 100%, 40%);">- const char**fmtp_extra,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_codec **codec,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char **fmtp_extra,</span><br><span> struct mgcp_conn_rtp *conn);</span><br><span> </span><br><span> /**</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index a6239c2..35b535a 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -298,9 +298,8 @@</span><br><span> struct mgcp_conn_rtp *conn_src);</span><br><span> </span><br><span> void mgcp_get_net_downlink_format_default(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(0, 100%, 40%);">- int *payload_type,</span><br><span style="color: hsl(0, 100%, 40%);">- const char**audio_name,</span><br><span style="color: hsl(0, 100%, 40%);">- const char**fmtp_extra,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_codec **codec,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char **fmtp_extra,</span><br><span> struct mgcp_conn_rtp *conn);</span><br><span> </span><br><span> /* internal RTP Annex A counting */</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index 30ed7fd..e4fd7c0 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -416,8 +416,7 @@</span><br><span> }</span><br><span> </span><br><span> void mgcp_get_net_downlink_format_default(struct mgcp_endpoint *endp,</span><br><span style="color: hsl(0, 100%, 40%);">- int *payload_type,</span><br><span style="color: hsl(0, 100%, 40%);">- const char **audio_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_codec **codec,</span><br><span> const char **fmtp_extra,</span><br><span> struct mgcp_conn_rtp *conn)</span><br><span> {</span><br><span>@@ -425,8 +424,7 @@</span><br><span> "endpoint:0x%x conn:%s using format defaults\n",</span><br><span> ENDPOINT_NUMBER(endp), mgcp_conn_dump(conn->conn));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- *payload_type = conn->end.codec->payload_type;</span><br><span style="color: hsl(0, 100%, 40%);">- *audio_name = conn->end.codec->audio_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ *codec = conn->end.codec;</span><br><span> *fmtp_extra = conn->end.fmtp_extra;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>index 9252b98..3287cd1 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>@@ -344,6 +344,7 @@</span><br><span> const struct mgcp_conn_rtp *conn, struct msgb *sdp,</span><br><span> const char *addr)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct mgcp_rtp_codec *codec;</span><br><span> const char *fmtp_extra;</span><br><span> const char *audio_name;</span><br><span> int payload_type;</span><br><span>@@ -357,10 +358,12 @@</span><br><span> </span><br><span> /* FIXME: constify endp and conn args in get_net_donwlink_format_cb() */</span><br><span> endp->cfg->get_net_downlink_format_cb((struct mgcp_endpoint *)endp,</span><br><span style="color: hsl(0, 100%, 40%);">- &payload_type, &audio_name,</span><br><span style="color: hsl(0, 100%, 40%);">- &fmtp_extra,</span><br><span style="color: hsl(120, 100%, 40%);">+ &codec, &fmtp_extra,</span><br><span> (struct mgcp_conn_rtp *)conn);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ audio_name = codec->audio_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ payload_type = codec->payload_type;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = msgb_printf(sdp,</span><br><span> "v=0\r\n"</span><br><span> "o=- %s 23 IN IP4 %s\r\n"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13158">change 13158</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/13158"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I348f9141eb59ed1a986447b96ab4a24ddf326936 </div>
<div style="display:none"> Gerrit-Change-Number: 13158 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>