summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2009-06-06 13:54:20 +0000
committerHolger Freyther <zecke@selfish.org>2009-06-06 13:54:20 +0000
commitc7b86f90119ef70e4b26df689da6026c67f5d4c4 (patch)
treed58edd9c21bd2bd66958b3f8e41b414ff6b027d5 /src
parent535abf2f40da5724ae03cb7de0b09136a45926fd (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/bsc_hack.c2
-rw-r--r--src/db.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/bsc_hack.c b/src/bsc_hack.c
index c80ffd583..188ccf6ae 100644
--- a/src/bsc_hack.c
+++ b/src/bsc_hack.c
@@ -970,7 +970,7 @@ static int bootstrap_network(void)
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 f2f691e11..4abd63624 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 @@ void db_error_func(dbi_conn conn, void* data) {
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 @@ int db_init(const char *name, struct gsm_network *network) {
return 1;
}
- current_network = network;
return 0;
}