<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24971">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_msg: add trunk parameter to mgcp_check_param for logging<br><br>There is not always an endp pointer present when mgcp_check_param() is<br>called but we always have a trunk pointer. Lets add a trunk parameter so<br>that the function can pick LOGPTRUNK when endp is not available.<br><br>Change-Id: I7327c5a105e7f0e20cabf64623ff9f36fd83bbb8<br>Related: SYS#5535<br>---<br>M include/osmocom/mgcp/mgcp_msg.h<br>M src/libosmo-mgcp/mgcp_msg.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>3 files changed, 15 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/71/24971/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_msg.h b/include/osmocom/mgcp/mgcp_msg.h</span><br><span>index 7732865..87987d3 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_msg.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_msg.h</span><br><span>@@ -39,7 +39,7 @@</span><br><span> </span><br><span> int mgcp_parse_osmux_cid(const char *line);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int mgcp_check_param(const struct mgcp_endpoint *endp, const char *line);</span><br><span style="color: hsl(120, 100%, 40%);">+bool mgcp_check_param(const struct mgcp_endpoint *endp, struct mgcp_trunk *trunk, const char *line);</span><br><span> </span><br><span> int mgcp_verify_call_id(struct mgcp_endpoint *endp, const char *callid);</span><br><span> </span><br><span>diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>index f8b486a..421dcbf 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_msg.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>@@ -31,6 +31,7 @@</span><br><span> #include <osmocom/mgcp/mgcp_msg.h></span><br><span> #include <osmocom/mgcp/mgcp_conn.h></span><br><span> #include <osmocom/mgcp/mgcp_endp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp/mgcp_trunk.h></span><br><span> </span><br><span> /*! Display an mgcp message on the log output.</span><br><span> * \param[in] message mgcp message string</span><br><span>@@ -208,22 +209,24 @@</span><br><span> }</span><br><span> </span><br><span> /*! Check MGCP parameter line (string) for plausibility.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] endp pointer to endpoint (only used for log output)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] endp pointer to endpoint (only used for log output, may be NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] trunk pointer to trunk (only used for log output, may be NULL if endp is not NULL)</span><br><span> * \param[in] line single parameter line from the MGCP message</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 1 when line seems plausible, 0 on error */</span><br><span style="color: hsl(0, 100%, 40%);">-int mgcp_check_param(const struct mgcp_endpoint *endp, const char *line)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns true when line seems plausible, false on error */</span><br><span style="color: hsl(120, 100%, 40%);">+bool mgcp_check_param(const struct mgcp_endpoint *endp, struct mgcp_trunk *trunk, const char *line)</span><br><span> {</span><br><span> const size_t line_len = strlen(line);</span><br><span> if (line[0] != '\0' && line_len < 2) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Wrong MGCP option format: '%s' on %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- line, endp->name);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!endp)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "wrong MGCP option format: '%s'\n", line);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTRUNK(trunk, DLMGCP, LOGL_NOTICE, "wrong MGCP option format: '%s'\n", line);</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span> }</span><br><span> </span><br><span> /* FIXME: A couple more checks wouldn't hurt... */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span> }</span><br><span> </span><br><span> /*! Check if the specified callid seems plausible.</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index b7ae748..ef82cfd 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -851,7 +851,7 @@</span><br><span> </span><br><span> /* parse CallID C: and LocalParameters L: */</span><br><span> for_each_line(line, pdata->save) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!mgcp_check_param(endp, line))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mgcp_check_param(endp, trunk, line))</span><br><span> continue;</span><br><span> </span><br><span> switch (toupper(line[0])) {</span><br><span>@@ -1143,7 +1143,7 @@</span><br><span> }</span><br><span> </span><br><span> for_each_line(line, pdata->save) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!mgcp_check_param(endp, line))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mgcp_check_param(endp, trunk, line))</span><br><span> continue;</span><br><span> </span><br><span> switch (toupper(line[0])) {</span><br><span>@@ -1388,7 +1388,7 @@</span><br><span> }</span><br><span> </span><br><span> for_each_line(line, pdata->save) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!mgcp_check_param(endp, line))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!mgcp_check_param(endp, trunk, line))</span><br><span> continue;</span><br><span> </span><br><span> switch (toupper(line[0])) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24971">change 24971</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/+/24971"/><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: I7327c5a105e7f0e20cabf64623ff9f36fd83bbb8 </div>
<div style="display:none"> Gerrit-Change-Number: 24971 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>