gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update API of manipulation session

Browse Source
This commit is contained in:
luwenpeng
2024-04-01 17:13:26 +08:00
parent 772860c1be
commit a509f0ce3b
32 changed files with 1145 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/tcp_reassembly/tcp_reassembly.cpp
View File

@@ -26,7 +26,7 @@ struct tcp_reassembly
struct rb_root_cached tree_root;
struct list_head list_root;
uint64_t exp_seq;
uint64_t rcv_nxt; // what we want to receive next
};
/******************************************************************************
@@ -116,8 +116,8 @@ void tcp_reassembly_init(struct tcp_reassembly *assy, uint32_t syn_seq)
return;
}
assy->exp_seq = syn_seq + 1;
TCP_REASSEMBLE_DEBUG("reassembler %p init expect seq %lu", assy, assy->exp_seq);
assy->rcv_nxt = syn_seq + 1;
TCP_REASSEMBLE_DEBUG("reassembler %p init expect seq %lu", assy, assy->rcv_nxt);
}
void tcp_reassembly_expire(struct tcp_reassembly *assy, uint64_t now)
@@ -183,11 +183,11 @@ void tcp_reassembly_insert(struct tcp_reassembly *assy, uint32_t offset, const c
return;
}
if (before(offset + len, assy->exp_seq))
if (before(offset + len, assy->rcv_nxt))
{
assy->stat.retrans_bypass_segments++;
assy->stat.retrans_bypass_bytes += len;
TCP_REASSEMBLE_DEBUG("reassembler %p insert [%lu, %lu] failed, less the expect seq %lu", assy, low, high, assy->exp_seq);
TCP_REASSEMBLE_DEBUG("reassembler %p insert [%lu, %lu] failed, less the expect seq %lu", assy, low, high, assy->rcv_nxt);
return;
}
@@ -229,7 +229,7 @@ const char *tcp_reassembly_peek(struct tcp_reassembly *assy, uint32_t *len)
struct segment *seg = NULL;
struct interval_tree_node *tree_node = NULL;
struct interval_tree_node *oldest_node = NULL;
tree_node = interval_tree_iter_first(&assy->tree_root, assy->exp_seq, assy->exp_seq);
tree_node = interval_tree_iter_first(&assy->tree_root, assy->rcv_nxt, assy->rcv_nxt);
while (tree_node)
{
seg = container_of(tree_node, struct segment, tree_node);
@@ -238,7 +238,7 @@ const char *tcp_reassembly_peek(struct tcp_reassembly *assy, uint32_t *len)
id = seg->id;
oldest_node = tree_node;
}
tree_node = interval_tree_iter_next(tree_node, assy->exp_seq, assy->exp_seq);
tree_node = interval_tree_iter_next(tree_node, assy->rcv_nxt, assy->rcv_nxt);
}
if (oldest_node == NULL)
@@ -248,14 +248,14 @@ const char *tcp_reassembly_peek(struct tcp_reassembly *assy, uint32_t *len)
uint64_t payload_len = oldest_node->last - oldest_node->start + 1;
seg = container_of(oldest_node, struct segment, tree_node);
if (oldest_node->start < assy->exp_seq)
if (oldest_node->start < assy->rcv_nxt)
{
uint64_t overlap = assy->exp_seq - oldest_node->start;
uint64_t overlap = assy->rcv_nxt - oldest_node->start;
*len = (uint16_t)(payload_len - overlap);
TCP_REASSEMBLE_DEBUG("reassembler %p peek [%lu, +∞], found segment %p [%lu, %lu] (left overlap: %lu)", assy, assy->exp_seq, seg, oldest_node->start, oldest_node->last, overlap);
TCP_REASSEMBLE_DEBUG("reassembler %p peek [%lu, +∞], found segment %p [%lu, %lu] (left overlap: %lu)", assy, assy->rcv_nxt, seg, oldest_node->start, oldest_node->last, overlap);
return seg->payload + overlap;
}
TCP_REASSEMBLE_DEBUG("reassembler %p peek [%lu, +∞], found segment %p [%lu, %lu]", assy, assy->exp_seq, seg, oldest_node->start, oldest_node->last);
TCP_REASSEMBLE_DEBUG("reassembler %p peek [%lu, +∞], found segment %p [%lu, %lu]", assy, assy->rcv_nxt, seg, oldest_node->start, oldest_node->last);
*len = (uint16_t)payload_len;
return seg->payload;
@@ -286,13 +286,13 @@ void tcp_reassembly_consume(struct tcp_reassembly *assy, uint32_t len)
* seq range: [0, 4294967295]
* seq range: [0, UINT32_MAX]
*/
uint64_t old_exp_seq = assy->exp_seq;
assy->exp_seq += len;
if (assy->exp_seq > UINT32_MAX)
uint64_t old_exp_seq = assy->rcv_nxt;
assy->rcv_nxt += len;
if (assy->rcv_nxt > UINT32_MAX)
{
assy->exp_seq = assy->exp_seq % 4294967296;
assy->rcv_nxt = assy->rcv_nxt % 4294967296;
}
uint64_t new_exp_seq = assy->exp_seq;
uint64_t new_exp_seq = assy->rcv_nxt;
TCP_REASSEMBLE_DEBUG("reassembler %p consume [%lu, %lu], update expect seq %lu -> %lu", assy, old_exp_seq, old_exp_seq + len - 1, old_exp_seq, new_exp_seq);