|
|
|
|
@ -86,7 +86,7 @@ static int router_send_one_flags(struct ETCP_ROUTER_CONN* rconn, const uint8_t*
|
|
|
|
|
queue_entry_free(entry); queue_dgram_free(entry); if (!seq_flags) rconn->tx_seq--; return -1; |
|
|
|
|
} |
|
|
|
|
rconn->last_dgram_ts = get_current_timestamp(); |
|
|
|
|
DEBUG_DEBUG(DEBUG_CATEGORY_ETCPROUTE, "ETCP_SEND: svc_id=%u seq=%u len=%zu inflight=%d → %016llx", |
|
|
|
|
DEBUG_TRACE(DEBUG_CATEGORY_ETCPROUTE, "ETCP_SEND: svc_id=%u seq=%u len=%zu inflight=%d → %016llx", |
|
|
|
|
rconn->svc_id, seq, pl_len, |
|
|
|
|
(int32_t)(rconn->tx_seq - rconn->tx_acked), |
|
|
|
|
(unsigned long long)rconn->remote_node_id); |
|
|
|
|
@ -238,7 +238,7 @@ static void router_send_ack(struct ETCP_ROUTER_CONN* rconn) {
|
|
|
|
|
entry->dgram = (uint8_t*)hdr; |
|
|
|
|
entry->len = SVC_ROUTE_HDR_SIZE; |
|
|
|
|
|
|
|
|
|
DEBUG_DEBUG(DEBUG_CATEGORY_ETCPROUTE, "ACK_SEND: svc_id=%u rx_seq=%u → %016llx", |
|
|
|
|
DEBUG_TRACE(DEBUG_CATEGORY_ETCPROUTE, "ACK_SEND: svc_id=%u rx_seq=%u → %016llx", |
|
|
|
|
rconn->svc_id, rconn->rx_seq, (unsigned long long)rconn->remote_node_id); |
|
|
|
|
etcp_send(conn, entry); |
|
|
|
|
} |
|
|
|
|
@ -339,7 +339,7 @@ static void etcp_router_recv_cb(struct ETCP_CONN* conn, struct ll_entry* entry)
|
|
|
|
|
size_t pl_len = entry->len - SVC_ROUTE_HDR_SIZE; |
|
|
|
|
uint8_t* pl = entry->dgram + SVC_ROUTE_HDR_SIZE; |
|
|
|
|
|
|
|
|
|
DEBUG_DEBUG(DEBUG_CATEGORY_ETCPROUTE, "ETCP_RECV: svc_id=%u seq=%u len=%zu from %016llx", |
|
|
|
|
DEBUG_TRACE(DEBUG_CATEGORY_ETCPROUTE, "ETCP_RECV: svc_id=%u seq=%u len=%zu from %016llx", |
|
|
|
|
hdr->svc_id, hdr->seq, pl_len, (unsigned long long)hdr->src_node_id); |
|
|
|
|
|
|
|
|
|
if (hdr->dst_node_id == inst->node_id) { |
|
|
|
|
@ -435,7 +435,7 @@ static void etcp_router_recv_cb(struct ETCP_CONN* conn, struct ll_entry* entry)
|
|
|
|
|
qe->len = pl_len; |
|
|
|
|
memcpy(qe->dgram, pl, pl_len); |
|
|
|
|
|
|
|
|
|
DEBUG_DEBUG(DEBUG_CATEGORY_ETCPROUTE, "router: queued seq=%u rx_seq=%u recv_q=%d from %016llx svc_id=%u", |
|
|
|
|
DEBUG_TRACE(DEBUG_CATEGORY_ETCPROUTE, "router: queued seq=%u rx_seq=%u recv_q=%d from %016llx svc_id=%u", |
|
|
|
|
seq, rconn->rx_seq, queue_entry_count(rconn->recv_q), |
|
|
|
|
(unsigned long long)hdr->src_node_id, rconn->svc_id); |
|
|
|
|
queue_data_put_with_index(rconn->recv_q, qe); |
|
|
|
|
|