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

bugfix: build packet also copy metadata from original packet

Browse Source
This commit is contained in:
luwenpeng
2024-10-24 11:00:20 +08:00
parent 1e71122521
commit cb6f231935
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
infra/ip_reassembly/ip_reassembly.c
View File

@@ -529,19 +529,18 @@ static struct packet *ip_reassembly_defrag_fq(struct ip_reassembly *ip_reass, st
// create a new packet // create a new packet
packet_parse(pkt, ptr, total_len); packet_parse(pkt, ptr, total_len);
packet_set_defraged(pkt); packet_set_defraged(pkt);
memcpy(&pkt->meta, &first->pkt->meta, sizeof(struct metadata));
frag = &fq->frags[IP_FIRST_FRAG_IDX]; packet_push_frag(pkt, first->pkt);
packet_push_frag(pkt, frag->pkt); first->pkt = NULL;
frag->pkt = NULL;
for (uint32_t i = IP_MIN_FRAG_NUM; i < fq->next_fill; i++) for (uint32_t i = IP_MIN_FRAG_NUM; i < fq->next_fill; i++)
{ {
frag = &fq->frags[i]; frag = &fq->frags[i];
packet_push_frag(pkt, frag->pkt); packet_push_frag(pkt, frag->pkt);
frag->pkt = NULL; frag->pkt = NULL;
} }
frag = &fq->frags[IP_LAST_FRAG_IDX]; packet_push_frag(pkt, last->pkt);
packet_push_frag(pkt, frag->pkt); last->pkt = NULL;
frag->pkt = NULL;
STAT_INC(&ip_reass->stat, defrags_succeed, &fq->key) STAT_INC(&ip_reass->stat, defrags_succeed, &fq->key)
ip_reassembly_del_fq(ip_reass, fq); ip_reassembly_del_fq(ip_reass, fq);

3
infra/packet_manager/packet_builder.c
View File

@@ -303,6 +303,7 @@ struct packet *packet_build_tcp(const struct packet *origin_pkt, uint32_t tcp_se
.args = NULL, .args = NULL,
.thr_idx = -1, .thr_idx = -1,
}; };
memcpy(&new_pkt->meta, &origin_pkt->meta, sizeof(struct metadata));
packet_set_origin(new_pkt, &origin); packet_set_origin(new_pkt, &origin);
return new_pkt; return new_pkt;
@@ -352,6 +353,7 @@ struct packet *packet_build_udp(const struct packet *origin_pkt, const char *udp
.args = NULL, .args = NULL,
.thr_idx = -1, .thr_idx = -1,
}; };
memcpy(&new_pkt->meta, &origin_pkt->meta, sizeof(struct metadata));
packet_set_origin(new_pkt, &origin); packet_set_origin(new_pkt, &origin);
return new_pkt; return new_pkt;
@@ -428,6 +430,7 @@ struct packet *packet_build_l3(const struct packet *origin_pkt, uint8_t ip_proto
.args = NULL, .args = NULL,
.thr_idx = -1, .thr_idx = -1,
}; };
memcpy(&new_pkt->meta, &origin_pkt->meta, sizeof(struct metadata));
packet_set_origin(new_pkt, &origin); packet_set_origin(new_pkt, &origin);
return new_pkt; return new_pkt;