[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/9] net: add/remove filters from network backend
From: |
Yang Hongyang |
Subject: |
[Qemu-devel] [PATCH v2 4/9] net: add/remove filters from network backend |
Date: |
Fri, 31 Jul 2015 12:13:29 +0800 |
add/remove filters from network backend
Signed-off-by: Yang Hongyang <address@hidden>
---
include/net/net.h | 8 ++++++++
net/filter.c | 4 ++--
net/net.c | 38 ++++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 6a6cbef..5c5c109 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -40,6 +40,11 @@ typedef struct NICConf {
/* Net clients */
+typedef struct Filter Filter;
+struct Filter {
+ NetFilterState *nf;
+ QTAILQ_ENTRY(Filter) next;
+};
typedef void (NetPoll)(NetClientState *, bool enable);
typedef int (NetCanReceive)(NetClientState *);
@@ -92,6 +97,7 @@ struct NetClientState {
NetClientDestructor *destructor;
unsigned int queue_index;
unsigned rxfilter_notify_enabled:1;
+ QTAILQ_HEAD(, Filter) filters;
};
typedef struct NICState {
@@ -109,6 +115,8 @@ NetClientState *qemu_new_net_client(NetClientInfo *info,
NetClientState *peer,
const char *model,
const char *name);
+int qemu_netdev_add_filter(NetClientState *nc, NetFilterState *nf);
+void qemu_netdev_remove_filter(NetClientState *nc, NetFilterState *nf);
NICState *qemu_new_nic(NetClientInfo *info,
NICConf *conf,
const char *model,
diff --git a/net/filter.c b/net/filter.c
index 18d1c8f..b3a2285 100644
--- a/net/filter.c
+++ b/net/filter.c
@@ -37,14 +37,14 @@ NetFilterState *qemu_new_net_filter(NetFilterInfo *info,
nf->netdev = netdev;
nf->chain = chain;
QTAILQ_INSERT_TAIL(&net_filters, nf, next);
- /* TODO: attach netfilter to netdev */
+ qemu_netdev_add_filter(netdev, nf);
return nf;
}
static void qemu_cleanup_net_filter(NetFilterState *nf)
{
- /* TODO: remove netfilter from netdev */
+ qemu_netdev_remove_filter(nf->netdev, nf);
QTAILQ_REMOVE(&net_filters, nf, next);
diff --git a/net/net.c b/net/net.c
index 28a5597..22748e0 100644
--- a/net/net.c
+++ b/net/net.c
@@ -287,6 +287,7 @@ static void qemu_net_client_setup(NetClientState *nc,
nc->incoming_queue = qemu_new_net_queue(nc);
nc->destructor = destructor;
+ QTAILQ_INIT(&nc->filters);
}
NetClientState *qemu_new_net_client(NetClientInfo *info,
@@ -305,6 +306,38 @@ NetClientState *qemu_new_net_client(NetClientInfo *info,
return nc;
}
+int qemu_netdev_add_filter(NetClientState *nc, NetFilterState *nf)
+{
+ Filter *filter = g_malloc0(sizeof(*filter));
+
+ filter->nf = nf;
+ QTAILQ_INSERT_TAIL(&nc->filters, filter, next);
+ return 0;
+}
+
+static void remove_filter(NetClientState *nc, Filter *filter)
+{
+ if (!filter) {
+ return;
+ }
+
+ QTAILQ_REMOVE(&nc->filters, filter, next);
+ g_free(filter);
+}
+
+void qemu_netdev_remove_filter(NetClientState *nc, NetFilterState *nf)
+{
+ Filter *filter = NULL;
+
+ QTAILQ_FOREACH(filter, &nc->filters, next) {
+ if (filter->nf == nf) {
+ break;
+ }
+ }
+
+ remove_filter(nc, filter);
+}
+
NICState *qemu_new_nic(NetClientInfo *info,
NICConf *conf,
const char *model,
@@ -367,6 +400,8 @@ static void qemu_cleanup_net_client(NetClientState *nc)
static void qemu_free_net_client(NetClientState *nc)
{
+ Filter *filter, *next;
+
if (nc->incoming_queue) {
qemu_del_net_queue(nc->incoming_queue);
}
@@ -375,6 +410,9 @@ static void qemu_free_net_client(NetClientState *nc)
}
g_free(nc->name);
g_free(nc->model);
+ QTAILQ_FOREACH_SAFE(filter, &nc->filters, next, next) {
+ remove_filter(nc, filter);
+ }
if (nc->destructor) {
nc->destructor(nc);
}
--
1.9.1
- [Qemu-devel] [PATCH v2 0/9] For QEMU 2.5: Add a netfilter object and netbuffer filter, Yang Hongyang, 2015/07/31
- [Qemu-devel] [PATCH v2 2/9] init/cleanup of netfilter object, Yang Hongyang, 2015/07/31
- [Qemu-devel] [PATCH v2 4/9] net: add/remove filters from network backend,
Yang Hongyang <=
- [Qemu-devel] [PATCH v2 3/9] netfilter: add netfilter_{add|del} commands, Yang Hongyang, 2015/07/31
- [Qemu-devel] [PATCH v2 1/9] net: add a new object netfilter, Yang Hongyang, 2015/07/31
- [Qemu-devel] [PATCH v2 7/9] move out net queue structs define, Yang Hongyang, 2015/07/31
- [Qemu-devel] [PATCH v2 8/9] netfilter: add a netbuffer filter, Yang Hongyang, 2015/07/31
- Re: [Qemu-devel] [PATCH v2 8/9] netfilter: add a netbuffer filter, Dr. David Alan Gilbert, 2015/07/31
- [Qemu-devel] [PATCH v2 6/9] net/queue: export qemu_net_queue_append_iov, Yang Hongyang, 2015/07/31
- [Qemu-devel] [PATCH v2 9/9] filter/buffer: update command description and help, Yang Hongyang, 2015/07/31