<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13116">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Max: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make codec_table public as osmo_mgcpc_codec_names<br><br>These value_string[]s are also useful for printing chosen codecs in osmo-msc.<br><br>Change-Id: Ida0e59f9a1f2dd18efea0a51680a67b69f141efa<br>---<br>M include/osmocom/mgcp_client/mgcp_client.h<br>M src/libosmo-mgcp-client/mgcp_client.c<br>2 files changed, 10 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h</span><br><span>index 98e58d7..e09a446 100644</span><br><span>--- a/include/osmocom/mgcp_client/mgcp_client.h</span><br><span>+++ b/include/osmocom/mgcp_client/mgcp_client.h</span><br><span>@@ -47,6 +47,10 @@</span><br><span> * this is an internal assumption that is made to avoid lookup tables.</span><br><span> * The API-User should not rely on this coincidence! */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string osmo_mgcpc_codec_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *osmo_mgcpc_codec_name(enum mgcp_codecs val)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return get_value_string(osmo_mgcpc_codec_names, val); }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Structure to build a payload type map to allow the defiition custom payload</span><br><span> * types. */</span><br><span> struct ptmap {</span><br><span>diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>index 29acd0a..ead3512 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> #include <string.h></span><br><span> </span><br><span> /* Codec descripton for dynamic payload types (SDP) */</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string codec_table[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string osmo_mgcpc_codec_names[] = {</span><br><span> { CODEC_PCMU_8000_1, "PCMU/8000/1" },</span><br><span> { CODEC_GSM_8000_1, "GSM/8000/1" },</span><br><span> { CODEC_PCMA_8000_1, "PCMA/8000/1" },</span><br><span>@@ -81,12 +81,12 @@</span><br><span> </span><br><span> osmo_strlcpy(str_buf, extract_codec_name(str), sizeof(str_buf));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(codec_table); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- codec_name = extract_codec_name(codec_table[i].str);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(osmo_mgcpc_codec_names); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ codec_name = extract_codec_name(osmo_mgcpc_codec_names[i].str);</span><br><span> if (!codec_name)</span><br><span> continue;</span><br><span> if (strcmp(codec_name, str_buf) == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return codec_table[i].value;</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_mgcpc_codec_names[i].value;</span><br><span> }</span><br><span> </span><br><span> return -1;</span><br><span>@@ -978,7 +978,7 @@</span><br><span> rc += msgb_printf(msg, " a:");</span><br><span> for (i = 0; i < mgcp_msg->codecs_len; i++) {</span><br><span> pt = mgcp_msg->codecs[i];</span><br><span style="color: hsl(0, 100%, 40%);">- codec = get_value_string_or_null(codec_table, pt);</span><br><span style="color: hsl(120, 100%, 40%);">+ codec = get_value_string_or_null(osmo_mgcpc_codec_names, pt);</span><br><span> </span><br><span> /* Note: Use codec descriptors from enum mgcp_codecs</span><br><span> * in mgcp_client only! */</span><br><span>@@ -1058,7 +1058,7 @@</span><br><span> * require to be explained further via rtpmap. All others</span><br><span> * are implcitly definedby the number in m=audio */</span><br><span> if (pt >= 96 && pt <= 127) {</span><br><span style="color: hsl(0, 100%, 40%);">- codec = get_value_string_or_null(codec_table, mgcp_msg->codecs[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ codec = get_value_string_or_null(osmo_mgcpc_codec_names, mgcp_msg->codecs[i]);</span><br><span> </span><br><span> /* Note: Use codec descriptors from enum mgcp_codecs</span><br><span> * in mgcp_client only! */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13116">change 13116</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/13116"/><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: Ida0e59f9a1f2dd18efea0a51680a67b69f141efa </div>
<div style="display:none"> Gerrit-Change-Number: 13116 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@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: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>