aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/tests/gbproxy
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-08-04 15:42:36 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-08-04 16:01:12 +0200
commiteece6277992a38559d6778badfb8840773f4108d (patch)
treeaf99c3669ef97c307f96c69c43d61f29bacdda50 /openbsc/tests/gbproxy
parentfa7a8bc6eb78bc8d2e5356e3db5c9f6d6dbd33bb (diff)
gbproxy: Remove global state from the gbproxy
Global state prevents us from writing simple units tests for single routines. Go through the code and add pointers to the gbproxy configuration. Only the vty and the test code remain using the global gbproxy instance.
Diffstat (limited to 'openbsc/tests/gbproxy')
-rw-r--r--openbsc/tests/gbproxy/gbproxy_test.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/openbsc/tests/gbproxy/gbproxy_test.c b/openbsc/tests/gbproxy/gbproxy_test.c
index aa909ef42..63daaff59 100644
--- a/openbsc/tests/gbproxy/gbproxy_test.c
+++ b/openbsc/tests/gbproxy/gbproxy_test.c
@@ -470,7 +470,7 @@ int gprs_ns_callback(enum gprs_ns_evt event, struct gprs_nsvc *nsvc,
switch (event) {
case GPRS_NS_EVT_UNIT_DATA:
- return gbprox_rcvmsg(msg, nsvc->nsei, bvci, nsvc->nsvci);
+ return gbprox_rcvmsg(&gbcfg, msg, nsvc->nsei, bvci, nsvc->nsvci);
default:
break;
}
@@ -789,7 +789,7 @@ static void test_gbproxy()
dump_global(stdout, 0);
- gbprox_reset();
+ gbprox_reset(&gbcfg);
gprs_ns_destroy(nsi);
nsi = NULL;
}
@@ -921,7 +921,7 @@ static void test_gbproxy_ident_changes()
dump_global(stdout, 0);
dump_peers(stdout, 0);
- gbprox_reset();
+ gbprox_reset(&gbcfg);
gprs_ns_destroy(nsi);
nsi = NULL;
}
@@ -1057,7 +1057,7 @@ static void test_gbproxy_ra_patching()
dump_global(stdout, 0);
dump_peers(stdout, 0);
- gbprox_reset();
+ gbprox_reset(&gbcfg);
gprs_ns_destroy(nsi);
nsi = NULL;
}
@@ -1324,7 +1324,7 @@ int main(int argc, char **argv)
osmo_init_logging(&info);
log_set_use_color(osmo_stderr_target, 0);
log_set_print_filename(osmo_stderr_target, 0);
- osmo_signal_register_handler(SS_L_NS, &test_signal, NULL);
+ osmo_signal_register_handler(SS_L_NS, &test_signal, &gbcfg);
log_set_print_filename(osmo_stderr_target, 0);
log_set_log_level(osmo_stderr_target, LOGL_DEBUG);