Diff: main.cpp

Revision:

98:43b45f26b430

Parent:

97:8985817e8847

Child:

99:e80850c51106

--- a/main.cpp	Sat Jan 10 23:59:51 2015 +0000
+++ b/main.cpp	Sun Jan 11 03:30:47 2015 +0000
@@ -215,7 +215,7 @@
 
         if( stats ) {
             char str[ 200 ];
-            snprintf( str, 200, "\n\rReceived Pkgs::\n\r Boot :: %u\n\r Registry :: %u\n\r Ivite :: %u\n\r Audio :: %u\n\r Telemetry :: %u\n\r Cb_bye :: %u\n\r Prompt :: %u\n\r Flood :: %u\n\r Bootloader_cbx :: %u\n\r",
+            snprintf( str, 200, "\n\rReceived Pkgs::\n\r Boot :: %u\n\r Registry :: %u\n\r Invite :: %u\n\r Audio :: %u\n\r Telemetry :: %u\n\r Cb_bye :: %u\n\r Prompt :: %u\n\r Flood :: %u\n\r Bootloader_cbx :: %u\n\r",
                       boot_counter, registry_counter, invite_counter, audio_counter, telemetry_counter, cb_bye_counter, prompt_counter, flood_counter, bootloader_cbx_counter );
             send_msg( str );
             stats =false;
@@ -367,6 +367,7 @@
                 char aux[ 16 ];
                 strcpy( cbx_to_string, "Ext :: " );
                 itoa( cb->get_ext(), aux , 10 );
+                strcat( cbx_to_string, aux );
                 strcat( cbx_to_string, " :: Port :: " );
                 itoa( cb->get_port(), aux , 10 );
                 strcat( cbx_to_string, aux );
@@ -406,7 +407,30 @@
             status = __WAITING__;
             missed_pkg--;
             xmemcpy( buffer, cb_rx_buffer, __CB_BUFFER_SIZE__ );
-
+            
+            /*
+            {
+              uint16_t e, p;
+              e = buffer[0];
+              e <<= 8;
+              e |= buffer[1];
+              p = buffer[2];
+              p <<= 8;
+              p |= buffer[3];
+              //if (e != (p+100)) {
+              if( ( buffer[0] == 0x14 ) && ( buffer[1] == 0x0a ) ) {
+                int i;
+                char s[400], ss[4];;
+                strcpy(s,"OPS-PKG:");
+                for (i=0; i<40; i++) {
+                  sprintf(ss," %02x",buffer[i]);
+                  strcat(s,ss);
+                }
+                debug_msg( s );
+              }
+            }
+            */
+            
             if( debug_cpld ) {
                 rx = true;
                 tx = true;
@@ -566,7 +590,7 @@
                             bool question_alive = ( wake_msg[ 5 ] == '?' );
                             if( wake_msg[ 5 ] == '*' ) wdt.kick();
         
-                            snprintf( wake_msg, 48,"wdt:%u,%u,%u,%c,%u,%u,%u,%u:", uptime, invite_counter, external_wdt, ( wdt.WatchdogCausedReset() ) ? '1' : '0', cb_new_counter, v_call->size(), ts->remain_timeslices(), sip_socket_send_failure );
+                            snprintf( wake_msg, 48,"wdt:%u,%u,%u,%c,%u,%u,%u,%u,%u:", uptime, invite_counter, external_wdt, ( wdt.WatchdogCausedReset() ) ? '1' : '0', cb_new_counter, v_cb->size(), ts->remain_timeslices(), sip_socket_send_failure, v_call->size() );
                             wake_msg[ 768 - 1 ] = 0;
                             udp_wdt_client.sendTo( udp_wdt_server, wake_msg, strlen( wake_msg ) );
         
@@ -745,6 +769,7 @@
             }
             break;
             case __TELEMETRY__ : {
+                /*
                 Call_Box * cb = __find_CB__( v_cb, ext );
 
                 if( cb == NULL ) {
@@ -761,10 +786,11 @@
                         if( debug_main ) debug_msg("Added CBx -- %d", ext );
                     }
                 }
+                
                 if( cb != NULL ){
                     cb->registry();
                 }
-
+                */
                 telemetry_counter++;
                 if( debug_telemetry ) send_msg("::Telemetry from %d - %d::", ext, port );
                 build_telemetry_report( ext, port, ( char *)data );