From: zhanghailiang Date: Tue, 28 Feb 2017 03:54:19 +0000 (+0800) Subject: filter-rewriter: skip net_checksum_calculate() while offset = 0 X-Git-Tag: v2.9.0-rc2~75^2~4 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=db0a762e4be965b8976abe9df82c6d47c57336fc;p=mirror_qemu.git filter-rewriter: skip net_checksum_calculate() while offset = 0 While the offset of packets's sequence for primary side and secondary side is zero, it is unnecessary to call net_checksum_calculate() to recalculate the checksume value of packets. Signed-off-by: zhanghailiang Signed-off-by: Jason Wang --- diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index c4ab91cdee..afa06e8919 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -93,10 +93,12 @@ static int handle_primary_tcp_pkt(NetFilterState *nf, conn->offset -= (ntohl(tcp_pkt->th_ack) - 1); conn->syn_flag = 0; } - /* handle packets to the secondary from the primary */ - tcp_pkt->th_ack = htonl(ntohl(tcp_pkt->th_ack) + conn->offset); + if (conn->offset) { + /* handle packets to the secondary from the primary */ + tcp_pkt->th_ack = htonl(ntohl(tcp_pkt->th_ack) + conn->offset); - net_checksum_calculate((uint8_t *)pkt->data, pkt->size); + net_checksum_calculate((uint8_t *)pkt->data, pkt->size); + } } return 0; @@ -129,10 +131,13 @@ static int handle_secondary_tcp_pkt(NetFilterState *nf, } if ((tcp_pkt->th_flags & (TH_ACK | TH_SYN)) == TH_ACK) { - /* handle packets to the primary from the secondary*/ - tcp_pkt->th_seq = htonl(ntohl(tcp_pkt->th_seq) - conn->offset); + /* Only need to adjust seq while offset is Non-zero */ + if (conn->offset) { + /* handle packets to the primary from the secondary*/ + tcp_pkt->th_seq = htonl(ntohl(tcp_pkt->th_seq) - conn->offset); - net_checksum_calculate((uint8_t *)pkt->data, pkt->size); + net_checksum_calculate((uint8_t *)pkt->data, pkt->size); + } } return 0;