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.
This commit is contained in:
Holger Freyther 2009-06-06 13:54:20 +00:00
parent 535abf2f40
commit c7b86f9011
4 changed files with 4 additions and 6 deletions

View File

@ -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();

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}