aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-09-16 01:38:46 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-10-13 04:17:40 +0200
commit4ff1a5a957859ceec50f3f191399da5163198ff5 (patch)
tree917b22f0d57a02bb981225cb4560af23221a63e0
parentf7f17d4b8f56d5cbcd88c052d05b8dde382022db (diff)
fix msgb talloc context initialization
Properly initialize msgb talloc context in hnbgw and all tests, using the new msgb_talloc_ctx_init(). test-ranap.c: since msgb talloc ctx is now in test_common_init(), remove msgb talloc init here. Change-Id: I807c799aff1239184728551ed77fdafa73bd683f
-rw-r--r--src/hnbgw.c1
-rw-r--r--src/tests/test-ranap.c2
-rw-r--r--src/tests/test-ranap.ok2
-rw-r--r--src/tests/test_common.c1
4 files changed, 3 insertions, 3 deletions
diff --git a/src/hnbgw.c b/src/hnbgw.c
index 500cf0f..8d6dbb1 100644
--- a/src/hnbgw.c
+++ b/src/hnbgw.c
@@ -454,6 +454,7 @@ int main(int argc, char **argv)
tall_hnb_ctx = talloc_named_const(NULL, 0, "hnb_context");
talloc_asn1_ctx = talloc_named_const(NULL, 0, "asn1_context");
+ msgb_talloc_ctx_init(tall_hnb_ctx, 0);
g_hnb_gw = hnb_gw_create(tall_hnb_ctx);
g_hnb_gw->config.rnc_id = 23;
diff --git a/src/tests/test-ranap.c b/src/tests/test-ranap.c
index c70009b..c1c7003 100644
--- a/src/tests/test-ranap.c
+++ b/src/tests/test-ranap.c
@@ -97,8 +97,6 @@ int main(int argc, char **argv)
//asn_debug = 1;
- msgb_set_talloc_ctx(talloc_named_const(NULL, 1, "msgb"));
-
test_common_init();
test_aper_int(1);
diff --git a/src/tests/test-ranap.ok b/src/tests/test-ranap.ok
index 2ad19e6..bda3c8e 100644
--- a/src/tests/test-ranap.ok
+++ b/src/tests/test-ranap.ok
@@ -214,5 +214,5 @@ Decoded Cause Misc=115
00 0a 00 11 00 00 01 00 29 40 0a 00 00 01 00 28 40 03 05 c2 d0
report
talloc report on 'asn1_context' (total 0 bytes in 1 blocks)
-talloc report on 'msgb' (total 1 bytes in 1 blocks)
+talloc report on 'msgb' (total 0 bytes in 1 blocks)
exit
diff --git a/src/tests/test_common.c b/src/tests/test_common.c
index 5a37e7e..ba00709 100644
--- a/src/tests/test_common.c
+++ b/src/tests/test_common.c
@@ -78,6 +78,7 @@ int test_common_init(void)
{
int rc;
+ msgb_talloc_ctx_init(NULL, 0);
talloc_asn1_ctx = talloc_named_const(NULL, 0, "asn1_context");
rc = osmo_init_logging(&test_log_info);