Revert "[db] Keep track of the current gsm_network"
This was a stupid decision. We will have to assign the
network at some other place. The problem will be a problem
when we have two gsm_networks in one process and the same
subscriber is traveling in both networks.
diff --git a/include/openbsc/db.h b/include/openbsc/db.h
index 2036832..61a3ac4 100644
--- a/include/openbsc/db.h
+++ b/include/openbsc/db.h
@@ -26,7 +26,7 @@
#include <openbsc/gsm_subscriber.h>
/* one time initialisation */
-int db_init(const char *name, struct gsm_network *network);
+int db_init(const char *name);
int db_prepare();
int db_fini();
diff --git a/src/bsc_hack.c b/src/bsc_hack.c
index c80ffd5..188ccf6 100644
--- a/src/bsc_hack.c
+++ b/src/bsc_hack.c
@@ -970,7 +970,7 @@
bts = &gsmnet->bts[0];
bootstrap_bts(bts);
- if (db_init(database_name, gsmnet)) {
+ if (db_init(database_name)) {
printf("DB: Failed to init database. Please check the option settings.\n");
return -1;
}
diff --git a/src/db.c b/src/db.c
index f2f691e..4abd636 100644
--- a/src/db.c
+++ b/src/db.c
@@ -32,7 +32,6 @@
static char *db_basename = NULL;
static char *db_dirname = NULL;
static dbi_conn conn;
-static struct gsm_network *current_network = NULL;
static char *create_stmts[] = {
"CREATE TABLE IF NOT EXISTS Meta ("
@@ -94,7 +93,7 @@
printf("DBI: %s\n", msg);
}
-int db_init(const char *name, struct gsm_network *network) {
+int db_init(const char *name) {
dbi_initialize(NULL);
conn = dbi_conn_new("sqlite3");
if (conn==NULL) {
@@ -125,7 +124,6 @@
return 1;
}
- current_network = network;
return 0;
}
diff --git a/tests/db/db_test.c b/tests/db/db_test.c
index bbca585..6962aa3 100644
--- a/tests/db/db_test.c
+++ b/tests/db/db_test.c
@@ -50,7 +50,7 @@
int main() {
- if (db_init("hlr.sqlite3", NULL)) {
+ if (db_init("hlr.sqlite3")) {
printf("DB: Failed to init database. Please check the option settings.\n");
return 1;
}