cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

mscsplit: gsm_network_init(): add explicit root talloc ctx 

Decouple the root talloc context from libbsc's global talloc_bsc_ctx.

This allows to define the root talloc ctx from a main() scope, which in turn
helps decouple libmsc from libbsc.

Change-Id: I92f6b47b1eeea2e8f3fba66f25d7e708e5659f8a
This commit is contained in:
Neels Hofmeyr 2016-05-09 19:12:44 +02:00
parent d90fa42dc9
commit 77c8d5ffb5
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openbsc/include/openbsc/gsm_data.h
View File

@ -394,8 +394,11 @@ struct gsm_sms {
char text[SMS_TEXT_SIZE];
};
struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_code,
struct gsm_network *gsm_network_init(void *ctx,
uint16_t country_code,
uint16_t network_code,
int (*mncc_recv)(struct gsm_network *, struct msgb *));
int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type);
/* Get reference to a neighbor cell on a given BCCH ARFCN */

2
openbsc/src/ipaccess/ipaccess-config.c
View File

@ -983,7 +983,7 @@ int main(int argc, char **argv)
}
libosmo_abis_init(tall_ctx_config);
bsc_gsmnet = gsm_network_init(1, 1, NULL);
bsc_gsmnet = gsm_network_init(tall_bsc_ctx, 1, 1, NULL);
if (!bsc_gsmnet)
exit(1);

2
openbsc/src/libbsc/bsc_init.c
View File

@ -477,7 +477,7 @@ int bsc_bootstrap_network(int (*mncc_recv)(struct gsm_network *, struct msgb *),
int rc;
/* initialize our data structures */
bsc_gsmnet = gsm_network_init(1, 1, mncc_recv);
bsc_gsmnet = gsm_network_init(tall_bsc_ctx, 1, 1, mncc_recv);
if (!bsc_gsmnet)
return -ENOMEM;

6
openbsc/src/libbsc/net_init.c
View File

@ -23,13 +23,15 @@
#include <stdbool.h>
struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_code,
struct gsm_network *gsm_network_init(void *ctx,
uint16_t country_code,
uint16_t network_code,
int (*mncc_recv)(struct gsm_network *, struct msgb *))
{
struct gsm_network *net;
const char *default_regexp = ".*";
net = talloc_zero(tall_bsc_ctx, struct gsm_network);
net = talloc_zero(ctx, struct gsm_network);
if (!net)
return NULL;

2
openbsc/src/utils/bs11_config.c
View File

@ -894,7 +894,7 @@ int main(int argc, char **argv)
handle_options(argc, argv);
bts_model_bs11_init();
gsmnet = gsm_network_init(1, 1, NULL);
gsmnet = gsm_network_init(tall_bs11cfg_ctx, 1, 1, NULL);
if (!gsmnet) {
fprintf(stderr, "Unable to allocate gsm network\n");
exit(1);

2
openbsc/tests/channel/channel_test.c
View File

@ -68,7 +68,7 @@ int main(int argc, char **argv)
printf("Testing the gsm_subscriber chan logic\n");
/* Create a dummy network */
network = gsm_network_init(1, 1, NULL);
network = gsm_network_init(tall_bsc_ctx, 1, 1, NULL);
if (!network)
exit(1);
bts = gsm_bts_alloc(network);

4
openbsc/tests/gsm0408/gsm0408_test.c
View File

@ -122,7 +122,7 @@ static inline void _bts_uarfcn_add(struct gsm_bts *bts, uint16_t arfcn,
static inline void test_si2q_u(void)
{
struct gsm_bts *bts;
struct gsm_network *network = gsm_network_init(1, 1, NULL);
struct gsm_network *network = gsm_network_init(tall_bsc_ctx, 1, 1, NULL);
printf("Testing SYSINFO_TYPE_2quater UARFCN generation:\n");
if (!network)
@ -149,7 +149,7 @@ static inline void test_si2q_u(void)
static inline void test_si2q_e(void)
{
struct gsm_bts *bts;
struct gsm_network *network = gsm_network_init(1, 1, NULL);
struct gsm_network *network = gsm_network_init(tall_bsc_ctx, 1, 1, NULL);
printf("Testing SYSINFO_TYPE_2quater EARFCN generation:\n");
if (!network)