Diff: prompt.cpp

Revision:

74:81c47fff88a5

Parent:

72:895ca792c647

Child:

75:bd3c647b860b

--- a/prompt.cpp	Wed Nov 19 14:06:13 2014 +0000
+++ b/prompt.cpp	Mon Nov 24 16:43:16 2014 +0000
@@ -1,57 +1,8 @@
 #include "prompt.h"
-#include "utils.h"
-
-TCPSocketServer tcp_server;
-TCPSocketConnection tcp_client;
-Timer tcp_timer;
-Timer udp_timer;
 
-UDPSocket udp_server;
-Endpoint udp_client;
-                    
-uint8_t debug_alive = 0;
-uint8_t debug_sip = 0;
-uint8_t debug_vector = 0;
-uint8_t debug_cb = 0;
-uint8_t debug_main = 0;
-uint8_t debug_cks = 0;
-uint8_t pcks_s = 0;
-uint8_t pshowcb = 0;
-uint8_t debug_cb_rx = 0;
-uint8_t debug_cb_tx = 0;
-uint8_t debug_eth_rx = 0;
-uint8_t debug_eth_tx = 0;
-uint8_t debug_prompt_eth = 0;
-uint8_t debug_file = 0;
-bool dparallel = false;
-bool dbl = false;
-bool from_eth = false;
-bool udp_request = false;
-bool tcp_session = false;
-bool cb_session = false;
-bool cb_status = false;
-bool reset_cks = false;
-bool debug_telemetry = false;
-bool main_test = false;
 bool flood_silence = false;
-bool list = false;
-bool r_stats;
-bool rx = false;
-bool tx = false;
-bool stats = false;
 bool delayed_flood = false;
 
-uint16_t boot_counter = 0; 
-uint16_t registry_counter = 0; 
-uint16_t invite_counter = 0; 
-uint16_t audio_counter = 0; 
-uint16_t telemetry_counter = 0; 
-uint16_t cb_bye_counter = 0; 
-uint16_t prompt_counter = 0; 
-uint16_t flood_counter = 0; 
-uint16_t bootloader_cbx_counter = 0;
-
-uint8_t test_debug = 1;
 #define PVERSION 5          // Sempre atualizar a versao do prompt
 
 char __debug_buf__[ DEBUGBUFSIZE ];
@@ -644,7 +595,7 @@
             cmd[ str_end + 1 ] = 0x00;
             
             int port = convert_ext_to_port( ext_count );
-            __send_to_cb__( __build_cb_package__( ext_count, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
+            send2callboxes( __build_cb_package__( ext_count, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
             pc.printf("\r\nSilence sent to ext=%d port=%d", ext_count, port );
             
             if( tcp_session ){ 
@@ -1126,8 +1077,9 @@
             
             ref = debug_buf;
             
-            debug_buf[ strlen( debug_buf ) ] = 0x0D;
-            debug_buf[ strlen( debug_buf ) + 1 ] = 0x00;
+            //debug_buf[ strlen( debug_buf ) ] = 0x0D;
+            strcat( debug_buf, "\r" );
+            //debug_buf[ strlen( debug_buf ) + 1 ] = 0x00;
             
             split = strtok( debug_buf + 4, " " );
             ext = atoi( split );
@@ -1139,13 +1091,14 @@
             promptcb_last_ext = ext;
             promptcb_last_port = port;
             
-            int tmp = strlen( cmd );
-            cmd[ tmp ] = 0x0D;
-            cmd[ tmp + 1 ] = 0x00;
+            //int tmp = strlen( cmd );
+            //cmd[ tmp ] = 0x0D;
+            //cmd[ tmp + 1 ] = 0x00;
             strcpy( promptcb_last_cmd, cmd );
+            //strcat( cmd, "\r\r\r" );
             
             pc.printf("\r\next=%d port=%d\r\ncmd=%s\r\n", ext, port, cmd );
-            __send_to_cb__( __build_cb_package__( ext, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
+            send2callboxes( __build_cb_package__( ext, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
             pc.printf("\n\rComando enviado\n\r");
             
             if( from_eth ){
@@ -1171,7 +1124,7 @@
             debug_buf[ bufptr++ ] = 0x00;
 
             pc.printf("\r\next=%d port=%d\r\ncmd=%s\r\n",promptcb_last_ext, promptcb_last_port, debug_buf + 4 );
-            __send_to_cb__( __build_cb_package__( promptcb_last_ext, promptcb_last_port, __PROMPT__, debug_buf + 4, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
+            send2callboxes( __build_cb_package__( promptcb_last_ext, promptcb_last_port, __PROMPT__, debug_buf + 4, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
             pc.printf("\n\rComando enviado\n\r");
         }
 
@@ -1581,7 +1534,7 @@
             pc.printf("\n\r--------------------------------------------------------\n\r");
             for( uint16_t i = 0; i < strlen( cmd ) ; i++ ) pc.printf( "%02x ", cmd[ i ] );
             
-            __send_to_cb__( __build_cb_package__( ext, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
+            send2callboxes( __build_cb_package__( ext, port, __PROMPT__, cmd, id_msg++, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
             pc.printf("\n\r--------------------------------------------------------\n\r");
             for( uint16_t i = 0; i < 300 ; i++ ){
                 pc.printf( "%02x ", write_buffer[ i ] );
@@ -1649,18 +1602,6 @@
         pc.printf("> ");
     }    
     return( NULL );
-}
-
-int convert_ext_to_port( int ext ){
-  if( ext < 1000 ) return ext;
-  
-  else{
-      int aux = 0;
-      aux = ( ext / 1000 ) * 1000;
-      ext -= aux;
-      aux += ext % 100;
-      return( aux );
-  }
 } 
 
 void set_ip( char * new_header_ip ){