planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Work on SQL support.

Browse Source 
FossilOrigin-Name: d0d1624520afe2bc9fe84e98a2ee1bad2eb75df2b38efbd59fdf553d50cb5ed6
This commit is contained in:
7u83@mail.ru
2015-05-01 10:50:28 +00:00
parent 3b466158a4
commit bc4aa16f9b
4 changed files with 105 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/ac/db.c
View File

@ -3,6 +3,8 @@
#include "capwap/log.h"
#include "capwap/dbg.h"
#include "capwap/capwap_items.h"
#include "capwap/conn.h"
#include "conf.h"
@ -87,7 +89,7 @@ int db_start()
sql = "SELECT * FROM wtpprops WHERE upd=0 AND wtpid=?";
sql = "SELECT * FROM wtpprops WHERE upd>0 AND wtpid=?";
rc = sqlite3_prepare_v2(handle, sql,-1, &get_tasks_stmt,0);
if (rc)
goto errX;
@ -116,6 +118,8 @@ void db_put_wtp_prop(const char *wtp_id,int rid, const char * prop,const char *
{
int rc;
DBGX("Putting %s:%s",prop,val);
sqlite3_reset(put_wtp_prop_stmt);
sqlite3_clear_bindings(put_wtp_prop_stmt);
@ -147,7 +151,7 @@ errX:
}
int db_get_tasks(const char * wtpid)
int db_get_tasks(struct conn * conn,const char * wtpid)
{
sqlite3_reset(get_tasks_stmt);
@ -158,16 +162,50 @@ int db_get_tasks(const char * wtpid)
int rc;
rc = sqlite3_step(get_tasks_stmt);
if (rc == SQLITE_ROW) {
/* DBGX("Have a rowi %s",sqlite3_column_text(get_tasks_stmt,0));
DBGX("Have a rowi %s",sqlite3_column_text(get_tasks_stmt,1));
DBGX("Have a rowi %s",sqlite3_column_text(get_tasks_stmt,2));
DBGX("Have a rowi %s",sqlite3_column_text(get_tasks_stmt,3));
DBGX("Have a rowi %s",sqlite3_column_text(get_tasks_stmt,4));
*/
//rc = sqlite3_step(get_tasks_stmt);
while (SQLITE_ROW == sqlite3_step(get_tasks_stmt)) {
const char *prop = (const char*)sqlite3_column_text(get_tasks_stmt,2);
const char *val = (const char*)sqlite3_column_text(get_tasks_stmt,3);
DBGX("Prop: %s Val: %s",prop,val);
struct cw_itemdef * cwi = cw_item_get_by_name(prop,capwap_itemdefs);
if (!cwi) {
DBGX("Not found: %s",prop);
return 0;
}
uint8_t data[1024];
printf("Type: %s\n",cwi->type->name);
if (!cwi->type->from_str) {
cw_log(LOG_ERR,"Can't convert from SQL %s",prop);
return 1;
}
mbag_item_t * i = cwi->type->from_str(val);
i->id=cwi->id;
DBGX("Item made: %s",i->id);
DBGX("Item data: %s",i->data);
mbag_set(conn->outgoing,i);
/*
if (i->type == MBAG_STR) {
mbag_set_strn(conn->outgoing, a->item_id, (char *) data, len);
return 1;
}
*/
}
// DBGX("The SQL RC: %d\n",rc);
return 1;
@ -182,3 +220,5 @@ errX:
}