Change in libosmocore[master]: gprs_ns2: use gprs_ns2_free_bind() to clean up a bind

lynxis lazus gerrit-no-reply at lists.osmocom.org
Tue Jul 6 09:49:48 UTC 2021


lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24856 )

Change subject: gprs_ns2: use gprs_ns2_free_bind() to clean up a bind
......................................................................

gprs_ns2: use gprs_ns2_free_bind() to clean up a bind

gprs_ns2_free_bind() takes care of all required steps to clean up a bind.
The driver->free_bind() operation only cleans up the driver internal state
but not NSVCs and other generic things.
Fixes a crash when free'ing a bind from the vty which has active NSVCs.

Related: OS#5195
Change-Id: I0a2ad22905bcacb929b9b5f5b034af0da3081826
---
M src/gb/gprs_ns2_vty.c
M tests/gb/gprs_ns2_vty.vty
2 files changed, 7 insertions(+), 3 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  daniel: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c
index 705b60e..2f540c2 100644
--- a/src/gb/gprs_ns2_vty.c
+++ b/src/gb/gprs_ns2_vty.c
@@ -423,7 +423,7 @@
 	vty_bind_free(vbind);
 	bind = gprs_ns2_bind_by_name(vty_nsi, name);
 	if (bind)
-		bind->driver->free_bind(bind);
+		gprs_ns2_free_bind(bind);
 	return CMD_SUCCESS;
 }
 
@@ -678,7 +678,7 @@
 		return CMD_ERR_NOTHING_TODO;
 
 	OSMO_ASSERT(bind->ll == GPRS_NS2_LL_UDP);
-	bind->driver->free_bind(bind);
+	gprs_ns2_free_bind(bind);
 	return CMD_SUCCESS;
 }
 
@@ -939,7 +939,7 @@
 		return CMD_WARNING;
 	}
 
-	bind->driver->free_bind(bind);
+	gprs_ns2_free_bind(bind);
 	return CMD_SUCCESS;
 }
 
diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty
index 4589f96..458e2c8 100644
--- a/tests/gb/gprs_ns2_vty.vty
+++ b/tests/gb/gprs_ns2_vty.vty
@@ -83,3 +83,7 @@
 OsmoNSdummy(config-ns-nse)# ip-sns-remote 127.0.0.1 22222
 Specified SNS endpoint already part of the NSE.
 OsmoNSdummy(config-ns-nse)# exit
+OsmoNSdummy(config-ns)# no bind abc
+OsmoNSdummy(config-ns)# no bind abc77
+bind abc77 does not exist!
+OsmoNSdummy(config-ns)# exit

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0a2ad22905bcacb929b9b5f5b034af0da3081826
Gerrit-Change-Number: 24856
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210706/20bd0b5b/attachment.htm>


More information about the gerrit-log mailing list