<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10320">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_sdp: restructure mgcp_write_response_sdp() (audio)<br><br>The function mgcp_write_response_sdp() is responsible to write the<br>audio port and the list with the supported payload type numbers to<br>the sdp response. At the moment it can only write exactly one payload<br>type number to the response, but in the future we may want to write<br>several payload type numbers to the response. Lets add a function<br>for that so that now.<br><br>- add add_audio() helper function to add multiple payload type<br> numbers, but keep the functionality as it is for now<br><br>Change-Id: I662c725f697b2ffb1e3ad4671a445f943cd79b63<br>Related: OS#3442<br>---<br>M src/libosmo-mgcp/mgcp_sdp.c<br>1 file changed, 30 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>index a6def41..4f66e85 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>@@ -304,6 +304,32 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Add audio string to sdp payload */</span><br><span style="color: hsl(120, 100%, 40%);">+static int add_audio(struct msgb *sdp, int *payload_types, unsigned int payload_types_len, int local_port)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (payload_types_len < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = msgb_printf(sdp, "m=audio %d RTP/AVP", local_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < payload_types_len; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = msgb_printf(sdp, " %d", payload_types[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = msgb_printf(sdp, "\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Generate SDP response string.</span><br><span> * \param[in] endp trunk endpoint.</span><br><span> * \param[in] conn associated rtp connection.</span><br><span>@@ -318,6 +344,7 @@</span><br><span> const char *audio_name;</span><br><span> int payload_type;</span><br><span> int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int payload_types[1];</span><br><span> </span><br><span> OSMO_ASSERT(endp);</span><br><span> OSMO_ASSERT(conn);</span><br><span>@@ -341,8 +368,9 @@</span><br><span> goto buffer_too_small;</span><br><span> </span><br><span> if (payload_type >= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = msgb_printf(sdp, "m=audio %d RTP/AVP %d\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">- conn->end.local_port, payload_type);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ payload_types[0] = payload_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = add_audio(sdp, payload_types, 1, conn->end.local_port);</span><br><span> if (rc < 0)</span><br><span> goto buffer_too_small;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10320">change 10320</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/10320"/><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: I662c725f697b2ffb1e3ad4671a445f943cd79b63 </div>
<div style="display:none"> Gerrit-Change-Number: 10320 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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 </div>