[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/14] net/filter-mirror.c: Introduce parameter for f
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 03/14] net/filter-mirror.c: Introduce parameter for filter_send() |
Date: |
Mon, 17 Jul 2017 20:21:34 +0800 |
From: Zhang Chen <address@hidden>
This patch change the filter_send() parameter from CharBackend to MirrorState,
we can get more information like vnet_hdr(We use it to support packet with
vnet_header).
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/filter-mirror.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index 1b6211b..e8e5b60 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -43,7 +43,7 @@ typedef struct MirrorState {
SocketReadState rs;
} MirrorState;
-static int filter_send(CharBackend *chr_out,
+static int filter_send(MirrorState *s,
const struct iovec *iov,
int iovcnt)
{
@@ -58,14 +58,14 @@ static int filter_send(CharBackend *chr_out,
}
len = htonl(size);
- ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)&len, sizeof(len));
+ ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len));
if (ret != sizeof(len)) {
goto err;
}
buf = g_malloc(size);
iov_to_buf(iov, iovcnt, 0, buf, size);
- ret = qemu_chr_fe_write_all(chr_out, (uint8_t *)buf, size);
+ ret = qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
g_free(buf);
if (ret != size) {
goto err;
@@ -141,7 +141,7 @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
MirrorState *s = FILTER_MIRROR(nf);
int ret;
- ret = filter_send(&s->chr_out, iov, iovcnt);
+ ret = filter_send(s, iov, iovcnt);
if (ret) {
error_report("filter mirror send failed(%s)", strerror(-ret));
}
@@ -164,7 +164,7 @@ static ssize_t filter_redirector_receive_iov(NetFilterState
*nf,
int ret;
if (qemu_chr_fe_backend_connected(&s->chr_out)) {
- ret = filter_send(&s->chr_out, iov, iovcnt);
+ ret = filter_send(s, iov, iovcnt);
if (ret) {
error_report("filter redirector send failed(%s)", strerror(-ret));
}
--
2.7.4
- [Qemu-devel] [PULL 00/14] Net patches, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 01/14] net: Add vnet_hdr_len arguments in NetClientState, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 02/14] net/net.c: Add vnet_hdr support in SocketReadState, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 03/14] net/filter-mirror.c: Introduce parameter for filter_send(),
Jason Wang <=
- [Qemu-devel] [PULL 04/14] net/filter-mirror.c: Make filter mirror support vnet support., Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 05/14] net/filter-mirror.c: Add new option to enable vnet support for filter-redirector, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 06/14] net/colo.c: Make vnet_hdr_len as packet property, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 07/14] net/colo-compare.c: Introduce parameter for compare_chr_send(), Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 08/14] net/colo-compare.c: Make colo-compare support vnet_hdr_len, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 09/14] net/colo.c: Add vnet packet parse feature in colo-proxy, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 10/14] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 11/14] net/filter-rewriter.c: Make filter-rewriter support vnet_hdr_len, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 12/14] docs/colo-proxy.txt: Update colo-proxy usage of net driver with vnet_header, Jason Wang, 2017/07/17
- [Qemu-devel] [PULL 13/14] virtion-net: Prefer is_power_of_2(), Jason Wang, 2017/07/17