Change in osmo-e1d[master]: e1d: fix ASSERT during "write terminal"

laforge gerrit-no-reply at lists.osmocom.org
Fri Mar 26 08:32:39 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/23503 )

Change subject: e1d: fix ASSERT during "write terminal"
......................................................................

e1d: fix ASSERT during "write terminal"

There was some wrong ordering in config_write_e1d() regarding
resolving the vpair 'peer' devices.  We can only call
e1d_vpair_intf_peer() _after_  we have established that the
given interface actually is of type VPAIR.

Assert failed intf->drv == E1_DRIVER_VPAIR vpair.c:96

Change-Id: If494d77ed1df5cda655d3b4a60868154dc2b355e
---
M src/vty.c
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/vty.c b/src/vty.c
index 0d8ab2b..563950d 100644
--- a/src/vty.c
+++ b/src/vty.c
@@ -185,12 +185,16 @@
 
 	/* find all vpair interfaces */
 	llist_for_each_entry(intf, &vty_e1d->interfaces, list) {
-		struct e1_intf *peer = e1d_vpair_intf_peer(intf);
+		struct e1_intf *peer;
 		unsigned int line_count = 0;
 		struct e1_line *line;
 
 		if (intf->drv != E1_DRIVER_VPAIR)
 			continue;
+
+		peer = e1d_vpair_intf_peer(intf);
+		OSMO_ASSERT(peer);
+
 		/* skip the 'mirror' interfaces */
 		if (intf->id > peer->id)
 			continue;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/23503
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: If494d77ed1df5cda655d3b4a60868154dc2b355e
Gerrit-Change-Number: 23503
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210326/3a54b6a5/attachment.htm>


More information about the gerrit-log mailing list