pespin submitted this change.

View Change

Make cbsp,sbcap mgr available in data model

Change-Id: I60c3ded80c38bcf50b831c6e9db719a8d2cba5b1
---
M include/osmocom/cbc/cbc_data.h
M src/cbc_main.c
2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h
index 16861e7..d96e5ca 100644
--- a/include/osmocom/cbc/cbc_data.h
+++ b/include/osmocom/cbc/cbc_data.h
@@ -42,6 +42,8 @@
 /*********************************************************************************
  * CBC itself
  *********************************************************************************/
+struct cbc_cbsp_mgr;
+struct cbc_sbcap_mgr;
 
 struct cbc {
 	struct {
@@ -61,6 +63,13 @@
 		} ecbe;
 	} config;
 
+	struct {
+		struct cbc_cbsp_mgr *mgr;
+	} cbsp;
+	struct {
+		struct cbc_sbcap_mgr *mgr;
+	} sbcap;
+
 	struct llist_head messages;	/* cbc_message.list */
 	struct llist_head expired_messages;	/* cbc_message.list */
 	struct llist_head peers;	/* cbc_peer.list */
diff --git a/src/cbc_main.c b/src/cbc_main.c
index dcc1725..f136ace 100644
--- a/src/cbc_main.c
+++ b/src/cbc_main.c
@@ -277,12 +277,12 @@
 		exit(1);
 	}
 
-	if (cbc_cbsp_mgr_create(tall_cbc_ctx) == NULL) {
+	if (!(g_cbc->cbsp.mgr = cbc_cbsp_mgr_create(tall_cbc_ctx))) {
 		perror("Error binding CBSP port");
 		exit(1);
 	}
 
-	if (cbc_sbcap_mgr_create(tall_cbc_ctx) == NULL) {
+	if (!(g_cbc->sbcap.mgr = cbc_sbcap_mgr_create(tall_cbc_ctx))) {
 		perror("Error binding SBc-AP port\n");
 		exit(1);
 	}

To view, visit change 28716. To unsubscribe, or for help writing mail filters, visit settings.