<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/23503">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1d: fix ASSERT during "write terminal"<br><br>There was some wrong ordering in config_write_e1d() regarding<br>resolving the vpair 'peer' devices.  We can only call<br>e1d_vpair_intf_peer() _after_  we have established that the<br>given interface actually is of type VPAIR.<br><br>Assert failed intf->drv == E1_DRIVER_VPAIR vpair.c:96<br><br>Change-Id: If494d77ed1df5cda655d3b4a60868154dc2b355e<br>---<br>M src/vty.c<br>1 file changed, 5 insertions(+), 1 deletion(-)<br><br></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 0d8ab2b..563950d 100644</span><br><span>--- a/src/vty.c</span><br><span>+++ b/src/vty.c</span><br><span>@@ -185,12 +185,16 @@</span><br><span> </span><br><span>       /* find all vpair interfaces */</span><br><span>      llist_for_each_entry(intf, &vty_e1d->interfaces, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-         struct e1_intf *peer = e1d_vpair_intf_peer(intf);</span><br><span style="color: hsl(120, 100%, 40%);">+             struct e1_intf *peer;</span><br><span>                unsigned int line_count = 0;</span><br><span>                 struct e1_line *line;</span><br><span> </span><br><span>            if (intf->drv != E1_DRIVER_VPAIR)</span><br><span>                         continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           peer = e1d_vpair_intf_peer(intf);</span><br><span style="color: hsl(120, 100%, 40%);">+             OSMO_ASSERT(peer);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>                 /* skip the 'mirror' interfaces */</span><br><span>           if (intf->id > peer->id)</span><br><span>                    continue;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/23503">change 23503</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/+/23503"/><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: If494d77ed1df5cda655d3b4a60868154dc2b355e </div>
<div style="display:none"> Gerrit-Change-Number: 23503 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>