@ -973,7 +973,7 @@ int etcp_encrypt_send(struct ETCP_DGRAM* dgram) {
socket_get_error ( ) , sockaddr_storage_to_str ( addr ) . str , dgram - > link - > conn - > fd ) ;
socket_get_error ( ) , sockaddr_storage_to_str ( addr ) . str , dgram - > link - > conn - > fd ) ;
dgram - > link - > send_errors + + ; errcode = 4 ; goto es_err ;
dgram - > link - > send_errors + + ; errcode = 4 ; goto es_err ;
} else {
} else {
DEBUG_DEBUG ( DEBUG_CATEGORY_DEBUG , " ETCP SEND %zd bytes to %s fd=%d ne_len=%d " , sent ,
DEBUG_TRACE ( DEBUG_CATEGORY_DEBUG , " ETCP SEND %zd bytes to %s fd=%d ne_len=%d " , sent ,
sockaddr_storage_to_str ( addr ) . str , dgram - > link - > conn - > fd , dgram - > noencrypt_len ) ;
sockaddr_storage_to_str ( addr ) . str , dgram - > link - > conn - > fd , dgram - > noencrypt_len ) ;
}
}
return ( int ) sent ;
return ( int ) sent ;
@ -1544,7 +1544,7 @@ void etcp_connections_read_callback_socket(socket_t sock, void* arg) {
int errorcode = 0 ;
int errorcode = 0 ;
struct ETCP_LINK * link = etcp_link_find_by_addr ( e_sock , & addr ) ;
struct ETCP_LINK * link = etcp_link_find_by_addr ( e_sock , & addr ) ;
DEBUG_DEBUG ( DEBUG_CATEGORY_DEBUG , " RECV %zd bytes from %s link=%p session_ready=%d " ,
DEBUG_TRACE ( DEBUG_CATEGORY_DEBUG , " RECV %zd bytes from %s link=%p session_ready=%d " ,
recv_len , sockaddr_storage_to_str ( & addr ) . str , link ,
recv_len , sockaddr_storage_to_str ( & addr ) . str , link ,
link & & link - > etcp ? link - > etcp - > crypto_ctx . session_ready : - 1 ) ;
link & & link - > etcp ? link - > etcp - > crypto_ctx . session_ready : - 1 ) ;
@ -1557,10 +1557,10 @@ void etcp_connections_read_callback_socket(socket_t sock, void* arg) {
if ( link ! = NULL & & link - > etcp ! = NULL & & link - > etcp - > crypto_ctx . session_ready ) {
if ( link ! = NULL & & link - > etcp ! = NULL & & link - > etcp - > crypto_ctx . session_ready ) {
sc_status_t dec_rc = sc_decrypt ( & link - > etcp - > crypto_ctx , data , recv_len , ( uint8_t * ) & pkt - > timestamp , & pkt_len ) ;
sc_status_t dec_rc = sc_decrypt ( & link - > etcp - > crypto_ctx , data , recv_len , ( uint8_t * ) & pkt - > timestamp , & pkt_len ) ;
if ( ! dec_rc ) {
if ( ! dec_rc ) {
DEBUG_DEBUG ( DEBUG_CATEGORY_DEBUG , " DECRYPT OK link=%p log=%s " , link , link - > etcp - > log_name ) ;
DEBUG_TRACE ( DEBUG_CATEGORY_DEBUG , " DECRYPT OK link=%p log=%s " , link , link - > etcp - > log_name ) ;
goto process_decrypted ;
goto process_decrypted ;
}
}
DEBUG_WARN ( DEBUG_CATEGORY_DEBUG , " DECRYPT FAIL link=%p log=%s rc=%d — trying init decrypt " , link , link - > etcp - > log_name , dec_rc ) ;
DEBUG_DEBUG ( DEBUG_CATEGORY_DEBUG , " DECRYPT FAIL link=%p log=%s rc=%d — trying init decrypt " , link , link - > etcp - > log_name , dec_rc ) ;
} else {
} else {
DEBUG_DEBUG ( DEBUG_CATEGORY_DEBUG , " SKIP normal decrypt: link=%p session_ready=%d — trying init decrypt " ,
DEBUG_DEBUG ( DEBUG_CATEGORY_DEBUG , " SKIP normal decrypt: link=%p session_ready=%d — trying init decrypt " ,
link , link & & link - > etcp ? link - > etcp - > crypto_ctx . session_ready : - 1 ) ;
link , link & & link - > etcp ? link - > etcp - > crypto_ctx . session_ready : - 1 ) ;