From f959ad8991283acd08b5b142541db32a260c87ce Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 4 May 2016 14:51:28 +0200 Subject: cosmetic: move subscr_conn alloc&free to gsm_04_08.c Subscriber conn stuff doesn't really belong in gsm_subscriber.c. (I moved because I thought it would call some static functions in gsm_04_08.c, which ended up not being the case; anyway, it makes more sense to stay in gsm_04_08.c.) --- openbsc/src/libmsc/gsm_04_08.c | 27 +++++++++++++++++++++++++++ openbsc/src/libmsc/gsm_subscriber.c | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 657b9b4a9..68c694e2b 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -3618,6 +3618,33 @@ int gsm0408_new_conn(struct gsm_subscriber_connection *conn) return 0; } +struct gsm_subscriber_connection *msc_subscr_con_allocate(struct gsm_network *network) +{ + struct gsm_subscriber_connection *conn; + + conn = talloc_zero(network, struct gsm_subscriber_connection); + if (!conn) + return NULL; + + conn->network = network; + llist_add_tail(&conn->entry, &network->subscr_conns); + return conn; +} + +void msc_subscr_con_free(struct gsm_subscriber_connection *conn) +{ + if (!conn) + return; + + if (conn->subscr) { + subscr_put(conn->subscr); + conn->subscr = NULL; + } + + llist_del(&conn->entry); + talloc_free(conn); +} + /* here we get data from the BSC level... */ int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg) { diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index 345dda869..7b66299ec 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -419,33 +419,6 @@ void subscr_expire(struct gsm_subscriber_group *sgrp) db_subscriber_expire(sgrp->net, subscr_expire_callback); } -struct gsm_subscriber_connection *msc_subscr_con_allocate(struct gsm_network *network) -{ - struct gsm_subscriber_connection *conn; - - conn = talloc_zero(network, struct gsm_subscriber_connection); - if (!conn) - return NULL; - - conn->network = network; - llist_add_tail(&conn->entry, &network->subscr_conns); - return conn; -} - -void msc_subscr_con_free(struct gsm_subscriber_connection *conn) -{ - if (!conn) - return; - - if (conn->subscr) { - subscr_put(conn->subscr); - conn->subscr = NULL; - } - - llist_del(&conn->entry); - talloc_free(conn); -} - bool subscr_authorized(struct gsm_subscriber *subscriber) { switch (subscriber->group->net->auth_policy) { -- cgit v1.2.3