Diff: main.cpp

Revision:

13:ae278302dffe

Parent:

12:07fd716e0f35

Child:

14:22a35f575502

--- a/main.cpp	Tue Sep 16 13:21:01 2014 +0000
+++ b/main.cpp	Tue Sep 16 15:09:11 2014 +0000
@@ -30,6 +30,7 @@
     
     /* referencia e inicio da conexao com a ethernet */
     EthernetInterface eth;
+    
     int eth_status = __init_eth__( &eth );
     
     if( eth_status ){
@@ -108,10 +109,7 @@
             data = __parse_cb_buffer__( &ext, &port, &type, buffer );
             
             if( data != NULL ){                
-                if( type == __CB_BYE__ ){
-                    debug_msg( "cbx bye" );
-                }
-                //debug_msg("Procurando pelo CBx :: %d -- Type :: %d", ext, type );
+                debug_msg("Procurando pelo CBx :: %d -- Type :: %d", ext, type );
                 if( type != __AUDIO__ ){
                     Call_Box * cb = __find_CB__( v_cb, ext );
                     if( cb != NULL ){
@@ -138,8 +136,7 @@
             if( t.read() > 5 ){            
                 for( register uint8_t i = 0; i < v_cb->size(); i++ ){
                     Call_Box * cb = ( Call_Box * )v_cb->get_element( i );
-                    /* debug_msg(" Type ::  %d -- Ext :: %d -- TimeSlice :: %d -- remain_timeslices :: %d :: v_call->size() :: %d :: Status :: %d :: SIP Status %d", type , cb->get_ext(), cb->get_timeslice(), ts->remain_timeslices(), v_call->size(), cb->status,  cb->sip->status ); */
-                    debug_msg(" Type ::  %d -- Ext :: %d -- TimeSlice :: %d -- remain_timeslices :: %d :: v_call->size() :: %d :: Status :: %d :: SIP Status -- none", type , cb->get_ext(), cb->get_timeslice(), ts->remain_timeslices(), v_call->size(), cb->status );
+                    debug_msg(" Type ::  %d -- Ext :: %d -- TimeSlice :: %d -- remain_timeslices :: %d :: v_call->size() :: %d :: Status :: %d :: SIP Status %d", type , cb->get_ext(), cb->get_timeslice(), ts->remain_timeslices(), v_call->size(), cb->status, cb->sip->status );
                 }
                 t.reset();
                 led3 = !led3;
@@ -163,18 +160,12 @@
                             ts->return_timeslice( cb->get_timeslice() );
                             cb->set_timeslice( 0x00 );
                             set_status( cb->status, cb_idle );
-                            v_call->remove_element( i );
-                            debug_msg("");
-                            if( cb->sip ) set_status( cb->sip->status, sip_idle );
-                            debug_msg("");
+                            v_call->remove_element( i );    
+                            set_status( cb->sip->status, sip_idle);
                             data[ __TIMESLICE_PLACE__ ] = 0x00;
-                            debug_msg("");
-                            cb->set_msg_id( ( ( cb->get_msg_id() ) + 1 ) & ( BIT7 ^ 0xff ) );
-                            debug_msg("");
                             __send_to_cb__( __build_cb_package__( ext, port, __CB_BYE__,
                                 ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
-                            debug_msg("");
-                            if( cb->sip ) set_status( cb->sip->status, sip_idle );
+                            set_status( cb->sip->status, sip_idle );
                             delete( call );
                         }
                     }
@@ -182,7 +173,7 @@
             }break;
             
             case __INVITE__ : {
-                debug_msg("ok -- invite received");
+                debug_msg("ok -- recebido o invite pelo menos");
                 Call_Box * cb = __find_CB__( v_cb, ext );
                 if( cb == NULL ){
                     debug_msg("Nao encontrado CBx :: %d -- Type :: %d", ext, type );
@@ -191,7 +182,7 @@
                     set_status( cb->status, cb_idle );
                     cb->registry();
                 }
-                cb->reset_elapsed_time();                
+                cb->reset_elapsed_time();
                 if( v_call->size() != 0 ){   
                     data[ 0 ] |= BIT7;
                     cb->set_msg_id( data[ 0 ] );
@@ -227,8 +218,8 @@
                             data[ __TIMESLICE_PLACE__ ] = 0x00;
                             __send_to_cb__( __build_cb_package__( ext, port, __INVITE__, 
                                 ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
-                            if( cb->sip ) set_status( cb->sip->status, sip_idle);
-                            debug_msg( "-- Trying -- Sem TS -- " );
+                            set_status( cb->sip->status, sip_idle);
+                            debug_msg( "-- Trying -- Sem TS -- %s ", write_buffer );
                         }else{
                             set_status(cb->status,cb_busy);
                             data[ __TIMESLICE_PLACE__ ] = cb->get_timeslice();
@@ -247,7 +238,7 @@
                                 debug_msg(" -- %d on %d -- ", cb->get_ext(), data[ __TIMESLICE_PLACE__ ] );
                                 __send_to_cb__( __build_cb_package__( ext, port, __INVITE__, 
                                     ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
-                                debug_msg( "-- Trying -- aceitando pedido de invite -- " );
+                                debug_msg( "-- Trying -- aceitando pedido de invite -- %s ", write_buffer );
                                 //debug_pkg( 300, write_buffer );
                             }else{
                                 set_status( cb->status,cb_idle);
@@ -258,8 +249,7 @@
                                 __send_to_cb__( __build_cb_package__( ext, port, __CB_BYE__, 
                                     ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                                 debug_msg( "-- Trying -- Negando pedido de invite -- %s ", write_buffer );
-                                if( cb-> sip) set_status( cb->sip->status, sip_idle);
-                                debug_msg("");
+                                set_status( cb->sip->status, sip_idle);
                             }
                         }
                     }break;                    
@@ -290,7 +280,7 @@
                     ( char * )data, data[ 0 ], __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                 }break;
             case __TELEMETRY__ : {
-                    debug_msg("Tele");
+                    debug_msg("Leitura da bateria :: ( Id : %x, MSB : %x, LSB : %x )", data[ 0 ], data[ 1 ], data[ 2 ] );
                 }break;
             case __AUDIO__ : {
                 Call_Box * cb;
@@ -311,7 +301,6 @@
                 }
             }break;
         }// fim switch
-        debug_msg("Sai do loop");
         for( register int i = 0; i < v_call->size(); i++ ){
             VZ_call * call = ( VZ_call * )v_call->get_element( i );
             int length = 0;
@@ -331,23 +320,19 @@
                 __send_to_cb__( pkg2cb );
             }
         } 
-        debug_msg("");
-        if( v_call->size() ) registry_aging( v_cb, buffer, write_buffer );
+        //nessa funcao eu deveria me registar a cada 2 min por exemplo
+        registry_aging( v_cb, buffer, write_buffer );
         
-        debug_msg("");
         int ret = sip_manager( v_cb, v_call, write_buffer );
-        debug_msg("--ret::%d", ret );
         if( ret > 0x00 ){
             Call_Box * cb = __find_CB__( v_cb, ret );
             if( cb != NULL ){
-                debug_msg("");
                 if( cb->status == cb_on_call ){
                     ts->return_timeslice( cb->get_timeslice() );
                     cb->set_timeslice( 0x00 );
                     set_status(cb->status,cb_idle);
                     buffer[ __TIMESLICE_PLACE__ ] = 0x00;
                     cb->set_msg_id( ( ( cb->get_msg_id() ) + 1 ) & ( BIT7 ^ 0xff ) );
-                    debug_msg("");
                     for( register uint8_t i = 0; i < v_call->size(); i++ ){
                         VZ_call * call = ( VZ_call * )v_call->get_element( i );
                         if( call->get_cb_ext() == ret ){
@@ -355,15 +340,14 @@
                             delete( call );
                         }
                     }
-                    debug_msg("");
                     __send_to_cb__( __build_cb_package__( ext, port, __CB_BYE__, 
                         ( char * )buffer, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                     cb->reset_sip();
-                    if( cb->sip ) set_status( cb->sip->status, sip_idle );
+                    set_status( cb->sip->status, sip_idle );
                 }
             }else debug_msg("Nao encontrado CBx :: %d -- Type :: %d", ext, type );
         }
-        debug_msg("");
+        
         call_manager( v_call, v_cb, buffer, write_buffer, ts );
         
         static uint8_t flag = 0;
@@ -374,7 +358,7 @@
             if (flag == 1) { flag = 0; }
         }
         /* eu deveria tirar ts que nao constam em chamadas aqui */
-/*         for( register uint8_t i = 0; i < v_cb->size(); i++ ){
+/*        for( register uint8_t i = 0; i < v_cb->size(); i++ ){
             Call_Box * cb = ( Call_Box * )v_cb->get_element( i );
             if( cb->get_timeslice() != 0x00 ){
                 VZ_call * call = __find_Call__( v_call, cb->get_ext() );