<p>keith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/21118">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Include vty command 'pcap' in vty output<br><br>Ensure that a configured pcap command appears in 'show running-config'<br>and is written to the config file on issuing 'write'<br><br>Change-Id: I316c3d6a839e84c2f52a148c6b8dd6f5933cf4bf<br>---<br>M include/osmocom/abis/e1_input.h<br>M src/e1_input_vty.c<br>2 files changed, 24 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/18/21118/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h</span><br><span>index 44708bb..795c83a 100644</span><br><span>--- a/include/osmocom/abis/e1_input.h</span><br><span>+++ b/include/osmocom/abis/e1_input.h</span><br><span>@@ -194,6 +194,7 @@</span><br><span>    struct llist_head list;</span><br><span>      int refcnt; /* unusued, kept for ABI compat, use_count is used instead */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ char *pcap_file;</span><br><span>     unsigned int num;</span><br><span>    const char *name;</span><br><span>    unsigned int port_nr;</span><br><span>diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c</span><br><span>index d915c19..cc4bc17 100644</span><br><span>--- a/src/e1_input_vty.c</span><br><span>+++ b/src/e1_input_vty.c</span><br><span>@@ -250,7 +250,15 @@</span><br><span>       "Setup a pcap recording of all E1 traffic\n"</span><br><span>       "Filename to save the packets to\n", CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+    struct e1inp_line *line;</span><br><span>     int fd;</span><br><span style="color: hsl(120, 100%, 40%);">+       int e1_nr = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      line = e1inp_line_find(e1_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!line) {</span><br><span style="color: hsl(120, 100%, 40%);">+          vty_out(vty, "%% Line %d doesn't exist%s", e1_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+         return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span> </span><br><span>        fd = open(argv[0], O_WRONLY | O_CREAT | O_TRUNC, 0660);</span><br><span>      if (fd < 0) {</span><br><span>@@ -259,6 +267,11 @@</span><br><span>      }</span><br><span> </span><br><span>        e1_set_pcap_fd(fd);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (line->pcap_file) {</span><br><span style="color: hsl(120, 100%, 40%);">+             talloc_free((void *)line->pcap_file);</span><br><span style="color: hsl(120, 100%, 40%);">+              line->pcap_file = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span style="color: hsl(120, 100%, 40%);">+     line->pcap_file = talloc_strdup(line, argv[0]);</span><br><span> </span><br><span>       return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -268,7 +281,15 @@</span><br><span>         NO_STR "Disable pcap recording of all E1 traffic\n",</span><br><span>       CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+   struct e1inp_line *line;</span><br><span style="color: hsl(120, 100%, 40%);">+      int e1_nr = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+        line = e1inp_line_find(e1_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     e1_set_pcap_fd(-1);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (line->pcap_file) {</span><br><span style="color: hsl(120, 100%, 40%);">+             talloc_free((void *)line->pcap_file);</span><br><span style="color: hsl(120, 100%, 40%);">+              line->pcap_file = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span>    return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -329,6 +350,8 @@</span><br><span>                   vty_out(vty, " e1_line %u ipa-keepalive %d %d%s", line->num,</span><br><span>                            line->ipa_kap->interval, line->ipa_kap->wait_for_resp,</span><br><span>                           VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+         if (line->pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+                       vty_out(vty, " pcap %s%s", line->pcap_file, VTY_NEWLINE);</span><br><span>       }</span><br><span> </span><br><span>        const char *ipa_bind = e1inp_ipa_get_bind_addr();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/21118">change 21118</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/libosmo-abis/+/21118"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I316c3d6a839e84c2f52a148c6b8dd6f5933cf4bf </div>
<div style="display:none"> Gerrit-Change-Number: 21118 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>