Diff: main_app_functions.cpp

Revision:

122:480c44b0e205

Parent:

121:ee02790d00b7

Child:

123:1d395b5a4cad

--- a/main_app_functions.cpp	Fri May 08 04:15:23 2015 +0000
+++ b/main_app_functions.cpp	Mon May 11 15:16:36 2015 +0000
@@ -7,11 +7,11 @@
  
     send_msg ( "" );
  
-    if ( debug_app_init ) send_msg ( "init_wdt() :: %s", ( init_wdt() == 0 ) ? "Ok" : "Failure" );
+    if ( debug_app_init ) send_msg ( "init_wdt() :: %s", ( init_wdt () == 0 ) ? "Ok" : "Failure" );
     
-    if ( debug_app_init ) send_msg ( "config_lpc() :: %s", ( config_lpc() == 0 ) ? "Ok" : "Failure" );
+    if ( debug_app_init ) send_msg ( "config_lpc() :: %s", ( config_lpc () == 0 ) ? "Ok" : "Failure" );
     
-    if ( debug_app_init ) send_msg ( "start_cpld() :: %s", ( start_cpld() == 0 ) ? "Ok" : "Failure" );
+    if ( debug_app_init ) send_msg ( "start_cpld() :: %s", ( start_cpld () == 0 ) ? "Ok" : "Failure" );
     
     if( sdram_init() == 1 ) {
         send_msg("******* Failed to initialize SDRAM *******");
@@ -50,7 +50,7 @@
         
         if ( debug_app_init ) send_msg ( "init_prompt_eth() :: %s", ( init_prompt_eth_ret == ( BIT0 | BIT1 ) ) ? "Ok" : "Failure" );
         
-        if ( debug_app_init ) send_msg ( "init_external_wdt() :: %s", ( init_external_wdt() == 0 ) ? "Ok" : "Failure" );
+        if ( debug_app_init ) send_msg ( "init_external_wdt() :: %s", ( init_external_wdt () == 0 ) ? "Ok" : "Failure" );
         
         if ( debug_app_init ) send_msg ( "init_bl() :: %s", ( init_bl() == 0 ) ? "Ok" : "Failure" );
         
@@ -477,13 +477,14 @@
 
 int show_cb_sip ( Vector * v_cb )
 {
-    send_msg(":: Sip :: %u", v_cb->size() );
-    for( register uint8_t i = 0; i < v_cb->size(); i++ ) {
-        Call_Box * cb = ( Call_Box * )v_cb->get_element( i );
+    send_msg(":: Sip :: %u", v_cb -> size () );
+    for ( register uint8_t i = 0; i < v_cb -> size (); i++ )
+    {
+        Call_Box * cb = ( Call_Box * ) v_cb -> get_element ( i );
         
         send_msg (
-            "ext :: %d -- port :: %d -- timer %d [%s] ", 
-            cb -> get_sip_ext(), 
+            "ext :: %d -- port :: %d -- timer %d [ %s ] ", 
+            cb -> get_sip_ext (), 
             cb -> get_sip_port (), 
             cb -> get_timer (), 
             ( cb -> get_overflow_flag () ) ? "Overflow" : "Ok"
@@ -716,12 +717,18 @@
         } 
         
         // verifica o socket do watchdog
-        if( FD_ISSET( udp_wdt_client.get_fd(), &fdSet ) ) {
-            char wake_msg[ 768 ];
+        if( FD_ISSET ( udp_wdt_client.get_fd(), &fdSet ) ) {
+            const uint16_t WAKE_MSG_SIZE = 768;
+            static char wake_msg [ WAKE_MSG_SIZE ];
+            
+            for ( register uint16_t i = 0; i < WAKE_MSG_SIZE; i ++ ) wake_msg [ i ] = 0;
+            
             Endpoint udp_wdt_server;
             
             int wake_msg_rcv = udp_wdt_client.receiveFrom( udp_wdt_server, wake_msg, sizeof( wake_msg ) );
             
+            if ( dmissed_wdt ) debug_msg("wake_msg_rcv :: %d -- wake_msg :: %s", wake_msg_rcv, wake_msg );
+            
             if( wake_msg_rcv == -1 )
             {
                 if( debug_reconnect ) send_msg("Reconnect Extern wdt");
@@ -737,7 +744,9 @@
                     bool question_alive = ( wake_msg[ 5 ] == '?' );
                     if( wake_msg[ 5 ] == '*' ) wdt.kick();
                     
-                    snprintf( wake_msg, ( 768 - 1 ),"wdt:%u,%u,%u,%c,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u:", 
+                    if ( dmissed_wdt ) if ( wake_msg [ 5 ] == '?' ) debug_msg("Recebi o alive ???");
+                    
+                    snprintf( wake_msg, WAKE_MSG_SIZE - 1,"wdt:%u,%u,%u,%c,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u:", 
                         uptime, 
                         invite_counter, 
                         external_wdt, 
@@ -771,19 +780,23 @@
                         miss_prompt_udp_rcv_pkg,
                         miss_closk_send_pkg
                     );
-    
-                    wake_msg[ 768 - 1 ] = 0;
-                    int send = udp_wdt_client.sendTo( udp_wdt_server, wake_msg, strlen( wake_msg ) );
+                    wake_msg[ WAKE_MSG_SIZE - 1 ] = 0;
+                    
+                    int send = udp_wdt_client.sendTo ( udp_wdt_server, wake_msg, strlen( wake_msg ) );
                     if( send != strlen( wake_msg ) )
                     {
                         if( debug_reconnect ) debug_msg("Reconnect Extern wdt (%d, %d)", send, strlen( wake_msg ) );
-                        reconnect_extern_wdt_socket();
+                        reconnect_extern_wdt_socket ();
                         miss_wdt_send_pkg++;
                     }
 
                     if( ( (!question_alive) && ( cb_new_counter <= MAX_CB_IN_A_BRANCH ) && ( cb_new_counter >= 2 ) ) ) {
                         external_wdt = EXTERN_WDT_IDLE;
+                        if ( dmissed_wdt ) debug_msg("kickando");
                     }
+                    
+                    if ( dmissed_wdt ) debug_msg("Mandei send = %d[::%s::] to [%s:%i]", send, wake_msg, udp_wdt_server.get_address (), udp_wdt_server.get_port () );
+                    
                 } else if( !( strncmp( wake_msg, "reset", 5 ) ) ) {
                     external_wdt = 0;
 
@@ -1804,17 +1817,18 @@
             
     current_time++;
 
-    if( wdt_show ) debug_wdt = true;
+    if ( wdt_show ) debug_wdt = true;
 
-    if( external_wdt ) external_wdt--;
-    if( pkg_wdt ) pkg_wdt--;
-    if( eth_wdt ) eth_wdt--;
+    if ( external_wdt ) external_wdt--;
+    if ( pkg_wdt ) pkg_wdt--;
+    if ( eth_wdt ) eth_wdt--;
 
-    if( eth_wdt && external_wdt && pkg_wdt ){
+    if ( eth_wdt && external_wdt && pkg_wdt ){
         wdt.kick();
+        return ( 0 );
     }
     
-    return ( 0 );
+    return ( 1 );
 }
 
 int check_for_unwanted_rtp_ports ( Vector * v_cb )