From 77c8d5ffb52bd5da405fc869286b4f7aa7f88d4d Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 9 May 2016 19:12:44 +0200 Subject: 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 --- openbsc/tests/channel/channel_test.c | 2 +- openbsc/tests/gsm0408/gsm0408_test.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'openbsc/tests') diff --git a/openbsc/tests/channel/channel_test.c b/openbsc/tests/channel/channel_test.c index 567460722..924d763ff 100644 --- a/openbsc/tests/channel/channel_test.c +++ b/openbsc/tests/channel/channel_test.c @@ -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); diff --git a/openbsc/tests/gsm0408/gsm0408_test.c b/openbsc/tests/gsm0408/gsm0408_test.c index 7acc93f96..e81394f25 100644 --- a/openbsc/tests/gsm0408/gsm0408_test.c +++ b/openbsc/tests/gsm0408/gsm0408_test.c @@ -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) -- cgit v1.2.3