rewrite db backend
This commit is contained in:
parent
b332f61f0d
commit
5c15c85be3
|
@ -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 */
|
||||||
|
|
|
@ -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 */
|
||||||
|
|
|
@ -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
|
||||||
|
|
346
src/db.c
346
src/db.c
|
@ -20,198 +20,218 @@
|
||||||
#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;
|
||||||
|
|
||||||
void db__error_func(dbi_conn conn, void* data) {
|
void db__error_func(dbi_conn conn, void* data) {
|
||||||
const char* msg;
|
const char* msg;
|
||||||
dbi_conn_error(conn, &msg);
|
dbi_conn_error(conn, &msg);
|
||||||
printf("DBI: %s\n", msg);
|
printf("DBI: %s\n", msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
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) {
|
||||||
dbi_conn_error_handler( conn, db__error_func, NULL );
|
printf("DB: Failed to create connection.\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* MySQL
|
dbi_conn_error_handler( conn, db__error_func, NULL );
|
||||||
dbi_conn_set_option(conn, "host", "localhost");
|
|
||||||
dbi_conn_set_option(conn, "username", "your_name");
|
|
||||||
dbi_conn_set_option(conn, "password", "your_password");
|
|
||||||
dbi_conn_set_option(conn, "dbname", "your_dbname");
|
|
||||||
dbi_conn_set_option(conn, "encoding", "UTF-8");
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* SqLite 3 */
|
/* MySQL
|
||||||
dbi_conn_set_option(conn, "sqlite3_dbdir", "/tmp");
|
dbi_conn_set_option(conn, "host", "localhost");
|
||||||
dbi_conn_set_option(conn, "dbname", "hlr.sqlite3");
|
dbi_conn_set_option(conn, "username", "your_name");
|
||||||
|
dbi_conn_set_option(conn, "password", "your_password");
|
||||||
|
dbi_conn_set_option(conn, "dbname", "your_dbname");
|
||||||
|
dbi_conn_set_option(conn, "encoding", "UTF-8");
|
||||||
|
*/
|
||||||
|
|
||||||
if (dbi_conn_connect(conn) < 0) {
|
/* SqLite 3 */
|
||||||
return 1;
|
dbi_conn_set_option(conn, "sqlite3_dbdir", "/tmp");
|
||||||
}
|
dbi_conn_set_option(conn, "dbname", "hlr.sqlite3");
|
||||||
|
|
||||||
return 0;
|
if (dbi_conn_connect(conn) < 0) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int db_prepare() {
|
int db_prepare() {
|
||||||
dbi_result result;
|
dbi_result result;
|
||||||
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"
|
||||||
")"
|
")"
|
||||||
);
|
);
|
||||||
if (result==NULL) {
|
if (result==NULL) {
|
||||||
printf("DB: Failed to create Subscriber table.\n");
|
printf("DB: Failed to create Subscriber table.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
dbi_result_free(result);
|
dbi_result_free(result);
|
||||||
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) {
|
||||||
printf("DB: Failed to create Equipment table.\n");
|
printf("DB: Failed to create Equipment table.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
dbi_result_free(result);
|
dbi_result_free(result);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
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 "
|
||||||
"(imei) "
|
"(imei) "
|
||||||
"VALUES "
|
"VALUES "
|
||||||
"(%llu) ",
|
"(%llu) ",
|
||||||
imei
|
imei
|
||||||
);
|
);
|
||||||
if (result==NULL) {
|
if (result==NULL) {
|
||||||
printf("DB: Failed to create Equipment by IMEI.\n");
|
printf("DB: Failed to create Equipment by IMEI.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
dbi_result_free(result);
|
dbi_result_free(result);
|
||||||
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;
|
||||||
result = dbi_conn_queryf(conn,
|
struct gsm_subscriber* subscriber;
|
||||||
"INSERT OR IGNORE INTO Subscriber "
|
subscriber = malloc(sizeof(*subscriber));
|
||||||
"(imsi) "
|
if (!subscriber)
|
||||||
"VALUES "
|
return NULL;
|
||||||
"(%llu) ",
|
memset(subscriber, 0, sizeof(*subscriber));
|
||||||
imsi
|
strncpy(subscriber->imsi, imsi, GSM_IMSI_LENGTH-1);
|
||||||
);
|
if (!db_get_subscriber(GSM_SUBSCRIBER_IMSI, subscriber)) {
|
||||||
if (result==NULL) {
|
return subscriber;
|
||||||
printf("DB: Failed to create Subscriber by IMSI.\n");
|
}
|
||||||
return 1;
|
result = dbi_conn_queryf(conn,
|
||||||
}
|
"INSERT OR IGNORE INTO Subscriber "
|
||||||
dbi_result_free(result);
|
"(imsi) "
|
||||||
return 0;
|
"VALUES "
|
||||||
|
"(%s) ",
|
||||||
|
imsi
|
||||||
|
);
|
||||||
|
if (result==NULL) {
|
||||||
|
printf("DB: Failed to create Subscriber by IMSI.\n");
|
||||||
|
}
|
||||||
|
dbi_result_free(result);
|
||||||
|
printf("DB: New Subscriber: IMSI %s\n", subscriber->imsi);
|
||||||
|
return subscriber;
|
||||||
}
|
}
|
||||||
|
|
||||||
int db_imsi_set_tmsi(uint64_t imsi, uint64_t tmsi) {
|
int db__parse_subscriber(dbi_result result, struct gsm_subscriber* subscriber) {
|
||||||
if (db_insert_imsi(imsi)) {
|
return 0;
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
dbi_result result;
|
|
||||||
result = dbi_conn_queryf(conn,
|
|
||||||
"UPDATE Subscriber "
|
|
||||||
"SET tmsi = %llu "
|
|
||||||
"WHERE imsi = %llu ",
|
|
||||||
tmsi, imsi
|
|
||||||
);
|
|
||||||
if (result==NULL) {
|
|
||||||
printf("DB: Failed to update Subscriber with TMSI by IMSI.\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
dbi_result_free(result);
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int db_imsi_set_lac(uint64_t imsi, uint16_t lac) {
|
int db_get_subscriber(enum gsm_subscriber_field field, struct gsm_subscriber* subscriber) {
|
||||||
if (db_insert_imsi(imsi)) {
|
dbi_result result;
|
||||||
return 1;
|
switch (field) {
|
||||||
}
|
case GSM_SUBSCRIBER_IMSI:
|
||||||
dbi_result result;
|
result = dbi_conn_queryf(conn,
|
||||||
result = dbi_conn_queryf(conn,
|
"SELECT * FROM Subscriber "
|
||||||
"UPDATE Subscriber "
|
"WHERE imsi = %s ",
|
||||||
"SET lac = %u "
|
subscriber->imsi
|
||||||
"WHERE imsi = %llu ",
|
);
|
||||||
lac, imsi
|
break;
|
||||||
);
|
case GSM_SUBSCRIBER_TMSI:
|
||||||
if (result==NULL) {
|
result = dbi_conn_queryf(conn,
|
||||||
printf("DB: Failed to update Subscriber with LAC by IMSI.\n");
|
"SELECT * FROM Subscriber "
|
||||||
return 1;
|
"WHERE tmsi = %s ",
|
||||||
}
|
subscriber->tmsi
|
||||||
dbi_result_free(result);
|
);
|
||||||
return 0;
|
break;
|
||||||
|
default:
|
||||||
|
printf("DB: Unknown query selector for Subscriber.\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (result==NULL) {
|
||||||
|
printf("DB: Failed to query Subscriber.\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (!dbi_result_next_row(result)) {
|
||||||
|
printf("DB: Failed to find the Subscriber.\n");
|
||||||
|
dbi_result_free(result);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
strncpy(subscriber->imsi, dbi_result_get_string(result, "imsi"), GSM_IMSI_LENGTH);
|
||||||
|
strncpy(subscriber->tmsi, dbi_result_get_string(result, "tmsi"), GSM_TMSI_LENGTH);
|
||||||
|
// FIXME handle extension
|
||||||
|
subscriber->lac = dbi_result_get_uint(result, "lac");
|
||||||
|
printf("DB: Found Subscriber: IMSI %s, TMSI %s, LAC %hu\n", subscriber->imsi, subscriber->tmsi, subscriber->lac);
|
||||||
|
dbi_result_free(result);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int db__parse_subscriber(dbi_result result, db_subscriber* subscriber) {
|
int db_set_subscriber(struct gsm_subscriber* subscriber) {
|
||||||
if (!dbi_result_first_row(result)) {
|
dbi_result result;
|
||||||
printf("DB: Failed to find Subscriber.\n");
|
result = dbi_conn_queryf(conn,
|
||||||
return 1;
|
"UPDATE Subscriber "
|
||||||
}
|
"SET tmsi = %s, lac = %i "
|
||||||
subscriber->imsi = dbi_result_get_ulonglong(result, "imsi");
|
"WHERE imsi = %s ",
|
||||||
subscriber->tmsi = dbi_result_get_ulonglong(result, "tmsi");
|
subscriber->tmsi, subscriber->lac, subscriber->imsi
|
||||||
// FIXME handle extension
|
);
|
||||||
subscriber->lac = dbi_result_get_uint(result, "lac");
|
if (result==NULL) {
|
||||||
printf("DB: Subscriber: IMSI %llu, TMSI %llu, LAC %hu\n", subscriber->imsi, subscriber->tmsi, subscriber->lac);
|
printf("DB: Failed to update Subscriber (by IMSI).\n");
|
||||||
return 0;
|
return 1;
|
||||||
|
}
|
||||||
|
dbi_result_free(result);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int db_imsi_get_subscriber(uint64_t imsi, db_subscriber* subscriber) {
|
int db_subscriber_alloc_tmsi(struct gsm_subscriber* subscriber) {
|
||||||
dbi_result result;
|
int error;
|
||||||
result = dbi_conn_queryf(conn,
|
dbi_result result=NULL;
|
||||||
"SELECT * FROM Subscriber "
|
char* tmsi_quoted;
|
||||||
"WHERE imsi = %llu ",
|
for (;;) {
|
||||||
imsi
|
sprintf(subscriber->tmsi, "%i", rand() % 1000000); // FIXME how many nibbles do we want for the tmsi?
|
||||||
);
|
result = dbi_conn_queryf(conn,
|
||||||
if (result==NULL) {
|
"SELECT * FROM Subscriber "
|
||||||
printf("DB: Failed to find Subscriber by IMSI.\n");
|
"WHERE tmsi = %s ",
|
||||||
return 1;
|
subscriber->tmsi
|
||||||
}
|
);
|
||||||
if (db__parse_subscriber(result, subscriber)) {
|
if (result==NULL) {
|
||||||
printf("DB: Failed to parse Subscriber.\n");
|
printf("DB: Failed to query Subscriber.\n");
|
||||||
dbi_result_free(result);
|
return 1;
|
||||||
return 1;
|
}
|
||||||
}
|
printf("%s\n", subscriber->tmsi);
|
||||||
dbi_result_free(result);
|
printf("count %llu\n", dbi_result_get_numrows(result));
|
||||||
return 0;
|
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));
|
||||||
int db_tmsi_get_subscriber(uint64_t tmsi, db_subscriber* subscriber) {
|
printf("curr %llu\n", dbi_result_get_currow(result));
|
||||||
dbi_result result;
|
if (dbi_result_get_numrows(result)){
|
||||||
result = dbi_conn_queryf(conn,
|
dbi_result_free(result);
|
||||||
"SELECT * FROM Subscriber "
|
continue;
|
||||||
"WHERE tmsi = %llu ",
|
}
|
||||||
tmsi
|
if (!dbi_result_next_row(result)) {
|
||||||
);
|
printf("curr %llu\n", dbi_result_get_currow(result));
|
||||||
if (result==NULL) {
|
dbi_result_free(result);
|
||||||
printf("DB: Failed to find Subscriber by TMSI.\n");
|
printf("DB: Allocated TMSI %s for IMSI %s.\n", subscriber->tmsi, subscriber->imsi);
|
||||||
return 1;
|
return db_set_subscriber(subscriber);
|
||||||
}
|
}
|
||||||
if (db__parse_subscriber(result, subscriber)) {
|
dbi_result_free(result);
|
||||||
printf("DB: Failed to parse Subscriber.\n");
|
}
|
||||||
dbi_result_free(result);
|
return 0;
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
dbi_result_free(result);
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,31 +20,46 @@
|
||||||
#include <openbsc/db.h>
|
#include <openbsc/db.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
|
|
||||||
if (db_init()) {
|
if (db_init()) {
|
||||||
printf("DB: Failed to init database. Please check the option settings.\n");
|
printf("DB: Failed to init database. Please check the option settings.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
printf("DB: Database initialized.\n");
|
printf("DB: Database initialized.\n");
|
||||||
|
|
||||||
if (db_prepare()) {
|
if (db_prepare()) {
|
||||||
printf("DB: Failed to prepare database.\n");
|
printf("DB: Failed to prepare database.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
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);
|
||||||
|
|
||||||
db_fini();
|
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);
|
||||||
|
|
||||||
return 0;
|
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();
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue