<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24822">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_ctrl: add functions to inspect trunk usage<br><br>It is useful to have control commands to check on the number of<br>endpoints and of the number of endpoints in use. This would allow<br>operators to monitor the MGW usage and also simplifies TTCN3 tests<br><br>Change-Id: Ib8b5a6e733f521828647742085cad8eccb3e715b<br>---<br>M include/osmocom/mgcp/mgcp_ctrl.h<br>M src/libosmo-mgcp/mgcp_ctrl.c<br>2 files changed, 80 insertions(+), 10 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/22/24822/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_ctrl.h b/include/osmocom/mgcp/mgcp_ctrl.h</span><br><span>index d7ab7cb..a2d929d 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_ctrl.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_ctrl.h</span><br><span>@@ -19,6 +19,12 @@</span><br><span> </span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct ctrl_handle *mgw_ctrl_interface_setup(struct mgcp_config *cfg,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *bind_addr, uint16_t port);</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/ctrl/control_cmd.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum bsc_ctrl_node {</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_NODE_TRUNK = _LAST_CTRL_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ _LAST_CTRL_NODE_MGW</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%);">+struct ctrl_handle *mgw_ctrl_interface_setup(struct mgcp_config *cfg,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *bind_addr, uint16_t port);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_ctrl.c b/src/libosmo-mgcp/mgcp_ctrl.c</span><br><span>index 0ba231b..b3dce30 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_ctrl.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_ctrl.c</span><br><span>@@ -19,18 +19,82 @@</span><br><span> </span><br><span> #include <osmocom/ctrl/control_if.h></span><br><span> #include <osmocom/mgcp/mgcp.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp/mgcp_ctrl.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp/mgcp_trunk.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp/mgcp_protocol.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp/mgcp_endp.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static struct mgcp_config *g_cfg = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int mgw_ctrl_node_lookup(void *data, vector vline, int *node_type,</span><br><span style="color: hsl(0, 100%, 40%);">- void **node_data, int *i)</span><br><span style="color: hsl(120, 100%, 40%);">+CTRL_CMD_DEFINE_RO(endpoint_usage, "endpoint_usage");</span><br><span style="color: hsl(120, 100%, 40%);">+static int get_endpoint_usage(struct ctrl_cmd *cmd, void *data)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_trunk *trunk = cmd->node;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int endpoints_in_use = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trunk)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CTRL_CMD_ERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < trunk->number_endpoints; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk->endpoints[i]->callid)</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoints_in_use++;</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%);">+ cmd->reply = talloc_asprintf(cmd, "%i", endpoints_in_use);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CTRL_CMD_REPLY;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct ctrl_handle *mgw_ctrl_interface_setup(struct mgcp_config *cfg,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *bind_addr, uint16_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+CTRL_CMD_DEFINE_RO(endpoint_count, "endpoint_count");</span><br><span style="color: hsl(120, 100%, 40%);">+static int get_endpoint_count(struct ctrl_cmd *cmd, void *data)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return ctrl_interface_setup_dynip2(cfg, bind_addr, port, mgw_ctrl_node_lookup,</span><br><span style="color: hsl(0, 100%, 40%);">- _LAST_CTRL_NODE);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_trunk *trunk = cmd->node;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trunk)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CTRL_CMD_ERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->reply = talloc_asprintf(cmd, "%i", trunk->number_endpoints);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CTRL_CMD_REPLY;</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%);">+static int mgw_ctrl_node_lookup(void *data, vector vline, int *node_type, void **node_data, int *i)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *token = vector_slot(vline, *i);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int k;</span><br><span style="color: hsl(120, 100%, 40%);">+ char trunk_prefix_buf[MGCP_ENDPOINT_MAXLEN];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (*node_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case CTRL_NODE_ROOT:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(token, "trunk") != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ (*i)++;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Since it is illegal to use a '/' in ctrl commands, the control interface uses ':' as separator</span><br><span style="color: hsl(120, 100%, 40%);">+ * instead. */</span><br><span style="color: hsl(120, 100%, 40%);">+ strncpy(trunk_prefix_buf, vector_slot(vline, *i), sizeof(trunk_prefix_buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ for (k = 0; k < strlen(trunk_prefix_buf); k++)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk_prefix_buf[k] == ':')</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk_prefix_buf[k] = '/';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *node_data = mgcp_trunk_by_name(g_cfg, trunk_prefix_buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ *node_type = CTRL_NODE_TRUNK;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</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 style="color: hsl(120, 100%, 40%);">+ return 1;</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%);">+struct ctrl_handle *mgw_ctrl_interface_setup(struct mgcp_config *cfg, const char *bind_addr, uint16_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ctrl_handle *handle;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg = cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ handle = ctrl_interface_setup_dynip2(cfg, bind_addr, port, mgw_ctrl_node_lookup, _LAST_CTRL_NODE_MGW);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(ctrl_cmd_install(CTRL_NODE_TRUNK, &cmd_endpoint_usage) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(ctrl_cmd_install(CTRL_NODE_TRUNK, &cmd_endpoint_count) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return handle;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24822">change 24822</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/+/24822"/><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: Ib8b5a6e733f521828647742085cad8eccb3e715b </div>
<div style="display:none"> Gerrit-Change-Number: 24822 </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>