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

Changed most of old debug command to the dbg commands.

Browse Source 
FossilOrigin-Name: 0a85e2b30c8e870c2d7d784d1ab16f1e2f2d4ece2b9279a0733982cc5becdb25
This commit is contained in:
7u83@mail.ru 2014-08-14 17:37:06 +00:00
parent 293d04d999
commit a831b40668
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ac/wtpman.c
View File

@ -97,7 +97,7 @@ static void wtpman_run_discovery(void *arg)
char wtpinfostr[8192]; char wtpinfostr[8192];
wtpinfo_print(wtpinfostr,&wtpman->wtpinfo); wtpinfo_print(wtpinfostr,&wtpman->wtpinfo);
cw_log_debug2("Discovery request gave us the follwing WTP Info:\n%s",wtpinfostr); cw_dbg(DBG_CW_INFO,"Discovery request gave us the follwing WTP Info:\n%s",wtpinfostr);
// wtpinfo_print(&wtpman->wtpinfo); // wtpinfo_print(&wtpman->wtpinfo);
@ -116,12 +116,12 @@ static void wtpman_run(void *arg)
if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET){ if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET){
cw_log_debug0("Dropping connection from %s to non-unicast socket", CLIENT_IP); cw_dbg(DBG_DTLS,"Dropping connection from %s to non-unicast socket", CLIENT_IP);
wtpman_remove(wtpman); wtpman_remove(wtpman);
return; return;
} }
cw_log_debug0("Establishing DTLS connection from %s",CLIENT_IP); cw_dbg(DBG_DTLS,"Establishing DTLS connection with %s",CLIENT_IP);
#ifdef WITH_DTLS #ifdef WITH_DTLS
@ -150,7 +150,7 @@ static void wtpman_run(void *arg)
} }
if ( !dtls_accept(wtpman->conn) ){ if ( !dtls_accept(wtpman->conn) ){
cw_log_debug0("Error establishing DTLS connection from %s",CLIENT_IP); cw_dbg(DBG_DTLS,"Error establishing DTLS connection with %s",CLIENT_IP);
wtpman_remove(wtpman); wtpman_remove(wtpman);
return; return;
} }
@ -158,18 +158,26 @@ static void wtpman_run(void *arg)
#endif #endif
// const struct sockaddr *sa, char *s, size_t maxlen // const struct sockaddr *sa, char *s, size_t maxlen
cw_log_debug0("DTLS Session established with %s, cipher=%s", CLIENT_IP,dtls_get_cipher(wtpman->conn)); cw_dbg(DBG_DTLS,"DTLS Session established with %s, cipher=%s", CLIENT_IP,dtls_get_cipher(wtpman->conn));
do {
cwrmsg = conn_get_message(wtpman->conn); cwrmsg = conn_get_message(wtpman->conn);
if (!cwrmsg) {
// printf("Got no cwrmsg\n");
}
} while (!cwrmsg);
// printf("Seqnum: %i\n",cwrmsg->seqnum); // printf("Seqnum: %i\n",cwrmsg->seqnum);
if (cwrmsg->type != CWMSG_JOIN_REQUEST){ if (cwrmsg->type != CWMSG_JOIN_REQUEST){
cw_log_debug0("Join request expected but got %i",cwrmsg->type); cw_dbg(DBG_CW_MSG,"Join request expected but got %i",cwrmsg->type);
wtpman_remove(wtpman); wtpman_remove(wtpman);
return; return;
} }
cw_dbg(DBG_CW_MSG,"Received join request from %s",CLIENT_IP);
process_join_request(&wtpman->wtpinfo,cwrmsg->msgelems,cwrmsg->msgelems_len); process_join_request(&wtpman->wtpinfo,cwrmsg->msgelems,cwrmsg->msgelems_len);
struct radioinfo radioinfo; struct radioinfo radioinfo;
@ -179,7 +187,7 @@ static void wtpman_run(void *arg)
// printf("ACN: %s\n",acinfo->ac_name); // printf("ACN: %s\n",acinfo->ac_name);
int result_code = 1; int result_code = 0;
cwsend_join_response(wtpman->conn,cwrmsg->seqnum,result_code,&radioinfo,acinfo,&wtpman->wtpinfo); cwsend_join_response(wtpman->conn,cwrmsg->seqnum,result_code,&radioinfo,acinfo,&wtpman->wtpinfo);
cw_log_debug0("WTP joined %s,%s",wtpman->wtpinfo.name,wtpman->wtpinfo.location); cw_log_debug0("WTP joined %s,%s",wtpman->wtpinfo.name,wtpman->wtpinfo.location);