Review at  https://gerrit.osmocom.org/6032

remove traces of bsc_subscriber

Change-Id: I8672f0a76cb47595444a7ddbc4f34fc4ddaeb375
---
M include/osmocom/msc/gsm_data.h
M src/libcommon-cs/common_cs.c
2 files changed, 0 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/6032/1

diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index cb6b3c0..a122bc6 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -26,7 +26,6 @@
 
 struct mncc_sock_state;
 struct gsm_subscriber_group;
-struct bsc_subscr;
 struct vlr_instance;
 struct vlr_subscr;
 struct ranap_ue_conn_ctx;
@@ -144,9 +143,6 @@
        /* The MS has opened the conn with a CM Service Request, and we shall
         * keep it open for an actual request (or until timeout). */
        bool received_cm_service_request;
-
-       /* libbsc subscriber information (if available) */
-       struct bsc_subscr *bsub;
 
        /* libmsc/libvlr subscriber information (if available) */
        struct vlr_subscr *vsub;
@@ -446,14 +442,6 @@
         * OsmoMSC, this should be tied to the location area code (LAC). */
        struct gsm_tz tz;
 
-       /* List of all struct bsc_subscr used in libbsc. This llist_head is
-        * allocated so that the llist_head pointer itself can serve as a
-        * talloc context (useful to not have to pass the entire gsm_network
-        * struct to the bsc_subscr_* API, and for bsc_susbscr unit tests to
-        * not require gsm_data.h). In an MSC-without-BSC environment, this
-        * pointer is NULL to indicate absence of a bsc_subscribers list. */
-       struct llist_head *bsc_subscribers;
-
        /* MSC: GSUP server address of the HLR */
        const char *gsup_server_addr_str;
        uint16_t gsup_server_port;
@@ -557,9 +545,6 @@
 
 int gsm48_ra_id_by_bts(uint8_t *buf, struct gsm_bts *bts);
 void gprs_ra_id_by_bts(struct gprs_ra_id *raid, struct gsm_bts *bts);
-
-struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_lchan 
*lchan);
-void bsc_subscr_con_free(struct gsm_subscriber_connection *conn);
 
 struct gsm_subscriber_connection *msc_subscr_con_allocate(struct gsm_network 
*network);
 void msc_subscr_con_free(struct gsm_subscriber_connection *conn);
diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c
index 9edf7c5..170b62a 100644
--- a/src/libcommon-cs/common_cs.c
+++ b/src/libcommon-cs/common_cs.c
@@ -68,9 +68,6 @@
        INIT_LLIST_HEAD(&net->upqueue);
        INIT_LLIST_HEAD(&net->subscr_conns);
 
-       net->bsc_subscribers = talloc_zero(net, struct llist_head);
-       INIT_LLIST_HEAD(net->bsc_subscribers);
-
        /* init statistics */
        net->msc_ctrs = rate_ctr_group_alloc(net, &msc_ctrg_desc, 0);
        if (!net->msc_ctrs) {

-- 
To view, visit https://gerrit.osmocom.org/6032
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8672f0a76cb47595444a7ddbc4f34fc4ddaeb375
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>

Reply via email to