[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/14] filter: Add 'status' property for filter objec
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 12/14] filter: Add 'status' property for filter object |
Date: |
Mon, 7 Mar 2016 11:12:58 +0800 |
From: zhanghailiang <address@hidden>
With this property, users can control if this filter is 'on'
or 'off'. The default behavior for filter is 'on'.
For some types of filters, they may need to react to status changing,
So here, we introduced status changing callback/notifier for filter class.
We will skip the disabled ('off') filter when delivering packets in net layer.
Signed-off-by: zhanghailiang <address@hidden>
Cc: Jason Wang <address@hidden>
Cc: Yang Hongyang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
include/net/filter.h | 4 ++++
net/filter.c | 41 +++++++++++++++++++++++++++++++++++++++++
qemu-options.hx | 4 +++-
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/include/net/filter.h b/include/net/filter.h
index 5639976..cfb1172 100644
--- a/include/net/filter.h
+++ b/include/net/filter.h
@@ -36,12 +36,15 @@ typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc,
int iovcnt,
NetPacketSent *sent_cb);
+typedef void (FilterStatusChanged) (NetFilterState *nf, Error **errp);
+
typedef struct NetFilterClass {
ObjectClass parent_class;
/* optional */
FilterSetup *setup;
FilterCleanup *cleanup;
+ FilterStatusChanged *status_changed;
/* mandatory */
FilterReceiveIOV *receive_iov;
} NetFilterClass;
@@ -55,6 +58,7 @@ struct NetFilterState {
char *netdev_id;
NetClientState *netdev;
NetFilterDirection direction;
+ bool on;
QTAILQ_ENTRY(NetFilterState) next;
};
diff --git a/net/filter.c b/net/filter.c
index 7cdbc6c..a08ef68 100644
--- a/net/filter.c
+++ b/net/filter.c
@@ -17,6 +17,11 @@
#include "qom/object_interfaces.h"
#include "qemu/iov.h"
+static inline bool qemu_can_skip_netfilter(NetFilterState *nf)
+{
+ return !nf->on;
+}
+
ssize_t qemu_netfilter_receive(NetFilterState *nf,
NetFilterDirection direction,
NetClientState *sender,
@@ -25,6 +30,9 @@ ssize_t qemu_netfilter_receive(NetFilterState *nf,
int iovcnt,
NetPacketSent *sent_cb)
{
+ if (qemu_can_skip_netfilter(nf)) {
+ return 0;
+ }
if (nf->direction == direction ||
nf->direction == NET_FILTER_DIRECTION_ALL) {
return NETFILTER_GET_CLASS(OBJECT(nf))->receive_iov(
@@ -134,8 +142,38 @@ static void netfilter_set_direction(Object *obj, int
direction, Error **errp)
nf->direction = direction;
}
+static char *netfilter_get_status(Object *obj, Error **errp)
+{
+ NetFilterState *nf = NETFILTER(obj);
+
+ return nf->on ? g_strdup("on") : g_strdup("off");
+}
+
+static void netfilter_set_status(Object *obj, const char *str, Error **errp)
+{
+ NetFilterState *nf = NETFILTER(obj);
+ NetFilterClass *nfc = NETFILTER_GET_CLASS(obj);
+
+ if (strcmp(str, "on") && strcmp(str, "off")) {
+ error_setg(errp, "Invalid value for netfilter status, "
+ "should be 'on' or 'off'");
+ return;
+ }
+ if (nf->on == !strcmp(str, "on")) {
+ return;
+ }
+ nf->on = !nf->on;
+ if (nfc->status_changed) {
+ nfc->status_changed(nf, errp);
+ }
+}
+
static void netfilter_init(Object *obj)
{
+ NetFilterState *nf = NETFILTER(obj);
+
+ nf->on = true;
+
object_property_add_str(obj, "netdev",
netfilter_get_netdev_id, netfilter_set_netdev_id,
NULL);
@@ -143,6 +181,9 @@ static void netfilter_init(Object *obj)
NetFilterDirection_lookup,
netfilter_get_direction, netfilter_set_direction,
NULL);
+ object_property_add_str(obj, "status",
+ netfilter_get_status, netfilter_set_status,
+ NULL);
}
static void netfilter_complete(UserCreatable *uc, Error **errp)
diff --git a/qemu-options.hx b/qemu-options.hx
index 9922cc5..9bf09ed 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3788,11 +3788,13 @@ version by providing the @var{passwordid} parameter.
This provides
the ID of a previously created @code{secret} object containing the
password for decryption.
address@hidden -object
filter-buffer,address@hidden,address@hidden,address@hidden,address@hidden|rx|tx}]
address@hidden -object
filter-buffer,address@hidden,address@hidden,address@hidden,address@hidden|rx|tx}][,address@hidden|off}]
Interval @var{t} can't be 0, this filter batches the packet delivery: all
packets arriving in a given interval on netdev @var{netdevid} are delayed
until the end of the interval. Interval is in microseconds.
address@hidden is optional that indicate whether the netfilter is
+on (enabled) or off (disabled), the default status for netfilter will be 'on'.
queue @var{all|rx|tx} is an option that can be applied to any netfilter.
--
2.5.0
- [Qemu-devel] [PULL 02/14] net: filter: correctly remove filter from the list during finalization, (continued)
- [Qemu-devel] [PULL 02/14] net: filter: correctly remove filter from the list during finalization, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 03/14] MAINTAINERS: Add entries for include/net/ files, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 04/14] net: simplify net_init_tap_one logic, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 05/14] net/filter-mirror:Add filter-mirror, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 06/14] tests/test-filter-mirror:add filter-mirror unit test, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 07/14] net: netmap: probe netmap interface for virtio-net header, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 08/14] rocker: forbid to change world type, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 09/14] rocker: return -ENOMEM in case of some world alloc fails, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 10/14] rocker: add name field into WorldOps ale let world specify its name, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 11/14] rocker: allow user to specify rocker world by property, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 12/14] filter: Add 'status' property for filter object,
Jason Wang <=
- [Qemu-devel] [PULL 13/14] filter-buffer: Add status_changed callback processing, Jason Wang, 2016/03/06
- [Qemu-devel] [PULL 14/14] net: check packet payload length, Jason Wang, 2016/03/06
- Re: [Qemu-devel] [PULL 00/14] Net patches, Peter Maydell, 2016/03/07
- Re: [Qemu-devel] [PULL 00/14] Net patches, Jason Wang, 2016/03/08
- Re: [Qemu-devel] [PULL 00/14] Net patches, Wen Congyang, 2016/03/08
- Re: [Qemu-devel] [PULL 00/14] Net patches, Jason Wang, 2016/03/08
- Re: [Qemu-devel] [PULL 00/14] Net patches, Zhang Chen, 2016/03/08
- Re: [Qemu-devel] [PULL 00/14] Net patches, Wen Congyang, 2016/03/08
- Re: [Qemu-devel] [PULL 00/14] Net patches, Peter Maydell, 2016/03/08
- Re: [Qemu-devel] [PULL 00/14] Net patches, Wen Congyang, 2016/03/08