cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

rewrite db backend

This commit is contained in:
Jan Luebbe 2008-12-27 15:59:25 +00:00
parent b332f61f0d
commit 5c15c85be3
5 changed files with 237 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/openbsc/db.h
View File

@ -20,27 +20,17 @@
#ifndef _DB_H #ifndef _DB_H
#define _DB_H #define _DB_H
#include <stdint.h> #include <sys/types.h>
#define NUMBER_LENGTH 32 #include <openbsc/gsm_subscriber.h>
typedef struct {
uint64_t imsi;
uint64_t tmsi;
char number[NUMBER_LENGTH];
uint16_t lac;
} db_subscriber;
int db_init(); int db_init();
int db_prepare(); int db_prepare();
int db_fini(); int db_fini();
int db_insert_imei(uint64_t imei); struct gsm_subscriber* db_create_subscriber(char imsi[GSM_IMSI_LENGTH]);
int db_get_subscriber(enum gsm_subscriber_field field, struct gsm_subscriber* subscriber);
int db_insert_imsi(uint64_t imsi); int db_set_subscriber(struct gsm_subscriber* subscriber);
int db_imsi_set_tmsi(uint64_t imsi, uint64_t tmsi); int db_subscriber_alloc_tmsi(struct gsm_subscriber* subscriber);
int db_imsi_set_lac(uint64_t imsi, uint16_t lac);
int db_imsi_get_subscriber(uint64_t imsi, db_subscriber* subscriber);
int db_tmsi_get_subscriber(uint64_t tmsi, db_subscriber* subscriber);
#endif /* _DB_H */ #endif /* _DB_H */

17
include/openbsc/gsm_subscriber.h
View File

@ -4,13 +4,20 @@
#include <sys/types.h> #include <sys/types.h>
#include "gsm_data.h" #include "gsm_data.h"
#define GSM_IMSI_LENGTH 17
#define GSM_TMSI_LENGTH 17
#define GSM_NAME_LENGTH 128
struct gsm_subscriber { struct gsm_subscriber {
char *name; char imsi[GSM_IMSI_LENGTH];
u_int8_t tmsi[4]; char tmsi[GSM_TMSI_LENGTH];
u_int16_t lac;
char name[GSM_NAME_LENGTH];
}; };
struct gsm_subscriber *subscr_get_by_tmsi(u_int8_t *tmsi); enum gsm_subscriber_field {
struct gsm_subscriber *subscr_get_by_imsi(u_int8_t *imsi); GSM_SUBSCRIBER_IMSI,
int subscr_update(struct gsm_subscriber *s, struct gsm_bts *bts); GSM_SUBSCRIBER_TMSI,
};
#endif /* _GSM_SUBSCR_H */ #endif /* _GSM_SUBSCR_H */

3
src/Makefile.am
View File

@ -4,7 +4,8 @@ AM_CFLAGS=-Wall
sbin_PROGRAMS = bsc_hack db_test sbin_PROGRAMS = bsc_hack db_test
bsc_hack_SOURCES = bsc_hack.c misdn.c abis_rsl.c abis_nm.c gsm_04_08.c gsm_data.c \ bsc_hack_SOURCES = bsc_hack.c misdn.c abis_rsl.c abis_nm.c gsm_04_08.c gsm_data.c \
gsm_subscriber.c msgb.c select.c chan_alloc.c timer.c debug.c gsm_subscriber.c msgb.c select.c chan_alloc.c timer.c debug.c db.c
bsc_hack_LDADD = -ldl -ldbi
db_test_SOURCES = db_test.c db.c db_test_SOURCES = db_test.c db.c
db_test_LDADD = -ldl -ldbi db_test_LDADD = -ldl -ldbi

140
src/db.c
View File

@ -20,6 +20,8 @@
#include <openbsc/db.h> #include <openbsc/db.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <dbi/dbi.h> #include <dbi/dbi.h>
dbi_conn conn; dbi_conn conn;
@ -33,6 +35,10 @@ void db__error_func(dbi_conn conn, void* data) {
int db_init() { int db_init() {
dbi_initialize(NULL); dbi_initialize(NULL);
conn = dbi_conn_new("sqlite3"); conn = dbi_conn_new("sqlite3");
if (conn==NULL) {
printf("DB: Failed to create connection.\n");
return 1;
}
dbi_conn_error_handler( conn, db__error_func, NULL ); dbi_conn_error_handler( conn, db__error_func, NULL );
@ -60,8 +66,8 @@ int db_prepare() {
result = dbi_conn_query(conn, result = dbi_conn_query(conn,
"CREATE TABLE IF NOT EXISTS Subscriber (" "CREATE TABLE IF NOT EXISTS Subscriber ("
"id INTEGER PRIMARY KEY AUTOINCREMENT, " "id INTEGER PRIMARY KEY AUTOINCREMENT, "
"imsi INTEGER UNIQUE NOT NULL, " "imsi NUMERIC UNIQUE NOT NULL, "
"tmsi INTEGER UNIQUE, " "tmsi NUMERIC UNIQUE, "
"extension TEXT UNIQUE, " "extension TEXT UNIQUE, "
"lac INTEGER" "lac INTEGER"
")" ")"
@ -74,7 +80,7 @@ int db_prepare() {
result = dbi_conn_query(conn, result = dbi_conn_query(conn,
"CREATE TABLE IF NOT EXISTS Equipment (" "CREATE TABLE IF NOT EXISTS Equipment ("
"id INTEGER PRIMARY KEY AUTOINCREMENT, " "id INTEGER PRIMARY KEY AUTOINCREMENT, "
"imei INTEGER UNIQUE NOT NULL" "imei NUMERIC UNIQUE NOT NULL"
")" ")"
); );
if (result==NULL) { if (result==NULL) {
@ -88,9 +94,10 @@ int db_prepare() {
int db_fini() { int db_fini() {
dbi_conn_close(conn); dbi_conn_close(conn);
dbi_shutdown(); dbi_shutdown();
return 0;
} }
int db_insert_imei(uint64_t imei) { int db_insert_imei(u_int64_t imei) {
dbi_result result; dbi_result result;
result = dbi_conn_queryf(conn, result = dbi_conn_queryf(conn,
"INSERT OR IGNORE INTO Equipment " "INSERT OR IGNORE INTO Equipment "
@ -107,111 +114,124 @@ int db_insert_imei(uint64_t imei) {
return 0; return 0;
} }
int db_insert_imsi(uint64_t imsi) { struct gsm_subscriber* db_create_subscriber(char imsi[GSM_IMSI_LENGTH]) {
dbi_result result; dbi_result result;
struct gsm_subscriber* subscriber;
subscriber = malloc(sizeof(*subscriber));
if (!subscriber)
return NULL;
memset(subscriber, 0, sizeof(*subscriber));
strncpy(subscriber->imsi, imsi, GSM_IMSI_LENGTH-1);
if (!db_get_subscriber(GSM_SUBSCRIBER_IMSI, subscriber)) {
return subscriber;
}
result = dbi_conn_queryf(conn, result = dbi_conn_queryf(conn,
"INSERT OR IGNORE INTO Subscriber " "INSERT OR IGNORE INTO Subscriber "
"(imsi) " "(imsi) "
"VALUES " "VALUES "
"(%llu) ", "(%s) ",
imsi imsi
); );
if (result==NULL) { if (result==NULL) {
printf("DB: Failed to create Subscriber by IMSI.\n"); printf("DB: Failed to create Subscriber by IMSI.\n");
return 1;
} }
dbi_result_free(result); dbi_result_free(result);
printf("DB: New Subscriber: IMSI %s\n", subscriber->imsi);
return subscriber;
}
int db__parse_subscriber(dbi_result result, struct gsm_subscriber* subscriber) {
return 0; return 0;
} }
int db_imsi_set_tmsi(uint64_t imsi, uint64_t tmsi) { int db_get_subscriber(enum gsm_subscriber_field field, struct gsm_subscriber* subscriber) {
if (db_insert_imsi(imsi)) {
return 1;
}
dbi_result result; dbi_result result;
switch (field) {
case GSM_SUBSCRIBER_IMSI:
result = dbi_conn_queryf(conn, result = dbi_conn_queryf(conn,
"UPDATE Subscriber " "SELECT * FROM Subscriber "
"SET tmsi = %llu " "WHERE imsi = %s ",
"WHERE imsi = %llu ", subscriber->imsi
tmsi, imsi
); );
if (result==NULL) { break;
printf("DB: Failed to update Subscriber with TMSI by IMSI.\n"); case GSM_SUBSCRIBER_TMSI:
return 1;
}
dbi_result_free(result);
return 0;
}
int db_imsi_set_lac(uint64_t imsi, uint16_t lac) {
if (db_insert_imsi(imsi)) {
return 1;
}
dbi_result result;
result = dbi_conn_queryf(conn, result = dbi_conn_queryf(conn,
"UPDATE Subscriber " "SELECT * FROM Subscriber "
"SET lac = %u " "WHERE tmsi = %s ",
"WHERE imsi = %llu ", subscriber->tmsi
lac, imsi
); );
break;
default:
printf("DB: Unknown query selector for Subscriber.\n");
return 1;
}
if (result==NULL) { if (result==NULL) {
printf("DB: Failed to update Subscriber with LAC by IMSI.\n"); printf("DB: Failed to query Subscriber.\n");
return 1; return 1;
} }
if (!dbi_result_next_row(result)) {
printf("DB: Failed to find the Subscriber.\n");
dbi_result_free(result); dbi_result_free(result);
return 0;
}
int db__parse_subscriber(dbi_result result, db_subscriber* subscriber) {
if (!dbi_result_first_row(result)) {
printf("DB: Failed to find Subscriber.\n");
return 1; return 1;
} }
subscriber->imsi = dbi_result_get_ulonglong(result, "imsi"); strncpy(subscriber->imsi, dbi_result_get_string(result, "imsi"), GSM_IMSI_LENGTH);
subscriber->tmsi = dbi_result_get_ulonglong(result, "tmsi"); strncpy(subscriber->tmsi, dbi_result_get_string(result, "tmsi"), GSM_TMSI_LENGTH);
// FIXME handle extension // FIXME handle extension
subscriber->lac = dbi_result_get_uint(result, "lac"); subscriber->lac = dbi_result_get_uint(result, "lac");
printf("DB: Subscriber: IMSI %llu, TMSI %llu, LAC %hu\n", subscriber->imsi, subscriber->tmsi, subscriber->lac); printf("DB: Found Subscriber: IMSI %s, TMSI %s, LAC %hu\n", subscriber->imsi, subscriber->tmsi, subscriber->lac);
dbi_result_free(result);
return 0; return 0;
} }
int db_imsi_get_subscriber(uint64_t imsi, db_subscriber* subscriber) { int db_set_subscriber(struct gsm_subscriber* subscriber) {
dbi_result result; dbi_result result;
result = dbi_conn_queryf(conn, result = dbi_conn_queryf(conn,
"SELECT * FROM Subscriber " "UPDATE Subscriber "
"WHERE imsi = %llu ", "SET tmsi = %s, lac = %i "
imsi "WHERE imsi = %s ",
subscriber->tmsi, subscriber->lac, subscriber->imsi
); );
if (result==NULL) { if (result==NULL) {
printf("DB: Failed to find Subscriber by IMSI.\n"); printf("DB: Failed to update Subscriber (by IMSI).\n");
return 1;
}
if (db__parse_subscriber(result, subscriber)) {
printf("DB: Failed to parse Subscriber.\n");
dbi_result_free(result);
return 1; return 1;
} }
dbi_result_free(result); dbi_result_free(result);
return 0; return 0;
} }
int db_tmsi_get_subscriber(uint64_t tmsi, db_subscriber* subscriber) { int db_subscriber_alloc_tmsi(struct gsm_subscriber* subscriber) {
dbi_result result; int error;
dbi_result result=NULL;
char* tmsi_quoted;
for (;;) {
sprintf(subscriber->tmsi, "%i", rand() % 1000000); // FIXME how many nibbles do we want for the tmsi?
result = dbi_conn_queryf(conn, result = dbi_conn_queryf(conn,
"SELECT * FROM Subscriber " "SELECT * FROM Subscriber "
"WHERE tmsi = %llu ", "WHERE tmsi = %s ",
tmsi subscriber->tmsi
); );
if (result==NULL) { if (result==NULL) {
printf("DB: Failed to find Subscriber by TMSI.\n"); printf("DB: Failed to query Subscriber.\n");
return 1; return 1;
} }
if (db__parse_subscriber(result, subscriber)) { printf("%s\n", subscriber->tmsi);
printf("DB: Failed to parse Subscriber.\n"); printf("count %llu\n", dbi_result_get_numrows(result));
printf("curr %llu\n", dbi_result_get_currow(result));
printf("next %llu\n", dbi_result_next_row(result));
printf("count %llu\n", dbi_result_get_numrows(result));
printf("curr %llu\n", dbi_result_get_currow(result));
if (dbi_result_get_numrows(result)){
dbi_result_free(result); dbi_result_free(result);
return 1; continue;
}
if (!dbi_result_next_row(result)) {
printf("curr %llu\n", dbi_result_get_currow(result));
dbi_result_free(result);
printf("DB: Allocated TMSI %s for IMSI %s.\n", subscriber->tmsi, subscriber->imsi);
return db_set_subscriber(subscriber);
} }
dbi_result_free(result); dbi_result_free(result);
}
return 0; return 0;
} }

29
src/db_test.c
View File

@ -20,6 +20,7 @@
#include <openbsc/db.h> #include <openbsc/db.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
int main() { int main() {
@ -35,14 +36,28 @@ int main() {
} }
printf("DB: Database prepared.\n"); printf("DB: Database prepared.\n");
db_insert_imsi(3243245432351LLU); struct gsm_subscriber *alice = NULL;
db_insert_imsi(3243245432352LLU);
db_imsi_set_tmsi(3243245432345LLU, 99999999LLU);
db_imsi_set_lac(3243245432345LLU, 42);
db_subscriber alice; alice = db_create_subscriber("3243245432345");
db_imsi_get_subscriber(3243245432345LLU, &alice); db_subscriber_alloc_tmsi(alice);
db_tmsi_get_subscriber(99999999LLU, &alice); alice->lac=42;
db_set_subscriber(alice);
db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice);
free(alice);
alice = db_create_subscriber("3693245423445");
db_subscriber_alloc_tmsi(alice);
alice->lac=42;
db_set_subscriber(alice);
db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice);
free(alice);
alice = db_create_subscriber("9993245423445");
db_subscriber_alloc_tmsi(alice);
alice->lac=42;
db_set_subscriber(alice);
db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice);
free(alice);
db_fini(); db_fini();