[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 2/6] net/colo-compare: Use the tcp_header struct
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [RFC PATCH 2/6] net/colo-compare: Use the tcp_header structure |
Date: |
Thu, 8 Aug 2019 16:34:53 +0200 |
The tcp_header structure comes convenient macros to avoid
manipulating the TCP header flags/offset bits manually.
Replace the tcp_hdr structure by the tcp_header equivalent,
and use the macros.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
RFC: Verify th_off endianess
net/colo-compare.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 7489840bde..14ee4166ba 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -161,28 +161,28 @@ static void
colo_compare_inconsistency_notify(CompareState *s)
static gint seq_sorter(Packet *a, Packet *b, gpointer data)
{
- struct tcp_hdr *atcp, *btcp;
+ struct tcp_header *atcp, *btcp;
- atcp = (struct tcp_hdr *)(a->transport_header);
- btcp = (struct tcp_hdr *)(b->transport_header);
+ atcp = (struct tcp_header *)(a->transport_header);
+ btcp = (struct tcp_header *)(b->transport_header);
return ntohl(atcp->th_seq) - ntohl(btcp->th_seq);
}
static void fill_pkt_tcp_info(void *data, uint32_t *max_ack)
{
Packet *pkt = data;
- struct tcp_hdr *tcphd;
+ struct tcp_header *tcphd;
- tcphd = (struct tcp_hdr *)pkt->transport_header;
+ tcphd = (struct tcp_header *)pkt->transport_header;
pkt->tcp_seq = ntohl(tcphd->th_seq);
pkt->tcp_ack = ntohl(tcphd->th_ack);
*max_ack = *max_ack > pkt->tcp_ack ? *max_ack : pkt->tcp_ack;
pkt->header_size = pkt->transport_header - (uint8_t *)pkt->data
- + (tcphd->th_off << 2) - pkt->vnet_hdr_len;
+ + TCP_HEADER_DATA_OFFSET(tcphd) - pkt->vnet_hdr_len;
pkt->payload_size = pkt->size - pkt->header_size;
pkt->seq_end = pkt->tcp_seq + pkt->payload_size;
- pkt->flags = tcphd->th_flags;
+ pkt->flags = TCP_HEADER_FLAGS(tcphd);
}
/*
--
2.20.1
- [Qemu-devel] [PATCH 0/6] net/eth: Remove duplicated tcp/udp_hdr structures, Philippe Mathieu-Daudé, 2019/08/08
- [Qemu-devel] [RFC PATCH 1/6] hw/net/virtio-net: Use TCP_HEADER_FLAGS/TCP_HEADER_DATA_OFFSET macros, Philippe Mathieu-Daudé, 2019/08/08
- [Qemu-devel] [RFC PATCH 2/6] net/colo-compare: Use the tcp_header structure,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 3/6] net/filter-rewriter: Use the tcp_header structure, Philippe Mathieu-Daudé, 2019/08/08
- [Qemu-devel] [RFC PATCH 4/6] hw/net/vmxnet3: Use the tcp_header structure, Philippe Mathieu-Daudé, 2019/08/08
- [Qemu-devel] [PATCH 5/6] net/eth: Remove the unused tcp_hdr structure, Philippe Mathieu-Daudé, 2019/08/08
- [Qemu-devel] [PATCH 6/6] net/eth: Remove the single use of udp_hdr structure, Philippe Mathieu-Daudé, 2019/08/08
- Re: [Qemu-devel] [PATCH 0/6] net/eth: Remove duplicated tcp/udp_hdr structures, Dmitry Fleytman, 2019/08/12
- Re: [Qemu-devel] [PATCH 0/6] net/eth: Remove duplicated tcp/udp_hdr structures, Philippe Mathieu-Daudé, 2019/08/18