From 5a45b156d4165fed159a290c46676d1383ffcc80 Mon Sep 17 00:00:00 2001 From: Jonathan Santos Date: Wed, 17 Aug 2011 15:33:57 -0400 Subject: New upstream version 0.9.14 --- tests/Makefile.in | 4 +- tests/bsc-nat/Makefile.am | 4 +- tests/bsc-nat/Makefile.in | 11 ++-- tests/bsc-nat/bsc_data.c | 22 ++++++++ tests/bsc-nat/bsc_nat_test.c | 126 +++++++++++++++++++++++++++---------------- tests/channel/Makefile.am | 4 +- tests/channel/Makefile.in | 9 ++-- tests/channel/channel_test.c | 6 +-- tests/db/Makefile.am | 4 +- tests/db/Makefile.in | 10 ++-- tests/debug/Makefile.in | 4 +- tests/debug/debug_test.c | 2 +- tests/gsm0408/Makefile.am | 4 +- tests/gsm0408/Makefile.in | 11 ++-- tests/gsm0408/gsm0408_test.c | 10 ++-- tests/mgcp/Makefile.in | 4 +- tests/mgcp/mgcp_test.c | 9 ++-- 17 files changed, 158 insertions(+), 86 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.in b/tests/Makefile.in index f5e61eb4f..116ab92fc 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -35,7 +35,7 @@ POST_UNINSTALL = : subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -124,6 +124,8 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOSMOCORE_CFLAGS = @LIBOSMOCORE_CFLAGS@ LIBOSMOCORE_LIBS = @LIBOSMOCORE_LIBS@ +LIBOSMOGSM_CFLAGS = @LIBOSMOGSM_CFLAGS@ +LIBOSMOGSM_LIBS = @LIBOSMOGSM_LIBS@ LIBOSMOSCCP_CFLAGS = @LIBOSMOSCCP_CFLAGS@ LIBOSMOSCCP_LIBS = @LIBOSMOSCCP_LIBS@ LIBOSMOVTY_CFLAGS = @LIBOSMOVTY_CFLAGS@ diff --git a/tests/bsc-nat/Makefile.am b/tests/bsc-nat/Makefile.am index 04bdb9789..478509842 100644 --- a/tests/bsc-nat/Makefile.am +++ b/tests/bsc-nat/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) EXTRA_DIST = bsc_data.c @@ -16,4 +16,4 @@ bsc_nat_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_srcdir)/src/libabis/libabis.a \ $(top_srcdir)/src/libtrau/libtrau.a \ $(top_srcdir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) -lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) diff --git a/tests/bsc-nat/Makefile.in b/tests/bsc-nat/Makefile.in index 280d22d7a..6e1d0941a 100644 --- a/tests/bsc-nat/Makefile.in +++ b/tests/bsc-nat/Makefile.in @@ -36,7 +36,7 @@ noinst_PROGRAMS = bsc_nat_test$(EXEEXT) subdir = tests/bsc-nat DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -54,7 +54,8 @@ bsc_nat_test_DEPENDENCIES = $(top_builddir)/src/libbsc/libbsc.a \ $(top_srcdir)/src/libabis/libabis.a \ $(top_srcdir)/src/libtrau/libtrau.a \ $(top_srcdir)/src/libcommon/libcommon.a $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -116,6 +117,8 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOSMOCORE_CFLAGS = @LIBOSMOCORE_CFLAGS@ LIBOSMOCORE_LIBS = @LIBOSMOCORE_LIBS@ +LIBOSMOGSM_CFLAGS = @LIBOSMOGSM_CFLAGS@ +LIBOSMOGSM_LIBS = @LIBOSMOGSM_LIBS@ LIBOSMOSCCP_CFLAGS = @LIBOSMOSCCP_CFLAGS@ LIBOSMOSCCP_LIBS = @LIBOSMOSCCP_LIBS@ LIBOSMOVTY_CFLAGS = @LIBOSMOVTY_CFLAGS@ @@ -185,7 +188,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS = -Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) EXTRA_DIST = bsc_data.c bsc_nat_test_SOURCES = bsc_nat_test.c \ @@ -199,7 +202,7 @@ bsc_nat_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_srcdir)/src/libabis/libabis.a \ $(top_srcdir)/src/libtrau/libtrau.a \ $(top_srcdir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) -lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lrt $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) all: all-am diff --git a/tests/bsc-nat/bsc_data.c b/tests/bsc-nat/bsc_data.c index 04755233c..8a06348fd 100644 --- a/tests/bsc-nat/bsc_data.c +++ b/tests/bsc-nat/bsc_data.c @@ -96,6 +96,28 @@ static const uint8_t id_resp[] = { 0x31 }; +/* sms code msg */ +static const uint8_t smsc_rewrite[] = { +0x00, 0x30, 0xfd, 0x06, 0x01, 0x13, 0x1e, 0x00, +0x01, 0x29, 0x01, 0x03, 0x26, 0x09, 0x01, 0x23, +0x00, 0x0c, 0x00, 0x07, 0x91, 0x36, 0x19, 0x08, +0x00, 0x10, 0x50, 0x17, 0x01, 0x0c, 0x0f, 0x81, +0x00, 0x94, 0x51, 0x87, 0x86, 0x78, 0x46, 0xf5, +0x00, 0x00, 0x09, 0xcc, 0xb7, 0xbd, 0x0c, 0xca, +0xbf, 0xeb, 0x20 +}; + +static const uint8_t smsc_rewrite_patched[] = { +0x00, 0x31, 0xfd, 0x06, 0x01, 0x13, 0x1e, 0x00, +0x01, 0x2a, 0x01, 0x00, 0x27, 0x09, 0x01, 0x24, +0x00, 0x0c, 0x00, 0x08, 0x91, 0x66, 0x66, 0x66, +0x66, 0x66, 0x66, 0xf7, 0x17, 0x01, 0x0c, 0x0f, +0x81, 0x00, 0x94, 0x51, 0x87, 0x86, 0x78, 0x46, +0xf5, 0x00, 0x00, 0x09, 0xcc, 0xb7, 0xbd, 0x0c, +0xca, 0xbf, 0xeb, 0x20 +}; + + /* * MGCP messages */ diff --git a/tests/bsc-nat/bsc_nat_test.c b/tests/bsc-nat/bsc_nat_test.c index 504b69196..d198424a4 100644 --- a/tests/bsc-nat/bsc_nat_test.c +++ b/tests/bsc-nat/bsc_nat_test.c @@ -27,10 +27,11 @@ #include #include -#include +#include +#include #include -#include +#include #include @@ -384,12 +385,9 @@ static void test_contrack() static void test_paging(void) { - int lac; struct bsc_nat *nat; struct bsc_connection *con; - struct bsc_nat_parsed *parsed; struct bsc_config *cfg; - struct msgb *msg; fprintf(stderr, "Testing paging by lac.\n"); @@ -400,34 +398,20 @@ static void test_paging(void) bsc_config_add_lac(cfg, 23); con->authenticated = 1; llist_add(&con->list_entry, &nat->bsc_connections); - msg = msgb_alloc(4096, "test"); - - /* Test completely bad input */ - copy_to_msg(msg, paging_by_lac_cmd, sizeof(paging_by_lac_cmd)); - if (bsc_nat_find_bsc(nat, msg, &lac) != 0) { - fprintf(stderr, "Should have not found anything.\n"); - abort(); - } /* Test it by not finding it */ - copy_to_msg(msg, paging_by_lac_cmd, sizeof(paging_by_lac_cmd)); - parsed = bsc_nat_parse(msg); - if (bsc_nat_find_bsc(nat, msg, &lac) != 0) { - fprintf(stderr, "Should have not found aynthing.\n"); + if (bsc_config_handles_lac(cfg, 8213) != 0) { + fprintf(stderr, "Should not be handled.\n"); abort(); } - talloc_free(parsed); /* Test by finding it */ bsc_config_del_lac(cfg, 23); bsc_config_add_lac(cfg, 8213); - copy_to_msg(msg, paging_by_lac_cmd, sizeof(paging_by_lac_cmd)); - parsed = bsc_nat_parse(msg); - if (bsc_nat_find_bsc(nat, msg, &lac) != con) { + if (bsc_config_handles_lac(cfg, 8213) == 0) { fprintf(stderr, "Should have found it.\n"); abort(); } - talloc_free(parsed); } static void test_mgcp_allocations(void) @@ -506,7 +490,7 @@ static void test_mgcp_ass_tracking(void) if (msg->l2h[16] != 0 || msg->l2h[17] != 0x1) { fprintf(stderr, "Input is not as expected.. %s 0x%x\n", - hexdump(msg->l2h, msgb_l2len(msg)), + osmo_hexdump(msg->l2h, msgb_l2len(msg)), msg->l2h[17]); abort(); } @@ -536,7 +520,7 @@ static void test_mgcp_ass_tracking(void) uint16_t cic = htons(timeslot & 0x1f); if (memcmp(&cic, &msg->l2h[16], sizeof(cic)) != 0) { fprintf(stderr, "Message was not patched properly\n"); - fprintf(stderr, "data cic: 0x%x %s\n", cic, hexdump(msg->l2h, msgb_l2len(msg))); + fprintf(stderr, "data cic: 0x%x %s\n", cic, osmo_hexdump(msg->l2h, msgb_l2len(msg))); abort(); } @@ -761,15 +745,18 @@ static void test_cr_filter() nat_lst = bsc_nat_acc_lst_get(nat, "nat"); bsc_lst = bsc_nat_acc_lst_get(nat, "bsc"); - bsc_parse_reg(nat_entry, &nat_entry->imsi_deny_re, &nat_entry->imsi_deny, + if (bsc_parse_reg(nat_entry, &nat_entry->imsi_deny_re, &nat_entry->imsi_deny, cr_filter[i].nat_imsi_deny ? 1 : 0, - &cr_filter[i].nat_imsi_deny); - bsc_parse_reg(bsc_entry, &bsc_entry->imsi_allow_re, &bsc_entry->imsi_allow, + &cr_filter[i].nat_imsi_deny) != 0) + abort(); + if (bsc_parse_reg(bsc_entry, &bsc_entry->imsi_allow_re, &bsc_entry->imsi_allow, cr_filter[i].bsc_imsi_allow ? 1 : 0, - &cr_filter[i].bsc_imsi_allow); - bsc_parse_reg(bsc_entry, &bsc_entry->imsi_deny_re, &bsc_entry->imsi_deny, + &cr_filter[i].bsc_imsi_allow) != 0) + abort(); + if (bsc_parse_reg(bsc_entry, &bsc_entry->imsi_deny_re, &bsc_entry->imsi_deny, cr_filter[i].bsc_imsi_deny ? 1 : 0, - &cr_filter[i].bsc_imsi_deny); + &cr_filter[i].bsc_imsi_deny) != 0) + abort(); parsed = bsc_nat_parse(msg); if (!parsed) { @@ -858,8 +845,8 @@ static void test_setup_rewrite() struct bsc_nat *nat = bsc_nat_alloc(); /* a fake list */ - struct msg_entries entries; - struct msg_entry entry; + struct osmo_config_list entries; + struct osmo_config_entry entry; INIT_LLIST_HEAD(&entries.entry); entry.mcc = "274"; @@ -867,7 +854,7 @@ static void test_setup_rewrite() entry.option = "^0([1-9])"; entry.text = "0049"; llist_add_tail(&entry.list, &entries.entry); - nat->num_rewr = &entries; + bsc_nat_num_rewr_entry_adapt(nat, &nat->num_rewr, &entries); /* verify that nothing changed */ msgb_reset(msg); @@ -878,7 +865,7 @@ static void test_setup_rewrite() abort(); } - out = bsc_nat_rewrite_setup(nat, msg, parsed, imsi); + out = bsc_nat_rewrite_msg(nat, msg, parsed, imsi); if (msg != out) { fprintf(stderr, "FAIL: The message should not have been changed\n"); abort(); @@ -904,7 +891,7 @@ static void test_setup_rewrite() abort(); } - out = bsc_nat_rewrite_setup(nat, msg, parsed, imsi); + out = bsc_nat_rewrite_msg(nat, msg, parsed, imsi); if (!out) { fprintf(stderr, "FAIL: A new message should be created.\n"); abort(); @@ -922,7 +909,7 @@ static void test_setup_rewrite() if (memcmp(cc_setup_national_patched, out->data, out->len) != 0) { fprintf(stderr, "FAIL: Data is wrong.\n"); - fprintf(stderr, "Data was: %s\n", hexdump(out->data, out->len)); + fprintf(stderr, "Data was: %s\n", osmo_hexdump(out->data, out->len)); abort(); } @@ -930,6 +917,7 @@ static void test_setup_rewrite() /* Make sure that a wildcard is matching */ entry.mnc = "*"; + bsc_nat_num_rewr_entry_adapt(nat, &nat->num_rewr, &entries); msg = msgb_alloc(4096, "test_dt_filter"); copy_to_msg(msg, cc_setup_national, ARRAY_SIZE(cc_setup_national)); parsed = bsc_nat_parse(msg); @@ -938,7 +926,7 @@ static void test_setup_rewrite() abort(); } - out = bsc_nat_rewrite_setup(nat, msg, parsed, imsi); + out = bsc_nat_rewrite_msg(nat, msg, parsed, imsi); if (!out) { fprintf(stderr, "FAIL: A new message should be created.\n"); abort(); @@ -956,7 +944,7 @@ static void test_setup_rewrite() if (memcmp(cc_setup_national_patched, out->data, out->len) != 0) { fprintf(stderr, "FAIL: Data is wrong.\n"); - fprintf(stderr, "Data was: %s\n", hexdump(out->data, out->len)); + fprintf(stderr, "Data was: %s\n", osmo_hexdump(out->data, out->len)); abort(); } @@ -964,6 +952,7 @@ static void test_setup_rewrite() /* Make sure that a wildcard is matching */ entry.mnc = "09"; + bsc_nat_num_rewr_entry_adapt(nat, &nat->num_rewr, &entries); msg = msgb_alloc(4096, "test_dt_filter"); copy_to_msg(msg, cc_setup_national, ARRAY_SIZE(cc_setup_national)); parsed = bsc_nat_parse(msg); @@ -972,7 +961,7 @@ static void test_setup_rewrite() abort(); } - out = bsc_nat_rewrite_setup(nat, msg, parsed, imsi); + out = bsc_nat_rewrite_msg(nat, msg, parsed, imsi); if (out != msg) { fprintf(stderr, "FAIL: The message should be unchanged.\n"); abort(); @@ -991,15 +980,61 @@ static void test_setup_rewrite() msgb_free(out); } -int main(int argc, char **argv) +static void test_smsc_rewrite() { - struct log_target *stderr_target; + struct msgb *msg = msgb_alloc(4096, "SMSC rewrite"), *out; + struct bsc_nat_parsed *parsed; + const char *imsi = "515039900406700"; + + struct bsc_nat *nat = bsc_nat_alloc(); + /* a fake list */ + struct osmo_config_list smsc_entries, dest_entries; + struct osmo_config_entry smsc_entry, dest_entry; + + INIT_LLIST_HEAD(&smsc_entries.entry); + INIT_LLIST_HEAD(&dest_entries.entry); + smsc_entry.mcc = "^515039"; + smsc_entry.option = "639180000105()"; + smsc_entry.text = "6666666666667"; + llist_add_tail(&smsc_entry.list, &smsc_entries.entry); + dest_entry.mcc = "515"; + dest_entry.mnc = "03"; + dest_entry.option = "^0049"; + dest_entry.text = ""; + llist_add_tail(&dest_entry.list, &dest_entries.entry); + + bsc_nat_num_rewr_entry_adapt(nat, &nat->smsc_rewr, &smsc_entries); + bsc_nat_num_rewr_entry_adapt(nat, &nat->tpdest_match, &dest_entries); + + copy_to_msg(msg, smsc_rewrite, ARRAY_SIZE(smsc_rewrite)); + parsed = bsc_nat_parse(msg); + if (!parsed) { + fprintf(stderr, "FAIL: Could not parse SMS\n"); + abort(); + } + + out = bsc_nat_rewrite_msg(nat, msg, parsed, imsi); + if (out == msg) { + fprintf(stderr, "FAIL: This should have changed.\n"); + abort(); + } + + if (out->len != ARRAY_SIZE(smsc_rewrite_patched)) { + fprintf(stderr, "FAIL: The size should match.\n"); + abort(); + } + + if (memcmp(out->data, smsc_rewrite_patched, out->len) != 0) { + fprintf(stderr, "FAIL: the data should be changed.\n"); + abort(); + } +} + +int main(int argc, char **argv) +{ sccp_set_log_area(DSCCP); - log_init(&log_info); - stderr_target = log_target_create_stderr(); - log_add_target(stderr_target); - log_set_all_filter(stderr_target, 1); + osmo_init_logging(&log_info); test_filter(); test_contrack(); @@ -1011,6 +1046,7 @@ int main(int argc, char **argv) test_cr_filter(); test_dt_filter(); test_setup_rewrite(); + test_smsc_rewrite(); test_mgcp_allocations(); return 0; } diff --git a/tests/channel/Makefile.am b/tests/channel/Makefile.am index bf709ff28..df98f6811 100644 --- a/tests/channel/Makefile.am +++ b/tests/channel/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) noinst_PROGRAMS = channel_test channel_test_SOURCES = channel_test.c -channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) \ +channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a diff --git a/tests/channel/Makefile.in b/tests/channel/Makefile.in index de4b45e42..94f35c058 100644 --- a/tests/channel/Makefile.in +++ b/tests/channel/Makefile.in @@ -36,7 +36,7 @@ noinst_PROGRAMS = channel_test$(EXEEXT) subdir = tests/channel DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -48,6 +48,7 @@ am_channel_test_OBJECTS = channel_test.$(OBJEXT) channel_test_OBJECTS = $(am_channel_test_OBJECTS) am__DEPENDENCIES_1 = channel_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) \ $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a @@ -109,6 +110,8 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOSMOCORE_CFLAGS = @LIBOSMOCORE_CFLAGS@ LIBOSMOCORE_LIBS = @LIBOSMOCORE_LIBS@ +LIBOSMOGSM_CFLAGS = @LIBOSMOGSM_CFLAGS@ +LIBOSMOGSM_LIBS = @LIBOSMOGSM_LIBS@ LIBOSMOSCCP_CFLAGS = @LIBOSMOSCCP_CFLAGS@ LIBOSMOSCCP_LIBS = @LIBOSMOSCCP_LIBS@ LIBOSMOVTY_CFLAGS = @LIBOSMOVTY_CFLAGS@ @@ -178,9 +181,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = -Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) channel_test_SOURCES = channel_test.c -channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) \ +channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a diff --git a/tests/channel/channel_test.c b/tests/channel/channel_test.c index 4f3c59335..1121dd5ad 100644 --- a/tests/channel/channel_test.c +++ b/tests/channel/channel_test.c @@ -22,7 +22,7 @@ #include -#include +#include #include #include @@ -56,7 +56,7 @@ int main(int argc, char **argv) network = gsm_network_init(1, 1, NULL); if (!network) exit(1); - bts = gsm_bts_alloc(network, GSM_BTS_TYPE_BS11, 0, 0); + bts = gsm_bts_alloc(network); bts->location_area_code = 23; /* Create a dummy subscriber */ @@ -68,7 +68,7 @@ int main(int argc, char **argv) subscr_get_channel(subscr, RSL_CHANNEED_TCH_F, subscr_cb, (void*)0x2342L); while (1) { - bsc_select_main(0); + osmo_select_main(0); } } diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am index a4395aefa..98fdccc0f 100644 --- a/tests/db/Makefile.am +++ b/tests/db/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) noinst_PROGRAMS = db_test @@ -11,5 +11,5 @@ db_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libabis/libabis.a \ $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) -ldl -ldbi + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -ldl -ldbi diff --git a/tests/db/Makefile.in b/tests/db/Makefile.in index 5fd1244a6..c6fa38aff 100644 --- a/tests/db/Makefile.in +++ b/tests/db/Makefile.in @@ -36,7 +36,7 @@ noinst_PROGRAMS = db_test$(EXEEXT) subdir = tests/db DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -53,7 +53,7 @@ db_test_DEPENDENCIES = $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libabis/libabis.a \ $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -112,6 +112,8 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOSMOCORE_CFLAGS = @LIBOSMOCORE_CFLAGS@ LIBOSMOCORE_LIBS = @LIBOSMOCORE_LIBS@ +LIBOSMOGSM_CFLAGS = @LIBOSMOGSM_CFLAGS@ +LIBOSMOGSM_LIBS = @LIBOSMOGSM_LIBS@ LIBOSMOSCCP_CFLAGS = @LIBOSMOSCCP_CFLAGS@ LIBOSMOSCCP_LIBS = @LIBOSMOSCCP_LIBS@ LIBOSMOVTY_CFLAGS = @LIBOSMOVTY_CFLAGS@ @@ -181,7 +183,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(COVERAGE_CFLAGS) +AM_CFLAGS = -Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) db_test_SOURCES = db_test.c db_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ @@ -190,7 +192,7 @@ db_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libabis/libabis.a \ $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) -ldl -ldbi + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -ldl -ldbi all: all-am diff --git a/tests/debug/Makefile.in b/tests/debug/Makefile.in index c87c169dc..13dfba1f3 100644 --- a/tests/debug/Makefile.in +++ b/tests/debug/Makefile.in @@ -36,7 +36,7 @@ noinst_PROGRAMS = debug_test$(EXEEXT) subdir = tests/debug DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -107,6 +107,8 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOSMOCORE_CFLAGS = @LIBOSMOCORE_CFLAGS@ LIBOSMOCORE_LIBS = @LIBOSMOCORE_LIBS@ +LIBOSMOGSM_CFLAGS = @LIBOSMOGSM_CFLAGS@ +LIBOSMOGSM_LIBS = @LIBOSMOGSM_LIBS@ LIBOSMOSCCP_CFLAGS = @LIBOSMOSCCP_CFLAGS@ LIBOSMOSCCP_LIBS = @LIBOSMOSCCP_LIBS@ LIBOSMOVTY_CFLAGS = @LIBOSMOVTY_CFLAGS@ diff --git a/tests/debug/debug_test.c b/tests/debug/debug_test.c index 6800021b8..fb5ce7a16 100644 --- a/tests/debug/debug_test.c +++ b/tests/debug/debug_test.c @@ -25,7 +25,7 @@ int main(int argc, char **argv) { struct log_target *stderr_target; - log_init(&log_info); + log_init(&log_info, NULL); stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_all_filter(stderr_target, 1); diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index de6feb272..90ca05b5d 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) noinst_PROGRAMS = gsm0408_test gsm0408_test_SOURCES = gsm0408_test.c gsm0408_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libbsc/libbsc.a \ - $(LIBOSMOCORE_LIBS) -ldbi + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -ldbi diff --git a/tests/gsm0408/Makefile.in b/tests/gsm0408/Makefile.in index dc7d625fb..1916c9ab6 100644 --- a/tests/gsm0408/Makefile.in +++ b/tests/gsm0408/Makefile.in @@ -36,7 +36,7 @@ noinst_PROGRAMS = gsm0408_test$(EXEEXT) subdir = tests/gsm0408 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -49,7 +49,8 @@ gsm0408_test_OBJECTS = $(am_gsm0408_test_OBJECTS) am__DEPENDENCIES_1 = gsm0408_test_DEPENDENCIES = $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a \ - $(top_builddir)/src/libbsc/libbsc.a $(am__DEPENDENCIES_1) + $(top_builddir)/src/libbsc/libbsc.a $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -108,6 +109,8 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOSMOCORE_CFLAGS = @LIBOSMOCORE_CFLAGS@ LIBOSMOCORE_LIBS = @LIBOSMOCORE_LIBS@ +LIBOSMOGSM_CFLAGS = @LIBOSMOGSM_CFLAGS@ +LIBOSMOGSM_LIBS = @LIBOSMOGSM_LIBS@ LIBOSMOSCCP_CFLAGS = @LIBOSMOSCCP_CFLAGS@ LIBOSMOSCCP_LIBS = @LIBOSMOSCCP_LIBS@ LIBOSMOVTY_CFLAGS = @LIBOSMOVTY_CFLAGS@ @@ -177,12 +180,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) gsm0408_test_SOURCES = gsm0408_test.c gsm0408_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libbsc/libbsc.a \ - $(LIBOSMOCORE_LIBS) -ldbi + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -ldbi all: all-am diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index e8998c375..679ce664f 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -70,8 +70,8 @@ static void test_mi_functionality(void) { const char *imsi_odd = "987654321098763"; const char *imsi_even = "9876543210987654"; - const u_int32_t tmsi = 0xfabeacd0; - u_int8_t mi[128]; + const uint32_t tmsi = 0xfabeacd0; + uint8_t mi[128]; unsigned int mi_len; char mi_parsed[GSM48_MI_SIZE]; @@ -80,17 +80,17 @@ static void test_mi_functionality(void) /* tmsi code */ mi_len = gsm48_generate_mid_from_tmsi(mi, tmsi); gsm48_mi_to_string(mi_parsed, sizeof(mi_parsed), mi + 2, mi_len - 2); - COMPARE((u_int32_t)strtoul(mi_parsed, NULL, 10), ==, tmsi); + COMPARE((uint32_t)strtoul(mi_parsed, NULL, 10), ==, tmsi); /* imsi code */ mi_len = gsm48_generate_mid_from_imsi(mi, imsi_odd); gsm48_mi_to_string(mi_parsed, sizeof(mi_parsed), mi + 2, mi_len -2); - printf("hex: %s\n", hexdump(mi, mi_len)); + printf("hex: %s\n", osmo_hexdump(mi, mi_len)); COMPARE_STR(mi_parsed, imsi_odd); mi_len = gsm48_generate_mid_from_imsi(mi, imsi_even); gsm48_mi_to_string(mi_parsed, sizeof(mi_parsed), mi + 2, mi_len -2); - printf("hex: %s\n", hexdump(mi, mi_len)); + printf("hex: %s\n", osmo_hexdump(mi, mi_len)); COMPARE_STR(mi_parsed, imsi_even); } diff --git a/tests/mgcp/Makefile.in b/tests/mgcp/Makefile.in index a8df76645..c9f26d166 100644 --- a/tests/mgcp/Makefile.in +++ b/tests/mgcp/Makefile.in @@ -36,7 +36,7 @@ noinst_PROGRAMS = mgcp_test$(EXEEXT) subdir = tests/mgcp DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -110,6 +110,8 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOSMOCORE_CFLAGS = @LIBOSMOCORE_CFLAGS@ LIBOSMOCORE_LIBS = @LIBOSMOCORE_LIBS@ +LIBOSMOGSM_CFLAGS = @LIBOSMOGSM_CFLAGS@ +LIBOSMOGSM_LIBS = @LIBOSMOGSM_LIBS@ LIBOSMOSCCP_CFLAGS = @LIBOSMOSCCP_CFLAGS@ LIBOSMOSCCP_LIBS = @LIBOSMOSCCP_LIBS@ LIBOSMOVTY_CFLAGS = @LIBOSMOVTY_CFLAGS@ diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 4052377ec..b7273de43 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -20,7 +20,8 @@ #include #include -#include +#include +#include #include static struct msgb *create_auep1() @@ -74,11 +75,7 @@ static void test_auep(void) int main(int argc, char **argv) { - struct log_target *stderr_target; - log_init(&log_info); - stderr_target = log_target_create_stderr(); - log_add_target(stderr_target); - log_set_all_filter(stderr_target, 1); + osmo_init_logging(&log_info); test_auep(); return 0; -- cgit v1.2.3