@ -46,7 +46,6 @@ struct stcp_link {
struct ll_queue * saved_rx_queue ; // saved rx_queue for pre-closed conn cleanup
struct ll_queue * saved_rx_queue ; // saved rx_queue for pre-closed conn cleanup
uint8_t conn_pre_closed ; // 1 = conn already CLOSED before stcp_link_close
uint8_t conn_pre_closed ; // 1 = conn already CLOSED before stcp_link_close
uint8_t peer_got_initial_pkt ; // received from peer during handshake
uint64_t peer_reset_id ; // received from peer during handshake (reset epoch)
uint64_t peer_reset_id ; // received from peer during handshake (reset epoch)
uint8_t peer_device_type ; // CLIENT_TYPE_* from peer handshake
uint8_t peer_device_type ; // CLIENT_TYPE_* from peer handshake
uint16_t peer_keepalive_interval ; // keepalive interval from peer handshake
uint16_t peer_keepalive_interval ; // keepalive interval from peer handshake
@ -112,7 +111,6 @@ static void server_accept_cb(struct stcp_conn *conn, void *arg) {
link - > ua = ss - > inst - > ua ;
link - > ua = ss - > inst - > ua ;
link - > ready = 1 ;
link - > ready = 1 ;
link - > conn = conn ;
link - > conn = conn ;
link - > peer_got_initial_pkt = conn - > peer_got_initial_pkt ;
link - > peer_reset_id = conn - > peer_reset_id ;
link - > peer_reset_id = conn - > peer_reset_id ;
link - > peer_device_type = conn - > peer_device_type ;
link - > peer_device_type = conn - > peer_device_type ;
link - > peer_keepalive_interval = conn - > peer_keepalive_interval ;
link - > peer_keepalive_interval = conn - > peer_keepalive_interval ;
@ -139,7 +137,6 @@ static void client_ready_cb(struct stcp_conn *conn, void *arg) {
if ( ! conn ) return ;
if ( ! conn ) return ;
link - > ready = 1 ;
link - > ready = 1 ;
link - > conn = conn ;
link - > conn = conn ;
link - > peer_got_initial_pkt = conn - > peer_got_initial_pkt ;
link - > peer_reset_id = conn - > peer_reset_id ;
link - > peer_reset_id = conn - > peer_reset_id ;
link - > peer_device_type = conn - > peer_device_type ;
link - > peer_device_type = conn - > peer_device_type ;
link - > peer_keepalive_interval = conn - > peer_keepalive_interval ;
link - > peer_keepalive_interval = conn - > peer_keepalive_interval ;
@ -157,11 +154,11 @@ static void client_ready_cb(struct stcp_conn *conn, void *arg) {
{
{
const struct sockaddr_storage * ra = link - > etcp_link ? & link - > etcp_link - > remote_addr : NULL ;
const struct sockaddr_storage * ra = link - > etcp_link ? & link - > etcp_link - > remote_addr : NULL ;
DEBUG_INFO ( DEBUG_CATEGORY_ETCP , " stcp_link: client handshake OK [%s] link=%d addr=%s gop=%d rid=%016llx " ,
DEBUG_INFO ( DEBUG_CATEGORY_ETCP , " stcp_link: client handshake OK [%s] link=%d addr=%s rid=%016llx " ,
link - > etcp_conn ? link - > etcp_conn - > log_name : " ? " ,
link - > etcp_conn ? link - > etcp_conn - > log_name : " ? " ,
link - > etcp_link ? link - > etcp_link - > local_link_id : - 1 ,
link - > etcp_link ? link - > etcp_link - > local_link_id : - 1 ,
ra ? sockaddr_storage_to_str ( ra ) . str : " ? " ,
ra ? sockaddr_storage_to_str ( ra ) . str : " ? " ,
link - > peer_got_initial_pkt , ( unsigned long long ) link - > peer_reset_id ) ;
( unsigned long long ) link - > peer_reset_id ) ;
}
}
if ( link - > etcp_link ) etcp_link_enter_ready_tcp ( link - > etcp_link ) ;
if ( link - > etcp_link ) etcp_link_enter_ready_tcp ( link - > etcp_link ) ;
if ( link - > on_ready_cb ) link - > on_ready_cb ( link , link - > ready_arg ) ;
if ( link - > on_ready_cb ) link - > on_ready_cb ( link , link - > ready_arg ) ;
@ -386,10 +383,6 @@ const uint8_t *stcp_link_get_peer_ed25519_pubkey(struct stcp_link *link) {
return link & & link - > conn & & link - > conn - > peer_ed25519_set ? link - > conn - > peer_ed25519_pubkey : NULL ;
return link & & link - > conn & & link - > conn - > peer_ed25519_set ? link - > conn - > peer_ed25519_pubkey : NULL ;
}
}
uint8_t stcp_link_get_peer_got_initial_pkt ( struct stcp_link * link ) {
return link ? link - > peer_got_initial_pkt : 0 ;
}
uint64_t stcp_link_get_peer_reset_id ( struct stcp_link * link ) {
uint64_t stcp_link_get_peer_reset_id ( struct stcp_link * link ) {
return link ? link - > peer_reset_id : 0 ;
return link ? link - > peer_reset_id : 0 ;
}
}