From 4047707fa8f7bb6d774c6a149ca57e40c263a451 Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Fri, 26 Aug 2022 21:22:18 +0200 Subject: [PATCH] Unused files --- src/ac/db.c | 487 -------------------------------------------- src/ac/db.h | 21 -- src/ac/mod_cipwap.c | 29 --- src/ac/module.h | 13 -- 4 files changed, 550 deletions(-) delete mode 100644 src/ac/db.c delete mode 100644 src/ac/db.h delete mode 100644 src/ac/mod_cipwap.c delete mode 100644 src/ac/module.h diff --git a/src/ac/db.c b/src/ac/db.c deleted file mode 100644 index e77a8021..00000000 --- a/src/ac/db.c +++ /dev/null @@ -1,487 +0,0 @@ - -#include - - -#include "cw/log.h" -#include "cw/dbg.h" - -#include "cw/conn.h" - - - -#include "conf.h" - -static sqlite3 *handle; - - -static const char * init_tables = "\ - CREATE TABLE IF NOT EXISTS acs (acid TEXT PRIMARY KEY, acname TEXT, lastseen TIMESTAMP); \ - CREATE TABLE IF NOT EXISTS radios (\ - wtpid TEXT,\ - rid TEXT,\ - key TEXT,\ - sub_key,\ - val TEXT, \ - upd INTEGER, \ - PRIMARY KEY (wtpid,rid,key,sub_key)\ - );\ - CREATE TABLE IF NOT EXISTS acips (acid TEXT,ip TEXT); \ - CREATE TABLE IF NOT EXISTS wtps (wtpid TEXT PRIMARY KEY, acid TEXT,lastseen TIMESTAMP); \ - CREATE TABLE IF NOT EXISTS wtpprops (\ - wtpid TEXT NOT NULL,\ - id TEXT NOT NULL,\ - sub_id TEXT NOT NULL,\ - val TEXT,\ - upd INTEGER,\ - PRIMARY KEY(wtpid,id,sub_id)\ - );\ - CREATE TABLE IF NOT EXISTS wlans (wlanid INTEGER PRIMARY KEY);\ - CREATE TABLE IF NOT EXISTS wlanprops (wlanid INTEGER, id TEXT NOT NULL, val TEXT, PRIMARY KEY(wlanid,id));\ - "; - - - - -int db_init() -{ - - int rc; - const char * filename="ac.sqlite3"; - cw_dbg(DBG_INFO,"Initializing Sqlite3 DB: %s, SQLite3 Version %s",filename,SQLITE_VERSION); - - rc = sqlite3_config(SQLITE_CONFIG_SERIALIZED); - if (rc!=SQLITE_OK){ - cw_log(LOG_ERR,"Error configuring SQLite3: %s",sqlite3_errmsg(handle)); - return 0; - } - - rc = sqlite3_initialize(); - if (rc!=SQLITE_OK){ - cw_log(LOG_ERR,"Error initializing SQLite3 DB : %s",sqlite3_errmsg(handle)); - return 0; - } - - - - rc = sqlite3_open(filename,&handle); - if (rc != SQLITE_OK) - { - cw_log(LOG_ERR,"Error opening SQLite3 DB %s: %s",filename,sqlite3_errmsg(handle)); - return 0; - } - - const char * cmd = init_tables; - rc = sqlite3_exec(handle,cmd,0,0,0); - if (rc) - { - const char *em = sqlite3_errmsg(handle); - cw_log(LOG_ERR,"Error executing SQL \"%s\"\nSQL Error Message: %s",cmd, em); - return 0; - - } - - return 1; -} - - -static sqlite3_stmt * ping_stmt; -static sqlite3_stmt * put_wtp_prop_stmt; - - -static sqlite3_stmt * get_tasks_stmt; - -static sqlite3_stmt * stmt_get_radio_tasks; - -static sqlite3_stmt * stmt_ping_wtp; -static sqlite3_stmt * stmt_put_radio_prop; - -int db_start() -{ - cw_dbg(DBG_INFO,"Starting Sqlite3 DB"); - - const char *sql=""; - - sqlite3_stmt *stmt; - int rc = sqlite3_prepare_v2(handle, "INSERT OR REPLACE INTO acs (acid,acname) VALUES (?,?);",-1,&stmt,0); - if (rc) - goto errX; - - rc = sqlite3_bind_text(stmt,1,conf_acid,-1,SQLITE_STATIC); - - rc = sqlite3_bind_text(stmt,2,conf_acname,-1,SQLITE_STATIC); - - sqlite3_step(stmt); - - rc = sqlite3_prepare_v2(handle, "UPDATE acs SET lastseen=datetime('now') WHERE acid=?;",-1,&ping_stmt,0); - rc = sqlite3_bind_text(ping_stmt,1,conf_acid,-1,SQLITE_STATIC); - - - /* Prepare statement to update a WTP property */ - sql = "INSERT OR REPLACE INTO wtpprops\ - (wtpid,id,sub_id,val,upd)\ - VALUES (?,?,?,?,?)"; - - rc = sqlite3_prepare_v2(handle, sql,-1, &put_wtp_prop_stmt,0); - if (rc) - goto errX; - - - sql = "INSERT OR REPLACE INTO radios\ - (wtpid,rid,key,sub_key,val,upd)\ - VALUES (?,?,?,?,?,0)"; - - rc = sqlite3_prepare_v2(handle, sql,-1, &stmt_put_radio_prop,0); - if (rc) - goto errX; - - - /* Prepare WTP ping statement */ - sql = "INSERT OR REPLACE INTO wtps (wtpid,acid,lastseen) VALUES(?,?,datetime('now'))"; - rc = sqlite3_prepare_v2(handle, sql,-1, &stmt_ping_wtp,0); - if (rc) - goto errX; - - - - sql = "SELECT wtpid,id,sub_id,val FROM wtpprops WHERE upd>0 AND wtpid=?"; - rc = sqlite3_prepare_v2(handle, sql,-1, &get_tasks_stmt,0); - if (rc) - goto errX; - - - sql = "SELECT wtpid,rid,key,sub_key,val FROM radios WHERE upd>0 AND wtpid=?"; - rc = sqlite3_prepare_v2(handle, sql,-1, &stmt_get_radio_tasks,0); - if (rc) - goto errX; - - - - return 1; - -errX: - cw_log(LOG_ERR,"Fatal: Can't start Sqlite3 DB, Error while executing '%s' - %d - %s",sql,rc,sqlite3_errmsg(handle)); - return 0; - - -} - -void db_put_radio_prop(const char *wtp_id,const char *rid, const char * key,const char *sub_key,const char * val) -{ - int rc=0; - -/*// DBGX("Putting %s/%s:%s",id,sub_id,val); -// (wtpid,rid,key,sub_key,val,upd) -*/ - sqlite3_reset(stmt_put_radio_prop); - sqlite3_clear_bindings(stmt_put_radio_prop); - - if(sqlite3_bind_text(stmt_put_radio_prop,1,wtp_id,-1,SQLITE_STATIC)) - goto errX; - - if(sqlite3_bind_text(stmt_put_radio_prop,2,rid,-1,SQLITE_STATIC)) - goto errX; - - - - if (sqlite3_bind_text(stmt_put_radio_prop,3,key,-1,SQLITE_STATIC)) - goto errX; - - -/* if (!sub_key) - sub_key=CW_ITEM_NONE; -*/ - if (sqlite3_bind_text(stmt_put_radio_prop,4,sub_key,-1,SQLITE_STATIC)) - goto errX; - - if (sqlite3_bind_text(stmt_put_radio_prop,5,val,-1,SQLITE_STATIC)) - goto errX; - - -/* -// if (sqlite3_bind_int(put_wtp_prop_stmt,5,0)) -// goto errX; - -// cw_dbg(DBG_X,"Her I am already, next is step"); -*/ - rc = sqlite3_step(stmt_put_radio_prop); - if (rc != SQLITE_DONE) - goto errX; - -/* -// cw_dbg(DBG_X,"SQL schould be fine"); -*/ - return; -errX: -/*// cw_dbg (DBG_X, "Iam on err %d\n",rc);*/ - - - if (rc) { - cw_log(LOG_ERR,"Can't update database with WTP props: %d - %s", - rc,sqlite3_errmsg(handle)); - } - -} - - - - - -void db_ping() -{ - int rc = sqlite3_step(ping_stmt); - if (rc!=SQLITE_DONE){ - cw_log(LOG_ERR,"Error: Can't ping database, error code %d - %s",rc,sqlite3_errmsg(handle)); - } -} - - -void db_ping_wtp(const char *wtpid,const char *acid) -{ - int rc=0; - sqlite3_reset(stmt_ping_wtp); - sqlite3_clear_bindings(stmt_ping_wtp); - if(sqlite3_bind_text(stmt_ping_wtp,1,wtpid,-1,SQLITE_STATIC)) - goto errX; - - if(sqlite3_bind_text(stmt_ping_wtp,2,acid,-1,SQLITE_STATIC)) - goto errX; - - rc = sqlite3_step(stmt_ping_wtp); -errX: - if (rc!=SQLITE_DONE) { - cw_log(LOG_ERR,"Can't ping database for WTP: %d - %s", - rc,sqlite3_errmsg(handle)); - } - - - -} - -void db_put_wtp_prop(const char *wtp_id,const char * id,const char *sub_id,const char * val) -{ - int rc=0; - -/*// DBGX("Putting %s/%s:%s",id,sub_id,val); -*/ - - sqlite3_reset(put_wtp_prop_stmt); - sqlite3_clear_bindings(put_wtp_prop_stmt); - - if(sqlite3_bind_text(put_wtp_prop_stmt,1,wtp_id,-1,SQLITE_STATIC)) - goto errX; - - if(sqlite3_bind_text(put_wtp_prop_stmt,2,id,-1,SQLITE_STATIC)) - goto errX; - -/* if (!sub_id) - sub_id=CW_ITEM_NONE; -*/ - - if (sqlite3_bind_text(put_wtp_prop_stmt,3,sub_id,-1,SQLITE_STATIC)) - goto errX; - - if (sqlite3_bind_text(put_wtp_prop_stmt,4,val,-1,SQLITE_STATIC)) - goto errX; - - if (sqlite3_bind_int(put_wtp_prop_stmt,5,0)) - goto errX; - -/*// cw_dbg(DBG_X,"Her I am already, next is step"); -*/ - rc = sqlite3_step(put_wtp_prop_stmt); - if (rc != SQLITE_DONE) - goto errX; - -/* -// cw_dbg(DBG_X,"SQL schould be fine"); -*/ - return; -errX: -/*// cw_dbg (DBG_X, "Iam on err %d\n",rc);*/ - - - if (rc) { - cw_log(LOG_ERR,"Can't update database with WTP props: %d - %s", - rc,sqlite3_errmsg(handle)); - } - -} - -/*// TODO XXXX*/ -mavl_t db_get_update_tasks(struct conn * conn,const char * wtpid) -{ -/* - sqlite3_reset(get_tasks_stmt); - sqlite3_clear_bindings(get_tasks_stmt); - - mavl_conststr_t r = mavl_create_conststr(); - if (!r) - return NULL; - - - int rc=0; - - - if(sqlite3_bind_text(get_tasks_stmt,1,wtpid,-1,SQLITE_STATIC)) - goto errX; - - while (SQLITE_ROW == sqlite3_step(get_tasks_stmt)) { - - int ii; - //DBGX("-----------------------------------------------------",""); - for (ii=0; ii<5; ii++){ - - //DBGX("CVALL: %s",(const char*)sqlite3_column_text(get_tasks_stmt,ii)); - - - } - - const char *id = (const char*)sqlite3_column_text(get_tasks_stmt,1); - if (!id) { - continue; - } - - const char *sub_id = (const char*)sqlite3_column_text(get_tasks_stmt,2); - - const char *val = (const char*)sqlite3_column_text(get_tasks_stmt,3); - - //DBGX("ID: (%s), SubID (%s), Val (%s)",id,sub_id,val); - - const struct cw_itemdef * cwi = cw_itemdef_get(conn->actions->items,id,sub_id); - if (!cwi) { - //DBGX("Not item definition found for: %s/%s",id,sub_id); - continue; - } - - //uint8_t data[2048]; - - if (!cwi->type->from_str) { - cw_log(LOG_ERR,"Can't convert from string %s/%s - No method defined.",id,sub_id); - continue; - } - - - mbag_item_t * i = cwi->type->from_str(val); - i->id=cwi->id; - - mbag_set(conn->outgoing,i); - - mavl_add(r,(void*)cwi->id); - } - - if (r->count) - return r; - - mavl_destroy(r); - return NULL; - - -errX: - if (rc) { - cw_log(LOG_ERR,"Can't get tasks: %d - %s", - rc,sqlite3_errmsg(handle)); - } - - if (r) - mavl_destroy(r); - - - return NULL; -*/ -} - - - -mavl_t db_get_radio_tasks(struct conn * conn,const char * wtpid) -{ -/* -//cw_dbg(DBG_X,"Get Radio Tasks for %s",wtpid); - - sqlite3_reset(stmt_get_radio_tasks); - sqlite3_clear_bindings(stmt_get_radio_tasks); - - mavl_conststr_t r = mavl_create_conststr(); - if (!r) - return NULL; - - - int rc=0; - - - if(sqlite3_bind_text(stmt_get_radio_tasks,1,wtpid,-1,SQLITE_STATIC)) - goto errX; - - while (SQLITE_ROW == sqlite3_step(stmt_get_radio_tasks)) { - - int ii; - //DBGX("-----------------------------------------------------",""); - for (ii=0; ii<6; ii++){ - - DBGX("CVALL: %s",(const char*)sqlite3_column_text(stmt_get_radio_tasks,ii)); - - - } - const char *strrid= (const char*)sqlite3_column_text(stmt_get_radio_tasks,1); - - const char *id = (const char*)sqlite3_column_text(stmt_get_radio_tasks,2); - if (!id) { - continue; - } - - const char *sub_id = (const char*)sqlite3_column_text(stmt_get_radio_tasks,3); - - const char *val = (const char*)sqlite3_column_text(stmt_get_radio_tasks,4); - - //DBGX("ID: (%s), SubID (%s), Val (%s)",id,sub_id,val); - - const struct cw_itemdef * cwi = cw_itemdef_get(conn->actions->radioitems,id,sub_id); - if (!cwi) { - DBGX("No item definition found for: %s/%s",id,sub_id); - continue; - } - - - if (!cwi->type->from_str) { - cw_log(LOG_ERR,"Can't convert from string %s/%s - No method defined.",id,sub_id); - continue; - } - - - mbag_item_t * i = cwi->type->from_str(val); - i->id=cwi->id; - - int rid = atoi(strrid); - cw_dbg(DBG_X,"RID: %d",rid); - - - mbag_t radio = mbag_i_get_mbag_c(conn->radios_upd,rid,mbag_create); - mbag_set(radio,i); - - - //mbag_set(conn->outgoing,i); - - mavl_add(r,(void*)cwi->id); - } - - if (r->count) - return r; - - mavl_destroy(r); - return NULL; - - -errX: - if (rc) { - cw_log(LOG_ERR,"Can't get tasks: %d - %s", - rc,sqlite3_errmsg(handle)); - } - - if (r) - mavl_destroy(r); - - - return NULL; -*/ -} - - diff --git a/src/ac/db.h b/src/ac/db.h deleted file mode 100644 index 74cc0f1b..00000000 --- a/src/ac/db.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef CW_MAVL_H -#define CW_MAVL_H - -#include "mavl.h" - -extern void db_ping(); -extern void db_ping_wtp(const char *wtpid,const char *acid); - -extern int db_init(); -int db_start(); -int db_get_tasks(struct conn * conn,const char * wtpid); -void db_put_wtp_prop(const char *wtp_id,const char * id,const char *sub_id,const char * val); -mavl_t db_get_update_tasks(struct conn * conn,const char * wtpid); - -void db_put_radio_prop(const char *wtp_id,const char *rid, const char * key,const char *sub_key,const char * val); -extern mavl_t db_get_radio_tasks(struct conn * conn,const char * wtpid); - - -#endif - - diff --git a/src/ac/mod_cipwap.c b/src/ac/mod_cipwap.c deleted file mode 100644 index 1e8bacec..00000000 --- a/src/ac/mod_cipwap.c +++ /dev/null @@ -1,29 +0,0 @@ - - -#include "module.h" - - -static int init() -{ -// regn = cw_register_actions_cipwap_ac(&capwap_actions); - return 1; -} - - - -static struct ac_module module = { - .name="Cipwap", - .init= init, - .detect_by_discovery = 0 - - -}; - - - - -struct ac_module * mod_cipwap() -{ - - return &module; -} diff --git a/src/ac/module.h b/src/ac/module.h deleted file mode 100644 index 9c45aabb..00000000 --- a/src/ac/module.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __MODULE_H -#define __MODULE_H - -struct ac_module -{ - const char *name; - int (*init)(); - int (*detect_by_raw)(const char *msg, int len); - int (*detect_by_discovery)(const char*); -}; - - -#endif