From patchwork Fri Aug 7 02:46:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 504972 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AB4C11401C7 for ; Fri, 7 Aug 2015 12:53:48 +1000 (AEST) Received: from localhost ([::1]:47822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNXn0-0000Qz-Of for incoming@patchwork.ozlabs.org; Thu, 06 Aug 2015 22:53:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNXgr-0006ZP-0W for qemu-devel@nongnu.org; Thu, 06 Aug 2015 22:47:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNXgm-0005vp-C1 for qemu-devel@nongnu.org; Thu, 06 Aug 2015 22:47:24 -0400 Received: from [59.151.112.132] (port=8924 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNXgj-0005rI-L6 for qemu-devel@nongnu.org; Thu, 06 Aug 2015 22:47:20 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="99368443" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 07 Aug 2015 10:50:31 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t772j8Vj009477; Fri, 7 Aug 2015 10:45:08 +0800 Received: from localhost (10.167.226.223) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Fri, 7 Aug 2015 10:47:02 +0800 From: Yang Hongyang To: Date: Fri, 7 Aug 2015 10:46:21 +0800 Message-ID: <1438915585-30367-7-git-send-email-yanghy@cn.fujitsu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438915585-30367-1-git-send-email-yanghy@cn.fujitsu.com> References: <1438915585-30367-1-git-send-email-yanghy@cn.fujitsu.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: thuth@redhat.com, zhang.zhanghailiang@huawei.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, mrhines@linux.vnet.ibm.com, stefanha@redhat.com, Yang Hongyang Subject: [Qemu-devel] [PATCH v6 06/10] netfilter: add an API to pass the packet to next filter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org add an API qemu_netfilter_pass_to_next() to pass the packet to next filter. Signed-off-by: Yang Hongyang --- v5: fold params to NetPacket struct --- include/net/filter.h | 3 +++ net/filter.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/net/filter.h b/include/net/filter.h index f15d83d..9278d40 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -57,4 +57,7 @@ void qemu_del_net_filter(NetFilterState *nf); void netfilter_add(QemuOpts *opts, Error **errp); void qmp_netfilter_add(QDict *qdict, QObject **ret, Error **errp); +/* pass the packet to the next filter */ +ssize_t qemu_netfilter_pass_to_next(NetFilterState *nf, NetPacket *packet); + #endif /* QEMU_NET_FILTER_H */ diff --git a/net/filter.c b/net/filter.c index 1b9ad67..9e9afc8 100644 --- a/net/filter.c +++ b/net/filter.c @@ -14,9 +14,11 @@ #include "qapi/dealloc-visitor.h" #include "qemu/config-file.h" #include "qmp-commands.h" +#include "qemu/iov.h" #include "net/filter.h" #include "net/net.h" +#include "net/queue.h" static QTAILQ_HEAD(, NetFilterState) net_filters; @@ -152,6 +154,37 @@ void qmp_netfilter_del(const char *id, Error **errp) qemu_opts_del(opts); } +ssize_t qemu_netfilter_pass_to_next(NetFilterState *nf, NetPacket *packet) +{ + int ret = 0; + NetFilterState *next = QTAILQ_NEXT(nf, next); + struct iovec iov = { + .iov_base = (void *)packet->data, + .iov_len = packet->size + }; + + while (next) { + if (next->chain == nf->chain || next->chain == NET_FILTER_ALL) { + ret = next->info->receive_iov(next, packet->sender, packet->flags, + &iov, 1, packet->sent_cb); + if (ret) { + return ret; + } + } + next = QTAILQ_NEXT(next, next); + } + + /* we have gone through all filters, pass it to receiver */ + if (packet->sender && packet->sender->peer) { + return qemu_net_queue_send_iov(packet->sender->peer->incoming_queue, + packet->sender, packet->flags, + &iov, 1, packet->sent_cb); + } + + /* no receiver, or sender been deleted */ + return packet->size; +} + typedef int (NetFilterInit)(const NetFilterOptions *opts, const char *name, int chain, NetClientState *netdev, Error **errp);