From d5b690213ea55b3a238c20b67333b5d647a49edd Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Sat, 7 Feb 2015 10:51:29 +0000 Subject: [PATCH] Changed all "old-style" debug calls to new dbg calls. FossilOrigin-Name: 2e98f08a020add71cecfd7d1902ba88cc5a5a48daf9574e85974674c9a6412cc --- src/ac/ac_main.c | 10 ++++++---- src/ac/db.c | 4 ++-- src/ac/wtpman.c | 6 ++++-- src/capwap/conn.h | 3 ++- src/capwap/conn_q_add_packet.c | 2 +- src/capwap/conn_send_packet.c | 4 ++-- src/capwap/cw_log.h | 7 ++++--- src/capwap/cw_rand.c | 2 +- src/capwap/cw_readelem_ieee80211_wtp_radio_info.c | 2 +- src/capwap/cwmsg_addelem_ctrl_ip_addrs.c | 2 +- src/capwap/cwread_join_response.c | 4 ++-- src/capwap/wtpinfo_readelem_discovery_type.c | 2 +- src/capwap/wtpinfo_readelem_wtp_descriptor.c | 12 ++++++------ src/capwap/wtpinfo_readelem_wtp_frame_tunnel_mode.c | 2 +- src/capwap/wtpinfo_readelem_wtp_mac_type.c | 2 +- src/capwap/wtpinfo_readelem_wtp_name.c | 2 +- src/capwap/wtpinfo_readelem_wtp_radio_info.c | 2 +- 17 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/ac/ac_main.c b/src/ac/ac_main.c index 99b22360..2a8ffab8 100644 --- a/src/ac/ac_main.c +++ b/src/ac/ac_main.c @@ -280,7 +280,7 @@ void process_lw_ctrl_packet(int index,struct sockaddr * addr, uint8_t * buffer, int version = LWTH_GET_VERSION(m); if (version != LW_VERSION){ - cw_log_debug1("Discarding LWAPP packet, wrong verson"); +// cw_log_debug1("Discarding LWAPP packet, wrong verson"); return; } @@ -288,7 +288,7 @@ void process_lw_ctrl_packet(int index,struct sockaddr * addr, uint8_t * buffer, printf ("LEN = %d\n",l); if (l+12 != len){ - cw_log_debug1("Discarding LWAPP packet, wrong length"); + // cw_log_debug1("Discarding LWAPP packet, wrong length"); return; } @@ -341,9 +341,11 @@ void process_ctrl_packet(int index,struct sockaddr * addr, uint8_t * buffer, int #ifdef WITH_CW_LOG_DEBUG char str[100]; sock_addrtostr(addr,str,100); - cw_dbg(DBG_CW_PKT_IN,"Received packet from %s, len = %i, via %s\n",str,len, + cw_dbg(DBG_CW_PKT_IN,"Received packet from %s, len = %i, via %s\n",sock_addr2str(addr),len, socklist[index].type==SOCKLIST_UNICAST_SOCKET ? "unicast":"bcast/mcast"); - cw_log_debug2_dump(buffer,len,"Packet data for packet, recevied from %s",str); + + cw_dbg_dmp(DBG_CW_PKT_DMP,buffer,len,"Dump ..."); +// cw_dbg_dmp(buffer,len,"Packet data for packet, recevied from %s",str); #endif switch (socklist[index].ac_proto){ diff --git a/src/ac/db.c b/src/ac/db.c index 2907f83e..afd9149e 100644 --- a/src/ac/db.c +++ b/src/ac/db.c @@ -18,7 +18,7 @@ int db_init() { const char * filename="ac.sqlite3"; - cw_log_debug0("Init sqlite3 db: %s",filename); + cw_dbg(DBG_CW_INFO,"Init sqlite3 db: %s",filename); int rc = sqlite3_open(filename,&handle); if (rc) { @@ -46,7 +46,7 @@ static sqlite3_stmt * ping_stmt; int db_start() { - cw_log_debug0("Start sqlite3 db"); + cw_dbg(DBG_CW_INFO,"Start sqlite3 db"); sqlite3_stmt *stmt; int rc = sqlite3_prepare_v2(handle, "INSERT INTO acs (acid,acname) VALUES (?,?);",-1,&stmt,0); diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c index 1aa96cb0..f965ba98 100644 --- a/src/ac/wtpman.c +++ b/src/ac/wtpman.c @@ -38,10 +38,12 @@ #define CLIENT_IP (sock_addrtostr((struct sockaddr*)&wtpman->conn->addr, (char[64]){0},64)) -void conn_handle_echo_request(struct conn * conn) +int conn_handle_echo_request(void * d) { + struct conn * conn = (struct conn *)d; struct cwrmsg * cwrmsg = &conn->cwrmsg; cwsend_echo_response(conn,cwrmsg->seqnum,0); + return 0; } @@ -710,7 +712,7 @@ exit(0); if (msg_counter < CAPWAP_ECHO_INTERVAL *2 ) continue; - cw_log_debug0("WTP died"); + // cw_log_debug0("WTP died"); wtpman_remove(wtpman); return; } diff --git a/src/capwap/conn.h b/src/capwap/conn.h index b9aa7cb9..d8a97971 100644 --- a/src/capwap/conn.h +++ b/src/capwap/conn.h @@ -28,7 +28,7 @@ #include "fragman.h" #include "cwmsg.h" #include "cwrmsg.h" - +#include "wtpinfo.h" struct conn{ int sock; @@ -182,6 +182,7 @@ struct image_data; extern void conn_prepare_request(struct conn * conn, int type); extern int conn_prepare_image_data_request(struct conn * conn, struct image_data *, struct image_identifier *id ); +extern void conn_detect_capwap(struct conn * conn, struct wtpinfo * wtpinfo); #define conn_is_error(conn) (conn->dtls_error) diff --git a/src/capwap/conn_q_add_packet.c b/src/capwap/conn_q_add_packet.c index b12fdc9d..4ca5fa65 100644 --- a/src/capwap/conn_q_add_packet.c +++ b/src/capwap/conn_q_add_packet.c @@ -31,7 +31,7 @@ void conn_q_add_packet(struct conn * conn,uint8_t *packet,int len) if (conn->qrpos==qwpos){ /* no buffers, discard packet */ - cw_log_debug0( "Discarding packet, no queue buffers left"); + cw_dbg(DBG_CW_PKT_ERR, "Discarding packet, no queue buffers left"); return; } diff --git a/src/capwap/conn_send_packet.c b/src/capwap/conn_send_packet.c index 3ea9570e..21e973b2 100644 --- a/src/capwap/conn_send_packet.c +++ b/src/capwap/conn_send_packet.c @@ -29,14 +29,14 @@ int conn_send_packet(struct conn * conn, const uint8_t * buffer, int len) { - +/* #ifdef WITH_CW_LOG_DEBUG char addrstr[64]; sock_addrtostr((struct sockaddr*)&conn->addr,addrstr,64); cw_log_debug1("Sending packet to %s, len=%d",addrstr,len); cw_log_debug2_dump(buffer,len,"Packet data for packet, sent to %s",addrstr); #endif - +*/ int n; while((n=sendto( conn->sock, buffer, len, 0, (struct sockaddr*)&conn->addr, diff --git a/src/capwap/cw_log.h b/src/capwap/cw_log.h index 8afc3d44..0ff943a3 100644 --- a/src/capwap/cw_log.h +++ b/src/capwap/cw_log.h @@ -88,6 +88,7 @@ extern int cw_dbg_opt_level; #endif #ifdef WITH_CW_LOG_DEBUG +/* #define cw_log_debug0(...) cw_log_debug_cbs[0](__VA_ARGS__) #define cw_log_debug1(...) cw_log_debug_cbs[1](__VA_ARGS__) #define cw_log_debug2(...) cw_log_debug_cbs[2](__VA_ARGS__) @@ -96,7 +97,7 @@ extern int cw_dbg_opt_level; #define cw_log_debug1_dump(str,len,...) cw_log_debug_dump_(1,str,len,__VA_ARGS__) #define cw_log_debug2_dump(str,len,...) cw_log_debug_dump_(2,str,len,__VA_ARGS__) #define cw_log_debug(level,...) cw_log_debug_cbs[level](__VA_ARGS__) - +*/ #define cw_log_dbg(type,...) cw_log_dbg_(type,__FILE__,__LINE__,__VA_ARGS__) #define cw_dbg(type,...) cw_log_dbg_(type,__FILE__,__LINE__,__VA_ARGS__) @@ -110,7 +111,7 @@ extern int cw_dbg_opt_level; #define cw_dbg(...) - #define cw_log_debug0(...) +/* #define cw_log_debug0(...) #define cw_log_debug1(...) #define cw_log_debug2(...) #define cw_log_debug(...) @@ -118,7 +119,7 @@ extern int cw_dbg_opt_level; #define cw_log_debug0_dump(level,str,len) #define cw_log_debug1_dump(level,str,len) #define cw_log_debug2_dump(level,str,len) - +*/ #define cw_dbg_missing_mand_elems(conn, msgtyoe, mand) #endif diff --git a/src/capwap/cw_rand.c b/src/capwap/cw_rand.c index 30848a45..d718eb2b 100644 --- a/src/capwap/cw_rand.c +++ b/src/capwap/cw_rand.c @@ -53,7 +53,7 @@ int cw_rand(uint8_t*dst, int len) } if (llen) { - cw_log_debug1("WTP descriptor subelement to long, length=%d>%d",i+8,len); + cw_dbg(DBG_CW_MSG_ERR,"WTP descriptor subelement to long, length=%d>%d",i+8,len); return -1; } @@ -66,11 +66,11 @@ static int wtpinfo_readelem_wtp_descriptor_(struct wtpinfo * wtpinfo, int type, i+=8; if (sublen+i>len){ - cw_log_debug1("WTP descriptor subelement too long, length = %d",sublen); + cw_dbg(DBG_CW_MSG_ERR,"WTP descriptor subelement too long, length = %d",sublen); return -1; } - cw_log_debug2("Reading WTP descriptor subelement, type=%d,len=%d",subtype,sublen); + cw_dbg(DBG_CW_MSG,"Reading WTP descriptor subelement, type=%d,len=%d",subtype,sublen); switch(subtype){ case CWMSGSUBELEM_WTP_DESCRIPTOR_HARDWARE_VERSION: @@ -89,7 +89,7 @@ static int wtpinfo_readelem_wtp_descriptor_(struct wtpinfo * wtpinfo, int type, wtpinfo->bootloader_version_len=sublen; break; default: - cw_log_debug1("Unknown WTP descriptor subelement, type = %d",subtype); + cw_dbg(DBG_CW_MSG_ERR,"Unknown WTP descriptor subelement, type = %d",subtype); break; } i+=sublen; @@ -103,7 +103,7 @@ int wtpinfo_readelem_wtp_descriptor(struct wtpinfo * wtpinfo, int type, uint8_t { int rc =wtpinfo_readelem_wtp_descriptor_(wtpinfo, type, msgelem, len,0); if (rc==-1){ - cw_log_debug2("Bad wtp descriptor, trying cisco hack"); + cw_dbg(DBG_CW_RFC,"Bad wtp descriptor, trying cisco hack"); rc =wtpinfo_readelem_wtp_descriptor_(wtpinfo, type, msgelem, len,1); } diff --git a/src/capwap/wtpinfo_readelem_wtp_frame_tunnel_mode.c b/src/capwap/wtpinfo_readelem_wtp_frame_tunnel_mode.c index 0c44f600..67724397 100644 --- a/src/capwap/wtpinfo_readelem_wtp_frame_tunnel_mode.c +++ b/src/capwap/wtpinfo_readelem_wtp_frame_tunnel_mode.c @@ -11,7 +11,7 @@ int wtpinfo_readelem_wtp_frame_tunnel_mode(struct wtpinfo * wtpinfo, int type, u return 0; if (len!=1){ - cw_log_debug0("Discarding WTP_DISCOVERY_TYPE msgelem, wrong size, type=%d,len=%d",type,len); + cw_dbg(DBG_CW_MSG_ERR,"Discarding WTP_DISCOVERY_TYPE msgelem, wrong size, type=%d,len=%d",type,len); return 1; } wtpinfo->frame_tunnel_mode=*msgelem; diff --git a/src/capwap/wtpinfo_readelem_wtp_mac_type.c b/src/capwap/wtpinfo_readelem_wtp_mac_type.c index 2c753c06..d4b243b6 100644 --- a/src/capwap/wtpinfo_readelem_wtp_mac_type.c +++ b/src/capwap/wtpinfo_readelem_wtp_mac_type.c @@ -10,7 +10,7 @@ int wtpinfo_readelem_wtp_mac_type(struct wtpinfo * wtpinfo, int type, uint8_t * return 0; if (len!=1){ - cw_log_debug0("Discarding WTP_MAC_TYPE msgelem, wrong size, type=%d,len=%d",type,len); + cw_dbg(DBG_CW_MSG_ERR,"Discarding WTP_MAC_TYPE msgelem, wrong size, type=%d,len=%d",type,len); return 1; } diff --git a/src/capwap/wtpinfo_readelem_wtp_name.c b/src/capwap/wtpinfo_readelem_wtp_name.c index 8d66df3d..020a08b2 100644 --- a/src/capwap/wtpinfo_readelem_wtp_name.c +++ b/src/capwap/wtpinfo_readelem_wtp_name.c @@ -12,7 +12,7 @@ int wtpinfo_readelem_wtp_name(struct wtpinfo * wtpinfo, int type, uint8_t * msge return 0; if (len>512){ - cw_log_debug0("Truncating WTP_NAME msgelem to 512, wrong size, type=%d,len=%d",type,len); + cw_dbg(DBG_CW_MSG_ERR,"Truncating WTP_NAME msgelem to 512, wrong size, type=%d,len=%d",type,len); len=512; } diff --git a/src/capwap/wtpinfo_readelem_wtp_radio_info.c b/src/capwap/wtpinfo_readelem_wtp_radio_info.c index edf25122..a380e257 100644 --- a/src/capwap/wtpinfo_readelem_wtp_radio_info.c +++ b/src/capwap/wtpinfo_readelem_wtp_radio_info.c @@ -30,7 +30,7 @@ int wtpinfo_readelem_wtp_radio_info(struct wtpinfo * wtpinfo,int type,uint8_t *m return 0; if (len!=5){ - cw_log_debug0("Discarding msgelem WTP_RADIO_INFO, wrong size, len=%d\n",len); + cw_dbg(DBG_CW_MSG_ERR,"Discarding msgelem WTP_RADIO_INFO, wrong size, len=%d\n",len); return -1; }