<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11238">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: make 'show calls summary' more userfriendly<br><br>Display a table with one row per call (instead of two lines per call),<br>and display the phone numbers of the people making the calls instead of<br>internal IDs. This should make the VTY command friendlier for end users,<br>especially if they have bigger networks. There is still the 'show calls'<br>command with all the verbose output.<br><br>Example output:<br><br>OsmoSIPcon> show calls summary<br>No active calls.<br>OsmoSIPcon> show calls summary<br>ID | From | To | State<br>5003 | 101 | 100 | PROCEEDING<br>OsmoSIPcon> show calls summary<br>ID | From | To | State<br>5003 | 101 | 100 | CONNECTED<br><br>Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906<br>---<br>M src/vty.c<br>1 file changed, 26 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/38/11238/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty.c b/src/vty.c</span><br><span>index 540e2de..eb236b4 100644</span><br><span>--- a/src/vty.c</span><br><span>+++ b/src/vty.c</span><br><span>@@ -256,39 +256,34 @@</span><br><span>      "show calls summary",</span><br><span>      SHOW_STR "Current calls\nBrief overview\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      struct call *call;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      llist_for_each_entry(call, &g_call_list, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">-           char *initial_type, *initial_state;</span><br><span style="color: hsl(0, 100%, 40%);">-             char *remote_type, *remote_state;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               initial_type = initial_state = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-            remote_type = remote_state = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-              if (call->initial) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 initial_type = talloc_strdup(tall_mncc_ctx,</span><br><span style="color: hsl(0, 100%, 40%);">-                                             call_leg_type(call->initial));</span><br><span style="color: hsl(0, 100%, 40%);">-                       initial_state = talloc_strdup(tall_mncc_ctx,</span><br><span style="color: hsl(0, 100%, 40%);">-                                            call_leg_state(call->initial));</span><br><span style="color: hsl(0, 100%, 40%);">-              }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               if (call->remote) {</span><br><span style="color: hsl(0, 100%, 40%);">-                  remote_type = talloc_strdup(tall_mncc_ctx,</span><br><span style="color: hsl(0, 100%, 40%);">-                                              call_leg_type(call->remote));</span><br><span style="color: hsl(0, 100%, 40%);">-                        remote_state = talloc_strdup(tall_mncc_ctx,</span><br><span style="color: hsl(0, 100%, 40%);">-                                             call_leg_state(call->remote));</span><br><span style="color: hsl(0, 100%, 40%);">-               }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               vty_out(vty, "Call(%u) initial(type=%s,state=%s) remote(type=%s,state=%s)%s",</span><br><span style="color: hsl(0, 100%, 40%);">-                 call->id, initial_type, initial_state, remote_type, remote_state,</span><br><span style="color: hsl(0, 100%, 40%);">-                    VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-           talloc_free(initial_type);</span><br><span style="color: hsl(0, 100%, 40%);">-              talloc_free(initial_state);</span><br><span style="color: hsl(0, 100%, 40%);">-             talloc_free(remote_type);</span><br><span style="color: hsl(0, 100%, 40%);">-               talloc_free(remote_state);</span><br><span style="color: hsl(120, 100%, 40%);">+    /* don't print a table for zero active calls */</span><br><span style="color: hsl(120, 100%, 40%);">+   if(llist_empty(&g_call_list)) {</span><br><span style="color: hsl(120, 100%, 40%);">+           vty_out(vty, "No active calls.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+            return CMD_SUCCESS;</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* table head */</span><br><span style="color: hsl(120, 100%, 40%);">+      vty_out(vty, "ID | From | To | State%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    /* iterate over calls */</span><br><span style="color: hsl(120, 100%, 40%);">+      struct call *call;</span><br><span style="color: hsl(120, 100%, 40%);">+    llist_for_each_entry(call, &g_call_list, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+         /* only look at the initial=MNCC call */</span><br><span style="color: hsl(120, 100%, 40%);">+              if(call->initial->type == CALL_TYPE_MNCC) {</span><br><span style="color: hsl(120, 100%, 40%);">+                     struct mncc_call_leg *leg = (struct mncc_call_leg *) call->initial;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                      /* table row */</span><br><span style="color: hsl(120, 100%, 40%);">+                       char *called = talloc_strdup(tall_mncc_ctx, leg->called.number);</span><br><span style="color: hsl(120, 100%, 40%);">+                   char *calling = talloc_strdup(tall_mncc_ctx, leg->calling.number);</span><br><span style="color: hsl(120, 100%, 40%);">+                 char *state = talloc_strdup(tall_mncc_ctx, call_leg_state(call->initial));</span><br><span style="color: hsl(120, 100%, 40%);">+                 vty_out(vty, "%u | %s | %s | %s%s", call->id, calling, called, state, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                    /* clean up */</span><br><span style="color: hsl(120, 100%, 40%);">+                        talloc_free(called);</span><br><span style="color: hsl(120, 100%, 40%);">+                  talloc_free(calling);</span><br><span style="color: hsl(120, 100%, 40%);">+                 talloc_free(state);</span><br><span style="color: hsl(120, 100%, 40%);">+           }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span>    return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11238">change 11238</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/11238"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sip-connector </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2092d58d80a34e6083f618593b92bb9e838aa906 </div>
<div style="display:none"> Gerrit-Change-Number: 11238 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>