david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/filter-mirror.c: Introduce parameter for filter_send()

Browse Source 
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 <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Zhang Chen 2017-07-04 14:53:47 +08:00 committed by Jason Wang
parent 3cde5ea211
commit dc3c5ac645
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/filter-mirror.c
View File

@ -43,7 +43,7 @@ typedef struct MirrorState {
SocketReadState rs; SocketReadState rs;
} MirrorState; } MirrorState;
static int filter_send(CharBackend *chr_out, static int filter_send(MirrorState *s,
const struct iovec *iov, const struct iovec *iov,
int iovcnt) int iovcnt)
{ {
@ -58,14 +58,14 @@ static int filter_send(CharBackend *chr_out,
} }
len = htonl(size); 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)) { if (ret != sizeof(len)) {
goto err; goto err;
} }
buf = g_malloc(size); buf = g_malloc(size);
iov_to_buf(iov, iovcnt, 0, buf, 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); g_free(buf);
if (ret != size) { if (ret != size) {
goto err; goto err;
@ -141,7 +141,7 @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
MirrorState *s = FILTER_MIRROR(nf); MirrorState *s = FILTER_MIRROR(nf);
int ret; int ret;
ret = filter_send(&s->chr_out, iov, iovcnt); ret = filter_send(s, iov, iovcnt);
if (ret) { if (ret) {
error_report("filter mirror send failed(%s)", strerror(-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; int ret;
if (qemu_chr_fe_backend_connected(&s->chr_out)) { 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) { if (ret) {
error_report("filter redirector send failed(%s)", strerror(-ret)); error_report("filter redirector send failed(%s)", strerror(-ret));
} }