<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13157">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_sdp: untangle parsing of a= parameters<br><br>The if construct that takes care for parsing the a= parameters is<br>unnecessary complex. Lets handle each of the possible parameters<br>seperately on the same level.<br><br>Change-Id: Ifc801a757e9beb6b3974863d5ee99fc7c194559e<br>Related: OS#3807<br>---<br>M src/libosmo-mgcp/mgcp_sdp.c<br>1 file changed, 11 insertions(+), 8 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 c84f32c..9252b98 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_sdp.c</span><br><span>@@ -208,19 +208,22 @@</span><br><span>                  /* skip these SDP attributes */</span><br><span>                      break;</span><br><span>               case 'a':</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (sscanf(line, "a=rtpmap:%d %63s",</span><br><span style="color: hsl(0, 100%, 40%);">-                             &payload, audio_name) == 2) {</span><br><span style="color: hsl(0, 100%, 40%);">-                            codecs_update(tmp_ctx, codecs,</span><br><span style="color: hsl(0, 100%, 40%);">-                                        codecs_used, payload, audio_name);</span><br><span style="color: hsl(0, 100%, 40%);">-                        } else</span><br><span style="color: hsl(0, 100%, 40%);">-                      if (sscanf</span><br><span style="color: hsl(0, 100%, 40%);">-                          (line, "a=ptime:%d-%d", &ptime, &ptime2) >= 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 if (sscanf(line, "a=rtpmap:%d %63s", &payload, audio_name) == 2) {</span><br><span style="color: hsl(120, 100%, 40%);">+                              codecs_update(tmp_ctx, codecs, codecs_used, payload, audio_name);</span><br><span style="color: hsl(120, 100%, 40%);">+                             break;</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%);">+                   if (sscanf(line, "a=ptime:%d-%d", &ptime, &ptime2) >= 1) {</span><br><span>                              if (ptime2 > 0 && ptime2 != ptime)</span><br><span>                                        rtp->packet_duration_ms = 0;</span><br><span>                              else</span><br><span>                                         rtp->packet_duration_ms = ptime;</span><br><span style="color: hsl(0, 100%, 40%);">-                     } else if (sscanf(line, "a=maxptime:%d", &ptime2) == 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+                               break;</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%);">+                   if (sscanf(line, "a=maxptime:%d", &ptime2) == 1) {</span><br><span>                             rtp->maximum_packet_time = ptime2;</span><br><span style="color: hsl(120, 100%, 40%);">+                         break;</span><br><span>                       }</span><br><span>                    break;</span><br><span>               case 'm':</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13157">change 13157</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/13157"/><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: Ifc801a757e9beb6b3974863d5ee99fc7c194559e </div>
<div style="display:none"> Gerrit-Change-Number: 13157 </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>