[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V4 12/12] net/filter-rewriter.c: Make filter-rewrite
From: |
Zhang Chen |
Subject: |
[Qemu-devel] [PATCH V4 12/12] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len |
Date: |
Fri, 12 May 2017 09:41:28 +0800 |
We get the vnet_hdr_len from NetClientState that make us
parse net packet correctly.
Signed-off-by: Zhang Chen <address@hidden>
---
net/filter-rewriter.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index bc6d12a..be129c7 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -17,6 +17,7 @@
#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
+#include "qemu/error-report.h"
#include "qapi-visit.h"
#include "qom/object.h"
#include "qemu/main-loop.h"
@@ -156,10 +157,24 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState
*nf,
ConnectionKey key;
Packet *pkt;
ssize_t size = iov_size(iov, iovcnt);
+ ssize_t vnet_hdr_len = 0;
char *buf = g_malloc0(size);
iov_to_buf(iov, iovcnt, 0, buf, size);
- pkt = packet_new(buf, size, 0);
+
+ if (s->vnet_hdr) {
+ if (nf->netdev->using_vnet_hdr) {
+ vnet_hdr_len = nf->netdev->vnet_hdr_len;
+ } else if (nf->netdev->peer->using_vnet_hdr) {
+ vnet_hdr_len = nf->netdev->peer->vnet_hdr_len;
+ } else {
+ error_report("filter-rewriter get vnet_hdr_len failed");
+ /* When error occurred we drop the packet */
+ return 1;
+ }
+ }
+
+ pkt = packet_new(buf, size, vnet_hdr_len);
g_free(buf);
/*
--
2.7.4
- [Qemu-devel] [PATCH V4 07/12] net/colo.c: Make vnet_hdr_len as packet property, (continued)
- [Qemu-devel] [PATCH V4 07/12] net/colo.c: Make vnet_hdr_len as packet property, Zhang Chen, 2017/05/11
- [Qemu-devel] [PATCH V4 05/12] net/net.c: Add vnet_hdr support in SocketReadState, Zhang Chen, 2017/05/11
- [Qemu-devel] [PATCH V4 09/12] net/colo.c: Add vnet packet parse feature in colo-proxy, Zhang Chen, 2017/05/11
- [Qemu-devel] [PATCH V4 11/12] net/filter-rewriter.c: Add new option to enable vnet support for filter-rewriter, Zhang Chen, 2017/05/11
- [Qemu-devel] [PATCH V4 12/12] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len,
Zhang Chen <=
- [Qemu-devel] [PATCH V4 10/12] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare, Zhang Chen, 2017/05/11