<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/21781">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vpair: fix writing config file with vpairs configured<br><br>prior to this patch, the configured vpair interfaces would not<br>be saved to the config file on 'write file'.<br><br>Change-Id: Iff6551318534a3717c374060082147f17b925a21<br>---<br>M doc/examples/osmo-e1d-vpair.cfg<br>M src/e1d.h<br>M src/vpair.c<br>M src/vty.c<br>4 files changed, 77 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/81/21781/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/osmo-e1d-vpair.cfg b/doc/examples/osmo-e1d-vpair.cfg</span><br><span>index 32742de..04bdb72 100644</span><br><span>--- a/doc/examples/osmo-e1d-vpair.cfg</span><br><span>+++ b/doc/examples/osmo-e1d-vpair.cfg</span><br><span>@@ -1,2 +1,2 @@</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-virtual-e1-pair 1</span><br><span style="color: hsl(120, 100%, 40%);">+e1d</span><br><span style="color: hsl(120, 100%, 40%);">+ virtual-e1-pair 1</span><br><span>diff --git a/src/e1d.h b/src/e1d.h</span><br><span>index c35f4a8..a7ba005 100644</span><br><span>--- a/src/e1d.h</span><br><span>+++ b/src/e1d.h</span><br><span>@@ -146,3 +146,6 @@</span><br><span> </span><br><span> int</span><br><span> e1d_vpair_create(struct e1_daemon *e1d, unsigned int num_lines);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct e1_intf *</span><br><span style="color: hsl(120, 100%, 40%);">+e1d_vpair_intf_peer(struct e1_intf *intf);</span><br><span>diff --git a/src/vpair.c b/src/vpair.c</span><br><span>index 12452fe..df14026 100644</span><br><span>--- a/src/vpair.c</span><br><span>+++ b/src/vpair.c</span><br><span>@@ -88,6 +88,15 @@</span><br><span> talloc_free(intf->drv_data);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* resolve the peer of a given interface */</span><br><span style="color: hsl(120, 100%, 40%);">+struct e1_intf *</span><br><span style="color: hsl(120, 100%, 40%);">+e1d_vpair_intf_peer(struct e1_intf *intf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ve1_intf_data *intf_data = intf->drv_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(intf->drv == E1_DRIVER_VPAIR);</span><br><span style="color: hsl(120, 100%, 40%);">+ return intf_data->peer;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int</span><br><span> ve1_timerfd_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span>diff --git a/src/vty.c b/src/vty.c</span><br><span>index 0690177..1caa54f 100644</span><br><span>--- a/src/vty.c</span><br><span>+++ b/src/vty.c</span><br><span>@@ -41,6 +41,16 @@</span><br><span> </span><br><span> static struct e1_daemon *vty_e1d;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum e1d_vty_node {</span><br><span style="color: hsl(120, 100%, 40%);">+ E1D_NODE = _LAST_OSMOVTY_NODE + 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%);">+static struct cmd_node e1d_node = {</span><br><span style="color: hsl(120, 100%, 40%);">+ (enum node_type) E1D_NODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s(config-e1d)# ",</span><br><span style="color: hsl(120, 100%, 40%);">+ 1,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #if 0</span><br><span> static void vty_dump_ts(struct vty *vty, const struct e1_ts *ts)</span><br><span> {</span><br><span>@@ -142,6 +152,14 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_e1d, cfg_e1d_cmd, "e1d",</span><br><span style="color: hsl(120, 100%, 40%);">+ "E1 Daemon sspecific configuration\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty->node = E1D_NODE;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_vpair, cfg_vpair_cmd, "virtual-e1-pair <1-255>",</span><br><span> "Create a virtual E1 interface pair\n"</span><br><span> "Number of E1 lines in virtual E1 interface pair\n")</span><br><span>@@ -158,11 +176,55 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static bool intf_arr_contains(struct e1_intf **arr, unsigned int arr_cnt, struct e1_intf *intf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < arr_cnt; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (arr[i] == intf)</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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 config_write_e1d(struct vty *vty)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_intf *intf;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_intf *intf_b[256];</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int num_intf_b = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "pcu%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* find all vpair interfaces */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(intf, &vty_e1d->interfaces, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int line_count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_line *line;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (intf->drv != E1_DRIVER_VPAIR)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* skip the 'mirror' interfaces */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (intf_arr_contains(intf_b, ARRAY_SIZE(intf_b), intf))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(line, &intf->lines, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ line_count++;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " virtual-e1-pair %u%s", line_count, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* memorize the peer so we don't save it twice */</span><br><span style="color: hsl(120, 100%, 40%);">+ intf_b[num_intf_b++] = e1d_vpair_intf_peer(intf);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (num_intf_b >= ARRAY_SIZE(intf_b))</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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> void e1d_vty_init(struct e1_daemon *e1d)</span><br><span> {</span><br><span> vty_e1d = e1d;</span><br><span> install_element_ve(&show_intf_cmd);</span><br><span> install_element_ve(&show_line_cmd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- install_element(CONFIG_NODE, &cfg_vpair_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_node(&e1d_node, config_write_e1d);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(CONFIG_NODE, &cfg_e1d_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(E1D_NODE, &cfg_vpair_cmd);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/21781">change 21781</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-e1d/+/21781"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iff6551318534a3717c374060082147f17b925a21 </div>
<div style="display:none"> Gerrit-Change-Number: 21781 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>