Change in libosmocore[master]: gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE

[lynxis lazus]

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

Change subject: gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE
......................................................................

gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE

Change-Id: I909443b540dbf75146297f1d7f94940690be6c0d
---
M include/osmocom/gprs/gprs_ns2.h
M src/gb/gprs_ns2.c
M src/gb/libosmogb.map
3 files changed, 18 insertions(+), 6 deletions(-)

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



diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h
index 41587d3..00879d7 100644
--- a/include/osmocom/gprs/gprs_ns2.h
+++ b/include/osmocom/gprs/gprs_ns2.h
@@ -160,6 +160,7 @@
 
 /* create vc */
 void gprs_ns2_free_nsvc(struct gprs_ns2_vc *nsvc);
+void gprs_ns2_free_nsvcs(struct gprs_ns2_nse *nse);
 struct gprs_ns2_vc *gprs_ns2_nsvc_by_nsvci(struct gprs_ns2_inst *nsi, uint16_t nsvci);
 
 /* generic VL driver */
diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c
index bd69acf..21c69cb 100644
--- a/src/gb/gprs_ns2.c
+++ b/src/gb/gprs_ns2.c
@@ -562,6 +562,21 @@
 	talloc_free(nsvc);
 }
 
+/*! Destroy/release all NS-VC of given NSE
+ *  \param[in] nse NSE
+ */
+void gprs_ns2_free_nsvcs(struct gprs_ns2_nse *nse)
+{
+	struct gprs_ns2_vc *nsvc, *tmp;
+
+	if (!nse)
+		return;
+
+	llist_for_each_entry_safe(nsvc, tmp, &nse->nsvc, list) {
+		gprs_ns2_free_nsvc(nsvc);
+	}
+}
+
 /*! Allocate a message buffer for use with the NS2 stack. */
 struct msgb *gprs_ns2_msgb_alloc(void)
 {
@@ -722,15 +737,10 @@
  *  \param[in] nse NS Entity to destroy */
 void gprs_ns2_free_nse(struct gprs_ns2_nse *nse)
 {
-	struct gprs_ns2_vc *nsvc, *tmp;
-
 	if (!nse)
 		return;
 
-	llist_for_each_entry_safe(nsvc, tmp, &nse->nsvc, list) {
-		gprs_ns2_free_nsvc(nsvc);
-	}
-
+	gprs_ns2_free_nsvcs(nse);
 	ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_FAILURE);
 
 	llist_del(&nse->list);
diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map
index 7cc1cc8..d4114df 100644
--- a/src/gb/libosmogb.map
+++ b/src/gb/libosmogb.map
@@ -120,6 +120,7 @@
 gprs_ns2_free_nse;
 gprs_ns2_free_nses;
 gprs_ns2_free_nsvc;
+gprs_ns2_free_nsvcs;
 gprs_ns2_frgre_bind;
 gprs_ns2_fr_bind;
 gprs_ns2_fr_bind_netif;

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I909443b540dbf75146297f1d7f94940690be6c0d
Gerrit-Change-Number: 21572
Gerrit-PatchSet: 12
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/20201215/702924b5/attachment.htm>