Module: sems Branch: master Commit: f09bf23ae2eea2c22ffd57f7556087b5b08f22a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=f09bf23ae2eea2c22ffd57f7556087b5b08f22a4
Author: Raphael Coeffic <[email protected]> Committer: Raphael Coeffic <[email protected]> Date: Fri Feb 3 18:19:35 2012 +0100 core: moved log_raw_messages to trsp_socket::log_level_raw_msgs. --- core/SipCtrlInterface.cpp | 13 ++++++------- core/SipCtrlInterface.h | 1 - core/sip/transport.cpp | 7 ++++--- core/sip/transport.h | 3 +++ core/sip/udp_trsp.cpp | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/core/SipCtrlInterface.cpp b/core/SipCtrlInterface.cpp index 18d5c4e..11c3a32 100644 --- a/core/SipCtrlInterface.cpp +++ b/core/SipCtrlInterface.cpp @@ -55,7 +55,6 @@ #include "AmEventDispatcher.h" #include "AmSipEvent.h" -int SipCtrlInterface::log_raw_messages = 3; bool SipCtrlInterface::log_parsed_messages = true; int SipCtrlInterface::udp_rcvbuf = -1; @@ -82,14 +81,14 @@ int SipCtrlInterface::load() if (cfg.hasParameter("log_raw_messages")) { string msglog = cfg.getParameter("log_raw_messages"); - if (msglog == "no") log_raw_messages = -1; - else if (msglog == "error") log_raw_messages = 0; - else if (msglog == "warn") log_raw_messages = 1; - else if (msglog == "info") log_raw_messages = 2; - else if (msglog == "debug") log_raw_messages = 3; + if (msglog == "no") trsp_socket::log_level_raw_msgs = -1; + else if (msglog == "error") trsp_socket::log_level_raw_msgs = L_ERR; + else if (msglog == "warn") trsp_socket::log_level_raw_msgs = L_WARN; + else if (msglog == "info") trsp_socket::log_level_raw_msgs = L_INFO; + else if (msglog == "debug") trsp_socket::log_level_raw_msgs = L_DBG; } DBG("log_raw_messages level = %d\n", - log_raw_messages); + trsp_socket::log_level_raw_msgs); if (cfg.hasParameter("log_parsed_messages")) { log_parsed_messages = cfg.getParameter("log_parsed_messages")=="yes"; diff --git a/core/SipCtrlInterface.h b/core/SipCtrlInterface.h index 9c2bd8e..1b96070 100644 --- a/core/SipCtrlInterface.h +++ b/core/SipCtrlInterface.h @@ -72,7 +72,6 @@ public: static string outbound_host; static unsigned int outbound_port; static bool log_parsed_messages; - static int log_raw_messages; static int udp_rcvbuf; SipCtrlInterface(); diff --git a/core/sip/transport.cpp b/core/sip/transport.cpp index b773030..62aa1d0 100644 --- a/core/sip/transport.cpp +++ b/core/sip/transport.cpp @@ -34,6 +34,8 @@ #include <netinet/in.h> #include <string.h> // memset, strerror, ... +int trsp_socket::log_level_raw_msgs = L_DBG; + trsp_socket::trsp_socket(unsigned short if_num) : sd(0), ip(), port(0), if_num(if_num) { @@ -97,9 +99,8 @@ unsigned short trsp_socket::get_if() int trsp_socket::send(const sockaddr_storage* sa, const char* msg, const int msg_len) { - if ((SipCtrlInterface::log_raw_messages >= 0) - && (SipCtrlInterface::log_raw_messages <= log_level)) { - _LOG(SipCtrlInterface::log_raw_messages, + if (log_level_raw_msgs >= 0) { + _LOG(log_level_raw_msgs, "send msg\n--++--\n%.*s--++--\n", msg_len, msg); } diff --git a/core/sip/transport.h b/core/sip/transport.h index 6b9f14f..817a23e 100644 --- a/core/sip/transport.h +++ b/core/sip/transport.h @@ -43,6 +43,9 @@ using std::string; class trsp_socket { +public: + static int log_level_raw_msgs; + protected: // socket descriptor int sd; diff --git a/core/sip/udp_trsp.cpp b/core/sip/udp_trsp.cpp index d81bb41..56e9e9b 100644 --- a/core/sip/udp_trsp.cpp +++ b/core/sip/udp_trsp.cpp @@ -207,8 +207,8 @@ void udp_trsp::run() } sip_msg* s_msg = new sip_msg(buf,buf_len); - if (SipCtrlInterface::log_raw_messages >= 0) { - _LOG(SipCtrlInterface::log_raw_messages, + if (trsp_socket::log_level_raw_msgs >= 0) { + _LOG(trsp_socket::log_level_raw_msgs, "vv M [|] u recvd msg via UDP vv\n--++--\n%.*s--++--\n", s_msg->len, s_msg->buf); } _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
