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

Stores tosql

Browse Source 
FossilOrigin-Name: 5c2a93dc2c95b1e158a4261420826d1cbc8f7d3a547a1af0a1a6537550b51138
This commit is contained in:
7u83@mail.ru 2016-04-12 05:32:05 +00:00
parent 94f33bc2ee
commit 72902de1d6
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ac/wtpman.c
View File

@ -68,6 +68,8 @@ static int msg_start_handler(struct conn *conn, struct cw_action_in *a, uint8_t
} }
static void wtpman_remove(struct wtpman *wtpman) static void wtpman_remove(struct wtpman *wtpman)
{ {
wtplist_lock(); wtplist_lock();
@ -382,7 +384,7 @@ void radio_to_sql(struct conn *conn, char *wtp_id, int rid, mbag_t radio)
char str[4096]; char str[4096];
if (i->type->to_str) { if (i->type->to_str) {
i->type->to_str(i, str); i->type->to_str(i, str);
printf("I would put RID: %d, %s=>%s\n",rid,cwi->id,str); // printf("I would put RID: %d, %s=>%s\n",rid,cwi->id,str);
char srid[6]; char srid[6];
sprintf(srid,"%d",rid); sprintf(srid,"%d",rid);
@ -424,6 +426,10 @@ void radios_to_sql(struct conn *conn)
} }
} }
void wtpman_run_data(void *wtpman_arg) void wtpman_run_data(void *wtpman_arg)
{ {
@ -447,6 +453,15 @@ void wtpman_run_data(void *wtpman_arg)
} }
static int msg_end_handler(struct conn *conn, struct cw_action_in *a, uint8_t * data,
int len, struct sockaddr *from)
{
if (a->msg_id ==CW_MSG_CHANGE_STATE_EVENT_REQUEST) {
props_to_sql(conn,conn->incomming,0);
radios_to_sql(conn);
}
}
static void wtpman_run(void *arg) static void wtpman_run(void *arg)
{ {
@ -458,6 +473,8 @@ static void wtpman_run(void *arg)
struct conn *conn = wtpman->conn; struct conn *conn = wtpman->conn;
/* reject connections to our multi- or broadcast sockets */ /* reject connections to our multi- or broadcast sockets */
/* if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET) { /* if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
cw_dbg(DBG_DTLS, "Dropping connection from %s to non-unicast socket.", cw_dbg(DBG_DTLS, "Dropping connection from %s to non-unicast socket.",
@ -493,9 +510,9 @@ static void wtpman_run(void *arg)
cw_dbg(DBG_INFO, "Creating data thread"); // cw_dbg(DBG_INFO, "Creating data thread");
pthread_t thread; // pthread_t thread;
pthread_create(&thread, NULL, (void *) wtpman_run_data, (void *) wtpman); // pthread_create(&thread, NULL, (void *) wtpman_run_data, (void *) wtpman);
/* here the WTP has joined, now we assume an image data request /* here the WTP has joined, now we assume an image data request
@ -535,6 +552,7 @@ static void wtpman_run(void *arg)
radios_to_sql(conn); radios_to_sql(conn);
conn->msg_end=msg_end_handler;
/* The main run loop */ /* The main run loop */
reset_echointerval_timer(wtpman); reset_echointerval_timer(wtpman);
@ -556,6 +574,12 @@ static void wtpman_run(void *arg)
} }
mavl_del_all(conn->outgoing); mavl_del_all(conn->outgoing);
conn_clear_upd(conn,1);
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
mavl_conststr_t r; mavl_conststr_t r;
r = db_get_update_tasks(conn, sock_addr2str(&conn->addr)); r = db_get_update_tasks(conn, sock_addr2str(&conn->addr));
@ -583,8 +607,12 @@ static void wtpman_run(void *arg)
cw_dbg(DBG_INFO, "Updating Radios for %s",sock_addr2str(&conn->addr)); cw_dbg(DBG_INFO, "Updating Radios for %s",sock_addr2str(&conn->addr));
rc = cw_send_request(conn, CW_MSG_CONFIGURATION_UPDATE_REQUEST); rc = cw_send_request(conn, CW_MSG_CONFIGURATION_UPDATE_REQUEST);
mavl_destroy(conn->radios_upd);
conn->radios_upd=mbag_i_create();
conn_clear_upd(conn,1);
// mavl_destroy(conn->radios_upd);
// conn->radios_upd=mbag_i_create();
radios_to_sql(conn); radios_to_sql(conn);