Diff: debug.h

Revision:

119:ee6a53069455

Parent:

117:e9facba9db27

Child:

120:770f00554b1e

--- a/debug.h	Fri Apr 24 13:54:24 2015 +0000
+++ b/debug.h	Thu Apr 30 15:42:41 2015 +0000
@@ -18,11 +18,14 @@
 extern UDPSocket eth_fw_debug;
 extern Endpoint eth_fw_debug_server;
 
-extern char debug_msg1[ 1024+64 ];
+const uint16_t DEBUG_MSG_SIZE = 1024;
+const uint8_t DEBUG_AUX_MSG_SIZE = 64;
+
+extern char debug_msg1[ DEBUG_MSG_SIZE + DEBUG_AUX_MSG_SIZE ];
 ///< Buffer usado na composisão da mensagem enviada pela macro debug_msg
-extern char debug_msg2[ 1024 ];
+extern char debug_msg2[ DEBUG_MSG_SIZE ];
 ///< Buffer usado na composisão da mensagem enviada pela macro debug_msg
-extern char msg_[ 1024 ];
+extern char msg_[ DEBUG_MSG_SIZE ];
 ///< Buffer utilizado pela macro send_msg
 
 extern bool cb_session;
@@ -34,6 +37,23 @@
 extern bool main_test;
 ///< Variável de controle para acionamento de algum comando de interesse.
 
+extern bool sizes;
+
+extern bool debug_reconnect;
+extern uint16_t miss_debug_fw_send_pkg;
+extern uint16_t miss_sip_registry_send_pkg;
+extern uint16_t miss_sip_invite_send_pkg;
+extern uint16_t miss_sip_bye_send_pkg;
+extern uint16_t miss_sip_unregistry_send_pkg;
+extern uint16_t miss_sip_ok_send_pkg;
+extern uint16_t miss_sip_rcv_bye_send_pkg;
+extern uint16_t miss_wdt_send_pkg;
+extern uint16_t miss_sip_inc_pkg;
+extern uint16_t miss_udp_prompt_send_pkg;
+extern uint16_t miss_closk_send_pkg;
+
+extern bool show_uptime;
+
 extern bool debug_sip;
 ///< Variável de controle que ativa o debug sip.
 extern bool debug_prompt;
@@ -50,8 +70,6 @@
 ///< Variável de controle que ativa o debug dos pacotes recebidos do CBx.
 extern bool debug_cb_tx;
 ///< Variável de controle que ativa o debug dos pacotes enviados para o CBx.
-extern bool debug_cb_tx;
-///< Variável de controle que ativa o debug dos pacotes enviados para o CBx.
 extern bool debug_eth_rx;
 ///< Variável de controle que ativa o debug dos pacotes recebidos da eth \note não implementado.
 extern bool debug_eth_tx;
@@ -70,11 +88,12 @@
 extern bool debug_aging;
 ///< Variável de controle que ativa o debug da funçao de aging do registro.
 
+extern bool debug_clock;
 extern bool debug_invite;
 extern bool debug_wake;
 extern bool debug_muted;
-
 extern bool debug_cpld;
+extern bool debug_show_cpld;
 extern bool debug_cks_err;
 extern bool debug_ping;
 extern bool debug_refresh;
@@ -85,17 +104,23 @@
 extern bool wdt_show;
 extern bool debug_rtp;
 extern bool debug_memory;
-//extern bool debug_registry_rcv;
 extern bool debug_port_match;
 extern bool debug_fw;
+extern bool debug_gp;
+extern bool missed_send_udp_pkg;
 
 extern bool debug_boot;
 extern bool debug_fw_print;
 extern bool debug_uart3;
 extern bool big_bug_pkg;
 extern bool flood_bug_pkg;
+extern uint16_t miss_ftp_udp_send_pkg;
+extern bool reset_missed_send_udp_pkg;
+extern bool debug_missed;
+extern uint16_t deleted_sip;
 extern bool dshow_rtp;
 extern bool dcallshow_rtp;
+extern bool debug_reset_rtp;
 extern bool debug_rtp;
 extern uint16_t deleted_sip;
 extern bool print_values;
@@ -134,11 +159,18 @@
 extern bool drop_ack_pkg;
 extern bool drop_rtp_from_ast_pkg;
 extern bool drop_rtp_from_cbx_pkg;
+extern bool drop_registry_pkg;
 extern bool cogumelo;
 extern bool gnomo;
 extern bool registra;
+extern bool received_audio_from_cb;
+extern bool debug_reconnect;
+extern uint16_t miss_ftp_udp_send_pkg;
 extern bool debug_bootloader;
-
+extern bool debug_bind;
+extern bool debug_app_init;
+extern bool debug_string_length;
+extern bool show_current_time;
 /**
  * @Synopsis Função usada anteriormente para formatação da string que debug, não esta mais em uso.
  *
@@ -148,6 +180,7 @@
  */
 int eth_fw_debug_pkgdebug_pkg( uint8_t * pkg, int size );
 
+/*
 #define debug_msg(...) _debug_msg(__VA_ARGS__)
 #define _debug_msg(...) { \
   sprintf(debug_msg1, "%s:%d ", __FILE__, __LINE__); \
@@ -161,16 +194,46 @@
     udp_server.sendTo( udp_client, debug_msg1, strlen( debug_msg1 ) ); \
   } \
 }
-
+*/
+#define debug_msg(...) _debug_msg(__VA_ARGS__)
+#define _debug_msg(...) { \
+  snprintf( debug_msg1, DEBUG_AUX_MSG_SIZE, "%s:%d ", __FILE__, __LINE__); \
+  snprintf( debug_msg2, DEBUG_MSG_SIZE, __VA_ARGS__); \
+  strncat( debug_msg1, debug_msg2, DEBUG_MSG_SIZE ); \
+  if( debug_uart3  && !udp_query && !from_eth  ) pc.printf( "%s\n\r> ", debug_msg1 ); \
+  if( tcp_session && !udp_query ){ \
+    strcat( debug_msg1, "\n\r" ); \
+    while( !( tcp_client.send_all( debug_msg1, strlen( debug_msg1 ) ) ) ); \
+  } \
+  if( udp_query ){ \
+    strcat( debug_msg1, "\n\r" ); \
+    int send = udp_client.sendTo( udp_server, debug_msg1, strlen( debug_msg1 ) ); \
+    if( send != strlen( debug_msg1 ) ) \
+    { \
+        if( debug_reconnect && debug_uart3 && !from_eth ) pc.printf("\r\nReconnect udp_query client"); \
+        reconnect_prompt_udp_socket(); \
+        miss_prompt_udp_send_pkg++; \
+    } \
+  } \
+}
 #define send_msg(...) _send_msg(__VA_ARGS__)
 #define _send_msg(...) { \
-  sprintf( msg_, __VA_ARGS__); \
-  if( debug_uart3 ) pc.printf( "%s\n\r> ", msg_ ); \
-  if( tcp_session ){ \
+  int snprintf_ret = snprintf( msg_, DEBUG_MSG_SIZE, __VA_ARGS__ ); \
+  if( snprintf_ret >= DEBUG_MSG_SIZE ) string_msg_overflow++; \
+  if( debug_uart3 && !udp_query && !from_eth ) pc.printf( "%s\n\r> ", msg_ ); \
+  if( tcp_session && !udp_query ){ \
     strcat( msg_, "\n\r> " ); \
     while( !( tcp_client.send_all( msg_, strlen( msg_ ) ) ) ); \
-  }else if( udp_request ){ \
-    udp_server.sendTo( udp_client, debug_msg1, strlen( debug_msg1 ) ); \
+  } \
+  if( udp_query ){ \
+    strcat( msg_, "\n\r> " ); \
+    int send = udp_client.sendTo( udp_server, msg_, strlen( msg_ ) ); \
+    if( send != strlen( msg_ ) ) \
+    { \
+        if( debug_reconnect && debug_uart3 ) pc.printf ("\n\rReconnect udp_query client\n\r"); \
+        reconnect_prompt_udp_socket(); \
+        miss_prompt_udp_send_pkg++; \
+    } \
   } \
 }