move a few unmaintained packages from trunk to /packages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33634 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 0 insertions, 2512 deletions

diff --git a/package/wprobe/src/user/Makefile b/package/wprobe/src/user/Makefile
deleted file mode 100644
index 01e83da3e..000000000
--- a/package/wprobe/src/user/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-include ../Makefile.inc
-
-CPPFLAGS += -I../kernel
-LDFLAGS =
-
-ifneq ($(HOST_OS),Linux)
-USE_LIBNL_MICRO=1
-else
-USE_LIBNL_MICRO=
-endif
-
-ifeq ($(USE_LIBNL_MICRO),1)
-LIBNL_PREFIX = /usr/local
-LIBNL = $(LIBNL_PREFIX)/lib/libnl-micro.a
-CPPFLAGS += -I$(LIBNL_PREFIX)/include/libnl-micro
-EXTRA_CFLAGS += -DNO_LOCAL_ACCESS
-else
-LIBNL = -lnl
-endif
-
-LIBM = -lm
-LIBS = $(LIBNL) $(LIBM)
-
-all: libwprobe.a wprobe-util
-
-libwprobe.a: wprobe-lib.o
-	rm -f $@
-	$(AR) rcu $@ $^
-	$(RANLIB) $@
-
-%.o: %.c
-	$(CC) $(WFLAGS) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $<
-
-wprobe-util: wprobe-util.o wprobe-lib.o
-	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
-
-clean:
-	rm -f *.o *.a wprobe-util
diff --git a/package/wprobe/src/user/list.h b/package/wprobe/src/user/list.h
deleted file mode 100644
index 2959a061d..000000000
--- a/package/wprobe/src/user/list.h
+++ /dev/null
@@ -1,601 +0,0 @@
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
-
-#include <stddef.h>
-/**
- * container_of - cast a member of a structure out to the containing structure
- * @ptr:	the pointer to the member.
- * @type:	the type of the container struct this is embedded in.
- * @member:	the name of the member within the struct.
- *
- */
-#ifndef container_of
-#define container_of(ptr, type, member) (			\
-	(type *)( (char *)ptr - offsetof(type,member) ))
-#endif
-
-
-/*
- * Simple doubly linked list implementation.
- *
- * Some of the internal functions ("__xxx") are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
-struct list_head {
-	struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
-	struct list_head name = LIST_HEAD_INIT(name)
-
-static inline void INIT_LIST_HEAD(struct list_head *list)
-{
-	list->next = list;
-	list->prev = list;
-}
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_add(struct list_head *new,
-			      struct list_head *prev,
-			      struct list_head *next)
-{
-	next->prev = new;
-	new->next = next;
-	new->prev = prev;
-	prev->next = new;
-}
-
-/**
- * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static inline void list_add(struct list_head *new, struct list_head *head)
-{
-	__list_add(new, head, head->next);
-}
-
-
-/**
- * list_add_tail - add a new entry
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- */
-static inline void list_add_tail(struct list_head *new, struct list_head *head)
-{
-	__list_add(new, head->prev, head);
-}
-
-
-/*
- * Delete a list entry by making the prev/next entries
- * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_del(struct list_head * prev, struct list_head * next)
-{
-	next->prev = prev;
-	prev->next = next;
-}
-
-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty() on entry does not return true after this, the entry is
- * in an undefined state.
- */
-static inline void list_del(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-	entry->next = NULL;
-	entry->prev = NULL;
-}
-
-/**
- * list_replace - replace old entry by new one
- * @old : the element to be replaced
- * @new : the new element to insert
- *
- * If @old was empty, it will be overwritten.
- */
-static inline void list_replace(struct list_head *old,
-				struct list_head *new)
-{
-	new->next = old->next;
-	new->next->prev = new;
-	new->prev = old->prev;
-	new->prev->next = new;
-}
-
-static inline void list_replace_init(struct list_head *old,
-					struct list_head *new)
-{
-	list_replace(old, new);
-	INIT_LIST_HEAD(old);
-}
-
-/**
- * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.
- */
-static inline void list_del_init(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-	INIT_LIST_HEAD(entry);
-}
-
-/**
- * list_move - delete from one list and add as another's head
- * @list: the entry to move
- * @head: the head that will precede our entry
- */
-static inline void list_move(struct list_head *list, struct list_head *head)
-{
-	__list_del(list->prev, list->next);
-	list_add(list, head);
-}
-
-/**
- * list_move_tail - delete from one list and add as another's tail
- * @list: the entry to move
- * @head: the head that will follow our entry
- */
-static inline void list_move_tail(struct list_head *list,
-				  struct list_head *head)
-{
-	__list_del(list->prev, list->next);
-	list_add_tail(list, head);
-}
-
-/**
- * list_is_last - tests whether @list is the last entry in list @head
- * @list: the entry to test
- * @head: the head of the list
- */
-static inline int list_is_last(const struct list_head *list,
-				const struct list_head *head)
-{
-	return list->next == head;
-}
-
-/**
- * list_empty - tests whether a list is empty
- * @head: the list to test.
- */
-static inline int list_empty(const struct list_head *head)
-{
-	return head->next == head;
-}
-
-/**
- * list_empty_careful - tests whether a list is empty and not being modified
- * @head: the list to test
- *
- * Description:
- * tests whether a list is empty _and_ checks that no other CPU might be
- * in the process of modifying either member (next or prev)
- *
- * NOTE: using list_empty_careful() without synchronization
- * can only be safe if the only activity that can happen
- * to the list entry is list_del_init(). Eg. it cannot be used
- * if another CPU could re-list_add() it.
- */
-static inline int list_empty_careful(const struct list_head *head)
-{
-	struct list_head *next = head->next;
-	return (next == head) && (next == head->prev);
-}
-
-static inline void __list_splice(struct list_head *list,
-				 struct list_head *head)
-{
-	struct list_head *first = list->next;
-	struct list_head *last = list->prev;
-	struct list_head *at = head->next;
-
-	first->prev = head;
-	head->next = first;
-
-	last->next = at;
-	at->prev = last;
-}
-
-/**
- * list_splice - join two lists
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- */
-static inline void list_splice(struct list_head *list, struct list_head *head)
-{
-	if (!list_empty(list))
-		__list_splice(list, head);
-}
-
-/**
- * list_splice_init - join two lists and reinitialise the emptied list.
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- *
- * The list at @list is reinitialised
- */
-static inline void list_splice_init(struct list_head *list,
-				    struct list_head *head)
-{
-	if (!list_empty(list)) {
-		__list_splice(list, head);
-		INIT_LIST_HEAD(list);
-	}
-}
-
-/**
- * list_entry - get the struct for this entry
- * @ptr:	the &struct list_head pointer.
- * @type:	the type of the struct this is embedded in.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_entry(ptr, type, member) \
-	container_of(ptr, type, member)
-
-/**
- * list_first_entry - get the first element from a list
- * @ptr:	the list head to take the element from.
- * @type:	the type of the struct this is embedded in.
- * @member:	the name of the list_struct within the struct.
- *
- * Note, that list is expected to be not empty.
- */
-#define list_first_entry(ptr, type, member) \
-	list_entry((ptr)->next, type, member)
-
-/**
- * list_for_each	-	iterate over a list
- * @pos:	the &struct list_head to use as a loop cursor.
- * @head:	the head for your list.
- */
-#define list_for_each(pos, head) \
-	for (pos = (head)->next; pos != (head); \
-        	pos = pos->next)
-
-/**
- * __list_for_each	-	iterate over a list
- * @pos:	the &struct list_head to use as a loop cursor.
- * @head:	the head for your list.
- *
- * This variant differs from list_for_each() in that it's the
- * simplest possible list iteration code, no prefetching is done.
- * Use this for code that knows the list to be very short (empty
- * or 1 entry) most of the time.
- */
-#define __list_for_each(pos, head) \
-	for (pos = (head)->next; pos != (head); pos = pos->next)
-
-/**
- * list_for_each_prev	-	iterate over a list backwards
- * @pos:	the &struct list_head to use as a loop cursor.
- * @head:	the head for your list.
- */
-#define list_for_each_prev(pos, head) \
-	for (pos = (head)->prev; pos != (head); \
-        	pos = pos->prev)
-
-/**
- * list_for_each_safe - iterate over a list safe against removal of list entry
- * @pos:	the &struct list_head to use as a loop cursor.
- * @n:		another &struct list_head to use as temporary storage
- * @head:	the head for your list.
- */
-#define list_for_each_safe(pos, n, head) \
-	for (pos = (head)->next, n = pos->next; pos != (head); \
-		pos = n, n = pos->next)
-
-/**
- * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
- * @pos:	the &struct list_head to use as a loop cursor.
- * @n:		another &struct list_head to use as temporary storage
- * @head:	the head for your list.
- */
-#define list_for_each_prev_safe(pos, n, head) \
-	for (pos = (head)->prev, n = pos->prev; \
-	     pos != (head); \
-	     pos = n, n = pos->prev)
-
-/**
- * list_for_each_entry	-	iterate over list of given type
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry(pos, head, member)				\
-	for (pos = list_entry((head)->next, typeof(*pos), member);	\
-	     &pos->member != (head); 	\
-	     pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_for_each_entry_reverse - iterate backwards over list of given type.
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
-	     &pos->member != (head); 	\
-	     pos = list_entry(pos->member.prev, typeof(*pos), member))
-
-/**
- * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
- * @pos:	the type * to use as a start point
- * @head:	the head of the list
- * @member:	the name of the list_struct within the struct.
- *
- * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
- */
-#define list_prepare_entry(pos, head, member) \
-	((pos) ? : list_entry(head, typeof(*pos), member))
-
-/**
- * list_for_each_entry_continue - continue iteration over list of given type
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Continue to iterate over list of given type, continuing after
- * the current position.
- */
-#define list_for_each_entry_continue(pos, head, member) 		\
-	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
-	     &pos->member != (head);	\
-	     pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_for_each_entry_continue_reverse - iterate backwards from the given point
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Start to iterate over list of given type backwards, continuing after
- * the current position.
- */
-#define list_for_each_entry_continue_reverse(pos, head, member)		\
-	for (pos = list_entry(pos->member.prev, typeof(*pos), member);	\
-	     &pos->member != (head);	\
-	     pos = list_entry(pos->member.prev, typeof(*pos), member))
-
-/**
- * list_for_each_entry_from - iterate over list of given type from the current point
- * @pos:	the type * to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Iterate over list of given type, continuing from current position.
- */
-#define list_for_each_entry_from(pos, head, member) 			\
-	for (; &pos->member != (head);	\
-	     pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @pos:	the type * to use as a loop cursor.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry_safe(pos, n, head, member)			\
-	for (pos = list_entry((head)->next, typeof(*pos), member),	\
-		n = list_entry(pos->member.next, typeof(*pos), member);	\
-	     &pos->member != (head); 					\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_entry_safe_continue
- * @pos:	the type * to use as a loop cursor.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Iterate over list of given type, continuing after current point,
- * safe against removal of list entry.
- */
-#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
-	for (pos = list_entry(pos->member.next, typeof(*pos), member), 		\
-		n = list_entry(pos->member.next, typeof(*pos), member);		\
-	     &pos->member != (head);						\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_entry_safe_from
- * @pos:	the type * to use as a loop cursor.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Iterate over list of given type from current point, safe against
- * removal of list entry.
- */
-#define list_for_each_entry_safe_from(pos, n, head, member) 			\
-	for (n = list_entry(pos->member.next, typeof(*pos), member);		\
-	     &pos->member != (head);						\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_entry_safe_reverse
- * @pos:	the type * to use as a loop cursor.
- * @n:		another type * to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- *
- * Iterate backwards over list of given type, safe against removal
- * of list entry.
- */
-#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
-	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
-		n = list_entry(pos->member.prev, typeof(*pos), member);	\
-	     &pos->member != (head); 					\
-	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
-
-/*
- * Double linked lists with a single pointer list head.
- * Mostly useful for hash tables where the two pointer list head is
- * too wasteful.
- * You lose the ability to access the tail in O(1).
- */
-
-struct hlist_head {
-	struct hlist_node *first;
-};
-
-struct hlist_node {
-	struct hlist_node *next, **pprev;
-};
-
-#define HLIST_HEAD_INIT { .first = NULL }
-#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
-#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
-static inline void INIT_HLIST_NODE(struct hlist_node *h)
-{
-	h->next = NULL;
-	h->pprev = NULL;
-}
-
-static inline int hlist_unhashed(const struct hlist_node *h)
-{
-	return !h->pprev;
-}
-
-static inline int hlist_empty(const struct hlist_head *h)
-{
-	return !h->first;
-}
-
-static inline void __hlist_del(struct hlist_node *n)
-{
-	struct hlist_node *next = n->next;
-	struct hlist_node **pprev = n->pprev;
-	*pprev = next;
-	if (next)
-		next->pprev = pprev;
-}
-
-static inline void hlist_del(struct hlist_node *n)
-{
-	__hlist_del(n);
-	n->next = NULL;
-	n->pprev = NULL;
-}
-
-static inline void hlist_del_init(struct hlist_node *n)
-{
-	if (!hlist_unhashed(n)) {
-		__hlist_del(n);
-		INIT_HLIST_NODE(n);
-	}
-}
-
-
-static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
-{
-	struct hlist_node *first = h->first;
-	n->next = first;
-	if (first)
-		first->pprev = &n->next;
-	h->first = n;
-	n->pprev = &h->first;
-}
-
-
-/* next must be != NULL */
-static inline void hlist_add_before(struct hlist_node *n,
-					struct hlist_node *next)
-{
-	n->pprev = next->pprev;
-	n->next = next;
-	next->pprev = &n->next;
-	*(n->pprev) = n;
-}
-
-static inline void hlist_add_after(struct hlist_node *n,
-					struct hlist_node *next)
-{
-	next->next = n->next;
-	n->next = next;
-	next->pprev = &n->next;
-
-	if(next->next)
-		next->next->pprev  = &next->next;
-}
-
-#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
-
-#define hlist_for_each(pos, head) \
-	for (pos = (head)->first; pos; pos = pos->next)
-
-#define hlist_for_each_safe(pos, n, head) \
-	for (pos = (head)->first; pos; pos = n)
-
-/**
- * hlist_for_each_entry	- iterate over list of given type
- * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct hlist_node to use as a loop cursor.
- * @head:	the head for your list.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry(tpos, pos, head, member)			 \
-	for (pos = (head)->first; pos &&				 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = pos->next)
-
-/**
- * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
- * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct hlist_node to use as a loop cursor.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_continue(tpos, pos, member)		\
-	for (pos = (pos)->next; pos &&					\
-	     ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;});   \
-	     pos = pos->next)
-
-/**
- * hlist_for_each_entry_from - iterate over a hlist continuing from current point
- * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct hlist_node to use as a loop cursor.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_from(tpos, pos, member)			 \
-	for (; pos &&			 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = pos->next)
-
-/**
- * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct hlist_node to use as a loop cursor.
- * @n:		another &struct hlist_node to use as temporary storage
- * @head:	the head for your list.
- * @member:	the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
-	for (pos = (head)->first;					 \
-	     pos && ({ n = pos->next; 1; }) && 				 \
-		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-	     pos = n)
-
-#endif
diff --git a/package/wprobe/src/user/wprobe-lib.c b/package/wprobe/src/user/wprobe-lib.c
deleted file mode 100644
index 7a5460bb0..000000000
--- a/package/wprobe/src/user/wprobe-lib.c
+++ /dev/null
@@ -1,1210 +0,0 @@
-/*
- * wprobe.c: Wireless probe user space library
- * Copyright (C) 2008-2009 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#define _ISOC99_SOURCE
-#define _BSD_SOURCE
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <stdbool.h>
-#include <math.h>
-#include <linux/wprobe.h>
-#include <netlink/netlink.h>
-#include <netlink/attr.h>
-#include <netlink/genl/genl.h>
-#ifndef NO_LOCAL_ACCESS 
-#include <netlink/genl/ctrl.h>
-#include <netlink/genl/family.h>
-#include <endian.h>
-#endif
-#include "wprobe.h"
-
-#define DEBUG 1
-#ifdef DEBUG
-#define DPRINTF(fmt, ...) fprintf(stderr, "%s(%d): " fmt, __func__, __LINE__, ##__VA_ARGS__)
-#else
-#define DPRINTF(fmt, ...) do {} while (0)
-#endif
-
-#if defined(BYTE_ORDER) && !defined(__BYTE_ORDER)
-#define __LITTLE_ENDIAN LITTLE_ENDIAN
-#define __BIG_ENDIAN BIG_ENDIAN
-#define __BYTE_ORDER BYTE_ORDER
-#endif
-
-#ifndef __BYTE_ORDER
-#error Unknown endian type
-#endif
-
-#define WPROBE_MAX_MSGLEN	65536
-
-static inline __u16 __swab16(__u16 x)
-{
-	return x<<8 | x>>8;
-}
-
-static inline __u32 __swab32(__u32 x)
-{
-	return x<<24 | x>>24 |
-		(x & (__u32)0x0000ff00UL)<<8 |
-		(x & (__u32)0x00ff0000UL)>>8;
-}
-
-static inline __u64 __swab64(__u64 x)
-{
-	return x<<56 | x>>56 |
-		(x & (__u64)0x000000000000ff00ULL)<<40 |
-		(x & (__u64)0x0000000000ff0000ULL)<<24 |
-		(x & (__u64)0x00000000ff000000ULL)<< 8 |
-		(x & (__u64)0x000000ff00000000ULL)>> 8 |
-		(x & (__u64)0x0000ff0000000000ULL)>>24 |
-		(x & (__u64)0x00ff000000000000ULL)>>40;
-}
-
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define SWAP16(var) var = __swab16(var)
-#define SWAP32(var) var = __swab32(var)
-#define SWAP64(var) var = __swab64(var)
-#else
-#define SWAP16(var) do {} while(0)
-#define SWAP32(var) do {} while(0)
-#define SWAP64(var) do {} while(0)
-#endif
-
-int wprobe_port = 17990;
-static struct nlattr *tb[WPROBE_ATTR_LAST+1];
-static struct nla_policy attribute_policy[WPROBE_ATTR_LAST+1] = {
-	[WPROBE_ATTR_ID] = { .type = NLA_U32 },
-	[WPROBE_ATTR_MAC] = { .type = NLA_UNSPEC, .minlen = 6, .maxlen = 6 },
-	[WPROBE_ATTR_NAME] = { .type = NLA_STRING },
-	[WPROBE_ATTR_FLAGS] = { .type = NLA_U32 },
-	[WPROBE_ATTR_TYPE] = { .type = NLA_U8 },
-	[WPROBE_ATTR_FLAGS] = { .type = NLA_U32 },
-	[WPROBE_VAL_S8] = { .type = NLA_U8 },
-	[WPROBE_VAL_S16] = { .type = NLA_U16 },
-	[WPROBE_VAL_S32] = { .type = NLA_U32 },
-	[WPROBE_VAL_S64] = { .type = NLA_U64 },
-	[WPROBE_VAL_U8] = { .type = NLA_U8 },
-	[WPROBE_VAL_U16] = { .type = NLA_U16 },
-	[WPROBE_VAL_U32] = { .type = NLA_U32 },
-	[WPROBE_VAL_U64] = { .type = NLA_U64 },
-	[WPROBE_VAL_SUM] = { .type = NLA_U64 },
-	[WPROBE_VAL_SUM_SQ] = { .type = NLA_U64 },
-	[WPROBE_VAL_SAMPLES] = { .type = NLA_U32 },
-	[WPROBE_VAL_SCALE_TIME] = { .type = NLA_U64 },
-	[WPROBE_ATTR_INTERVAL] = { .type = NLA_U64 },
-	[WPROBE_ATTR_SAMPLES_MIN] = { .type = NLA_U32 },
-	[WPROBE_ATTR_SAMPLES_MAX] = { .type = NLA_U32 },
-	[WPROBE_ATTR_SAMPLES_SCALE_M] = { .type = NLA_U32 },
-	[WPROBE_ATTR_SAMPLES_SCALE_D] = { .type = NLA_U32 },
-	[WPROBE_ATTR_FILTER_GROUP] = { .type = NLA_NESTED },
-	[WPROBE_ATTR_RXCOUNT] = { .type = NLA_U64 },
-	[WPROBE_ATTR_TXCOUNT] = { .type = NLA_U64 },
-};
-
-typedef int (*wprobe_cb_t)(struct nl_msg *, void *);
-
-struct wprobe_iface_ops {
-	int (*send_msg)(struct wprobe_iface *dev, struct nl_msg *msg, wprobe_cb_t cb, void *arg);
-	void (*free)(struct wprobe_iface *dev);
-};
-
-struct wprobe_attr_cb {
-	struct list_head *list;
-	char *addr;
-};
-
-#define WPROBE_MAGIC_STR "WPROBE"
-struct wprobe_init_hdr {
-	struct {
-		char magic[sizeof(WPROBE_MAGIC_STR)];
-
-		/* protocol version */
-		uint8_t version;
-
-		/* extra header length (unused for now) */
-		uint16_t extra;
-	} pre __attribute__((packed));
-	union {
-		struct {
-			uint16_t genl_family;
-		} v0 __attribute__((packed));
-	};
-} __attribute__((packed));
-
-struct wprobe_msg_hdr {
-	__u16 status;
-	__u16 error;
-	__u32 len;
-};
-
-enum wprobe_resp_status {
-	WPROBE_MSG_DONE = 0,
-	WPROBE_MSG_DATA = 1,
-};
-
-static inline void
-wprobe_swap_msg_hdr(struct wprobe_msg_hdr *mhdr)
-{
-	SWAP16(mhdr->status);
-	SWAP16(mhdr->error);
-	SWAP32(mhdr->len);
-}
-
-static int
-save_attribute_handler(struct nl_msg *msg, void *arg)
-{
-	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
-	const char *name = "N/A";
-	struct wprobe_attribute *attr;
-	int type = 0;
-	struct wprobe_attr_cb *cb = arg;
-
-	nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0),
-			genlmsg_attrlen(gnlh, 0), attribute_policy);
-
-	if (tb[WPROBE_ATTR_NAME])
-		name = nla_data(tb[WPROBE_ATTR_NAME]);
-
-	attr = malloc(sizeof(struct wprobe_attribute) + strlen(name) + 1);
-	if (!attr)
-		return -1;
-
-	memset(attr, 0, sizeof(struct wprobe_attribute));
-
-	if (tb[WPROBE_ATTR_ID])
-		attr->id = nla_get_u32(tb[WPROBE_ATTR_ID]);
-
-	if (tb[WPROBE_ATTR_MAC] && cb->addr)
-		memcpy(cb->addr, nla_data(tb[WPROBE_ATTR_MAC]), 6);
-
-	if (tb[WPROBE_ATTR_FLAGS])
-		attr->flags = nla_get_u32(tb[WPROBE_ATTR_FLAGS]);
-
-	if (tb[WPROBE_ATTR_TYPE])
-		type = nla_get_u8(tb[WPROBE_ATTR_TYPE]);
-
-	if ((type < WPROBE_VAL_STRING) ||
-		(type > WPROBE_VAL_U64))
-		type = 0;
-
-	attr->type = type;
-	strcpy(attr->name, name);
-	INIT_LIST_HEAD(&attr->list);
-	list_add(&attr->list, cb->list);
-	return 0;
-}
-
-static struct nl_msg *
-wprobe_new_msg(struct wprobe_iface *dev, int cmd, bool dump)
-{
-	struct nl_msg *msg;
-	uint32_t flags = 0;
-
-	msg = nlmsg_alloc_size(65536);
-	if (!msg)
-		return NULL;
-
-	if (dump)
-		flags |= NLM_F_DUMP;
-
-	genlmsg_put(msg, 0, 0, dev->genl_family,
-			0, flags, cmd, 0);
-
-	NLA_PUT_STRING(msg, WPROBE_ATTR_INTERFACE, dev->ifname);
-nla_put_failure:
-	return msg;
-}
-
-
-static int
-dump_attributes(struct wprobe_iface *dev, bool link, struct list_head *list, char *addr)
-{
-	struct nl_msg *msg;
-	struct wprobe_attr_cb cb;
-
-	cb.list = list;
-	cb.addr = addr;
-	msg = wprobe_new_msg(dev, WPROBE_CMD_GET_LIST, true);
-	if (!msg)
-		return -ENOMEM;
-
-	if (link)
-		NLA_PUT(msg, WPROBE_ATTR_MAC, 6, "\x00\x00\x00\x00\x00\x00");
-
-	return dev->ops->send_msg(dev, msg, save_attribute_handler, &cb);
-
-nla_put_failure:
-	nlmsg_free(msg);
-	return -EINVAL;
-}
-
-static struct wprobe_iface *
-wprobe_alloc_dev(void)
-{
-	struct wprobe_iface *dev;
-
-	dev = malloc(sizeof(struct wprobe_iface));
-	if (!dev)
-		return NULL;
-
-	memset(dev, 0, sizeof(struct wprobe_iface));
-
-	dev->interval = -1;
-	dev->scale_min = -1;
-	dev->scale_max = -1;
-	dev->scale_m = -1;
-	dev->scale_d = -1;
-	dev->sockfd = -1;
-
-	INIT_LIST_HEAD(&dev->global_attr);
-	INIT_LIST_HEAD(&dev->link_attr);
-	INIT_LIST_HEAD(&dev->links);
-	return dev;
-}
-
-static int
-wprobe_init_dev(struct wprobe_iface *dev)
-{
-	dump_attributes(dev, false, &dev->global_attr, NULL);
-	dump_attributes(dev, true, &dev->link_attr, NULL);
-	return 0;
-}
-
-#ifndef NO_LOCAL_ACCESS 
-static int n_devs = 0;
-static struct nl_sock *handle = NULL;
-static struct nl_cache *cache = NULL;
-static struct genl_family *family = NULL;
-
-static int
-error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err, void *arg)
-{
-	int *ret = arg;
-	*ret = err->error;
-	return NL_STOP;
-}
-
-static int
-finish_handler(struct nl_msg *msg, void *arg)
-{
-	int *ret = arg;
-	*ret = 0;
-	return NL_SKIP;
-}
-
-static int
-ack_handler(struct nl_msg *msg, void *arg)
-{
-	int *ret = arg;
-	*ret = 0;
-	return NL_STOP;
-}
-
-static void
-wprobe_local_free(struct wprobe_iface *dev)
-{
-	/* should not happen */
-	if (n_devs == 0)
-		return;
-
-	if (--n_devs != 0)
-		return;
-
-	if (cache)
-		nl_cache_free(cache);
-	if (handle)
-		nl_socket_free(handle);
-	handle = NULL;
-	cache = NULL;
-}
-
-static int
-wprobe_local_init(void)
-{
-	int ret;
-
-	if (n_devs++ > 0)
-		return 0;
-
-	handle = nl_socket_alloc();
-	if (!handle) {
-		DPRINTF("Failed to create handle\n");
-		goto err;
-	}
-
-	if (genl_connect(handle)) {
-		DPRINTF("Failed to connect to generic netlink\n");
-		goto err;
-	}
-
-	ret = genl_ctrl_alloc_cache(handle, &cache);
-	if (ret < 0) {
-		DPRINTF("Failed to allocate netlink cache\n");
-		goto err;
-	}
-
-	family = genl_ctrl_search_by_name(cache, "wprobe");
-	if (!family) {
-		DPRINTF("wprobe API not present\n");
-		goto err;
-	}
-	return 0;
-
-err:
-	wprobe_local_free(NULL);
-	return -EINVAL;
-}
-
-
-static int
-wprobe_local_send_msg(struct wprobe_iface *dev, struct nl_msg *msg, wprobe_cb_t callback, void *arg)
-{
-	struct nl_cb *cb;
-	int err = 0;
-
-	cb = nl_cb_alloc(NL_CB_DEFAULT);
-	if (!cb)
-		goto out_no_cb;
-
-	if (callback)
-		nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, callback, arg);
-
-	err = nl_send_auto_complete(handle, msg);
-	if (err < 0)
-		goto out;
-
-	err = 1;
-
-	nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &err);
-	nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err);
-	nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &err);
-
-	while (err > 0)
-		nl_recvmsgs(handle, cb);
-
-out:
-	nl_cb_put(cb);
-out_no_cb:
-	nlmsg_free(msg);
-	return err;
-}
-
-static const struct wprobe_iface_ops wprobe_local_ops = {
-	.send_msg = wprobe_local_send_msg,
-	.free = wprobe_local_free,
-};
-
-struct wprobe_iface *
-wprobe_get_dev(const char *ifname)
-{
-	struct wprobe_iface *dev;
-
-	if (wprobe_local_init() != 0)
-		return NULL;
-
-	dev = wprobe_alloc_dev();
-	if (!dev)
-		goto error_alloc;
-
-	dev->ifname = strdup(ifname);
-	dev->ops = &wprobe_local_ops;
-	dev->genl_family = genl_family_get_id(family);
-
-	if (wprobe_init_dev(dev) < 0)
-		goto error;
-
-	return dev;
-
-error:
-	free(dev);
-error_alloc:
-	wprobe_local_free(NULL);
-	return NULL;
-}
-
-#endif
-
-static void swap_nlmsghdr(struct nlmsghdr *nlh)
-{
-	SWAP32(nlh->nlmsg_len);
-	SWAP16(nlh->nlmsg_type);
-	SWAP16(nlh->nlmsg_flags);
-	SWAP32(nlh->nlmsg_seq);
-	SWAP32(nlh->nlmsg_pid);
-}
-
-static void swap_genlmsghdr(struct genlmsghdr *gnlh)
-{
-#if 0 /* probably unnecessary */
-	SWAP16(gnlh->reserved);
-#endif
-}
-
-static void
-wprobe_swap_nested(void *data, int len, bool outgoing)
-{
-	void *end = data + len;
-
-	while (data < end) {
-		struct nlattr *nla = data;
-		unsigned int type, len;
-
-		if (!outgoing) {
-			SWAP16(nla->nla_len);
-			SWAP16(nla->nla_type);
-
-			/* required for further sanity checks */
-			if (data + nla->nla_len > end)
-				nla->nla_len = end - data;
-		}
-
-		len = NLA_ALIGN(nla->nla_len);
-		type = nla->nla_type & NLA_TYPE_MASK;
-
-		if (type <= WPROBE_ATTR_LAST) {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-			switch(attribute_policy[type].type) {
-			case NLA_U16:
-				SWAP16(*(__u16 *)nla_data(nla));
-				break;
-			case NLA_U32:
-				SWAP32(*(__u32 *)nla_data(nla));
-				break;
-			case NLA_U64:
-				SWAP64(*(__u64 *)nla_data(nla));
-				break;
-			case NLA_NESTED:
-				wprobe_swap_nested(nla_data(nla), nla_len(nla), outgoing);
-				break;
-			}
-#endif
-		}
-		data += len;
-
-		if (outgoing) {
-			SWAP16(nla->nla_len);
-			SWAP16(nla->nla_type);
-		}
-		if (!nla->nla_len)
-			break;
-	}
-}
-
-static struct nl_msg *
-wprobe_msg_from_network(int socket, int len)
-{
-	struct genlmsghdr *gnlh;
-	struct nlmsghdr *nlh;
-	struct nl_msg *msg;
-	void *data;
-
-	msg = nlmsg_alloc_size(len + 32);
-	if (!msg)
-		return NULL;
-
-	nlh = nlmsg_hdr(msg);
-	if (read(socket, nlh, len) != len)
-		goto free;
-
-	swap_nlmsghdr(nlh);
-	if (nlh->nlmsg_len > len)
-		goto free;
-
-	gnlh = nlmsg_data(nlh);
-	swap_genlmsghdr(gnlh);
-
-	data = genlmsg_data(gnlh);
-	wprobe_swap_nested(data, genlmsg_len(gnlh), false);
-
-	return msg;
-free:
-	nlmsg_free(msg);
-	return NULL;
-}
-
-static int
-wprobe_msg_to_network(int socket, struct nl_msg *msg)
-{
-	struct nlmsghdr *nlh = nlmsg_hdr(msg);
-	struct wprobe_msg_hdr mhdr;
-	struct genlmsghdr *gnlh;
-	void *buf, *data;
-	int buflen, datalen;
-	int ret;
-
-	buflen = nlh->nlmsg_len;
-	buf = malloc(buflen);
-	if (!buf)
-		return -ENOMEM;
-
-	memset(&mhdr, 0, sizeof(mhdr));
-	mhdr.status = WPROBE_MSG_DATA;
-	mhdr.len = buflen;
-	wprobe_swap_msg_hdr(&mhdr);
-	ret = write(socket, &mhdr, sizeof(mhdr));
-	if (ret < 0)
-		goto out;
-
-	memcpy(buf, nlh, buflen);
-	nlh = buf;
-	gnlh = nlmsg_data(nlh);
-	data = genlmsg_data(gnlh);
-	datalen = genlmsg_len(gnlh);
-
-	wprobe_swap_nested(data, datalen, true);
-	swap_genlmsghdr(gnlh);
-	swap_nlmsghdr(nlh);
-	ret = write(socket, buf, buflen);
-
-out:
-	free(buf);
-
-	return ret;
-}
-
-static int
-wprobe_remote_send_msg(struct wprobe_iface *dev, struct nl_msg *msg, wprobe_cb_t callback, void *arg)
-{
-	struct wprobe_msg_hdr mhdr;
-	int msgs = 0;
-
-	wprobe_msg_to_network(dev->sockfd, msg);
-	nlmsg_free(msg);
-	do {
-		if (read(dev->sockfd, &mhdr, sizeof(mhdr)) != sizeof(mhdr)) {
-			DPRINTF("Failed to read response header\n");
-			return -1;
-		}
-		wprobe_swap_msg_hdr(&mhdr);
-
-		switch(mhdr.status) {
-		case WPROBE_MSG_DATA:
-			if (mhdr.len > WPROBE_MAX_MSGLEN) {
-				fprintf(stderr, "Invalid length in received response message.\n");
-				exit(1);
-			}
-
-			msg = wprobe_msg_from_network(dev->sockfd, mhdr.len);
-			if (!msg)
-				return -EINVAL;
-
-			msgs++;
-			callback(msg, arg);
-			nlmsg_free(msg);
-			break;
-		}
-	} while (mhdr.status != WPROBE_MSG_DONE);
-
-	if (mhdr.error)
-		return -mhdr.error;
-	else
-		return msgs;
-}
-
-
-static void
-wprobe_socket_dev_free(struct wprobe_iface *dev)
-{
-	if (dev->sockfd >= 0)
-		close(dev->sockfd);
-}
-
-static const struct wprobe_iface_ops wprobe_remote_ops = {
-	.send_msg = wprobe_remote_send_msg,
-	.free = wprobe_socket_dev_free,
-};
-
-
-#ifndef NO_LOCAL_ACCESS 
-int
-wprobe_server_init(int socket)
-{
-	struct wprobe_init_hdr hdr;
-	int ret;
-
-	ret = wprobe_local_init();
-	if (ret != 0)
-		return ret;
-
-	memset(&hdr, 0, sizeof(hdr));
-	memcpy(hdr.pre.magic, WPROBE_MAGIC_STR, sizeof(WPROBE_MAGIC_STR));
-	hdr.pre.version = 0;
-	hdr.v0.genl_family = genl_family_get_id(family);
-	SWAP16(hdr.v0.genl_family);
-	write(socket, (unsigned char *)&hdr, sizeof(hdr));
-
-	return 0;
-}
-
-static int
-wprobe_server_cb(struct nl_msg *msg, void *arg)
-{
-	int *socket = arg;
-	int ret;
-
-	ret = wprobe_msg_to_network(*socket, msg);
-	if (ret > 0)
-		ret = 0;
-
-	return ret;
-}
-
-
-int
-wprobe_server_handle(int socket)
-{
-	struct wprobe_msg_hdr mhdr;
-	struct nl_msg *msg;
-	int ret;
-
-	ret = read(socket, &mhdr, sizeof(mhdr));
-	if (ret != sizeof(mhdr)) {
-		if (ret <= 0)
-			return -1;
-
-		DPRINTF("Failed to read request header\n");
-		return -EINVAL;
-	}
-	wprobe_swap_msg_hdr(&mhdr);
-
-	switch(mhdr.status) {
-	case WPROBE_MSG_DATA:
-		if (mhdr.len > WPROBE_MAX_MSGLEN) {
-			DPRINTF("Invalid length in received response message.\n");
-			return -EINVAL;
-		}
-		msg = wprobe_msg_from_network(socket, mhdr.len);
-		break;
-	default:
-		DPRINTF("Invalid request header type\n");
-		return -ENOENT;
-	}
-
-	if (!msg) {
-		DPRINTF("Failed to get message\n");
-		return -EINVAL;
-	}
-
-	ret = wprobe_local_send_msg(NULL, msg, wprobe_server_cb, &socket);
-
-	memset(&mhdr, 0, sizeof(mhdr));
-	mhdr.status = WPROBE_MSG_DONE;
-	if (ret < 0)
-		mhdr.error = (uint16_t) -ret;
-
-	ret = write(socket, (unsigned char *)&mhdr, sizeof(mhdr));
-	if (ret > 0)
-		ret = 0;
-
-	return ret;
-}
-
-void
-wprobe_server_done(void)
-{
-	wprobe_local_free(NULL);
-}
-#endif
-
-struct wprobe_iface *
-wprobe_get_from_socket(int socket, const char *name)
-{
-	struct wprobe_iface *dev;
-	struct wprobe_init_hdr hdr;
-
-	dev = wprobe_alloc_dev();
-	if (!dev)
-		goto out;
-
-	dev->ops = &wprobe_remote_ops;
-	dev->sockfd = socket;
-	dev->ifname = strdup(name);
-
-	/* read version and header length */
-	if (read(socket, &hdr.pre, sizeof(hdr.pre)) != sizeof(hdr.pre)) {
-		DPRINTF("Could not read header\n");
-		goto error;
-	}
-
-	/* magic not found */
-	if (memcmp(hdr.pre.magic, WPROBE_MAGIC_STR, sizeof(hdr.pre.magic)) != 0) {
-		DPRINTF("Magic does not match\n");
-		goto error;
-	}
-
-	/* unsupported version */
-	if (hdr.pre.version != 0) {
-		DPRINTF("Protocol version does not match\n");
-		goto error;
-	}
-
-	if (read(socket, &hdr.v0, sizeof(hdr.v0)) != sizeof(hdr.v0)) {
-		DPRINTF("Could not read header data\n");
-		goto error;
-	}
-
-	SWAP16(hdr.pre.extra);
-	SWAP16(hdr.v0.genl_family);
-	dev->genl_family = hdr.v0.genl_family;
-
-	if (wprobe_init_dev(dev) < 0) {
-		DPRINTF("Could not initialize device\n");
-		goto error;
-	}
-
-out:
-	return dev;
-
-error:
-	wprobe_free_dev(dev);
-	return NULL;
-}
-
-struct wprobe_iface *
-wprobe_get_auto(const char *arg, char **err)
-{
-	static struct sockaddr_in sa;
-	static char errbuf[512];
-
-	struct wprobe_iface *dev = NULL;
-	struct hostent *h;
-	char *devstr = strdup(arg);
-	char *sep = NULL;
-	int sock = -1;
-	int len;
-
-	if (err)
-		*err = NULL;
-
-	sep = strchr(devstr, ':');
-	if (!sep) {
-#ifndef NO_LOCAL_ACCESS 
-		free(devstr);
-		return wprobe_get_dev(arg);
-#else
-		if (err)
-			*err = "Invalid argument";
-		goto out;
-#endif
-	}
-
-	*sep = 0;
-	sep++;
-
-	sock = socket(AF_INET, SOCK_STREAM, 0);
-	if (sock < 0)
-		goto syserr;
-
-	h = gethostbyname(devstr);
-	if (!h) {
-		sprintf(errbuf, "Host not found");
-		goto out_err;
-	}
-
-	memcpy(&sa.sin_addr, h->h_addr, h->h_length);
-	sa.sin_family = AF_INET;
-	sa.sin_port = htons(wprobe_port);
-	if (connect(sock, (struct sockaddr *)&sa, sizeof(sa)) < 0)
-		goto syserr;
-
-	dev = wprobe_get_from_socket(sock, sep);
-	if (!dev) {
-		sprintf(errbuf, "wprobe connection initialization failed");
-		goto out_err;
-	}
-	goto out;
-
-syserr:
-	if (err) {
-		strcpy(errbuf, "Connection failed: ");
-		len = strlen(errbuf);
-		strerror_r(errno, errbuf + len, sizeof(errbuf) - len - 1);
-	}
-out_err:
-	if (err)
-		*err = errbuf;
-	if (sock >= 0)
-		close(sock);
-out:
-	if (devstr)
-		free(devstr);
-	return dev;
-}
-
-static void
-free_attr_list(struct list_head *list)
-{
-	struct wprobe_attribute *attr, *tmp;
-
-	list_for_each_entry_safe(attr, tmp, list, list) {
-		list_del(&attr->list);
-		free(attr);
-	}
-}
-
-void
-wprobe_free_dev(struct wprobe_iface *dev)
-{
-	if (dev->ops->free)
-		dev->ops->free(dev);
-	free_attr_list(&dev->global_attr);
-	free_attr_list(&dev->link_attr);
-	free((void *)dev->ifname);
-	free(dev);
-}
-
-static struct wprobe_link *
-get_link(struct list_head *list, const char *addr)
-{
-	struct wprobe_link *l;
-
-	list_for_each_entry(l, list, list) {
-		if (!memcmp(l->addr, addr, 6)) {
-			list_del_init(&l->list);
-			goto out;
-		}
-	}
-
-	/* no previous link found, allocate a new one */
-	l = malloc(sizeof(struct wprobe_link));
-	if (!l)
-		goto out;
-
-	memset(l, 0, sizeof(struct wprobe_link));
-	memcpy(l->addr, addr, sizeof(l->addr));
-	INIT_LIST_HEAD(&l->list);
-
-out:
-	return l;
-}
-
-struct wprobe_save_cb {
-	struct list_head *list;
-	struct list_head old_list;
-};
-
-static int
-save_link_handler(struct nl_msg *msg, void *arg)
-{
-	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
-	struct wprobe_link *link;
-	struct wprobe_save_cb *cb = arg;
-	const char *addr;
-
-	nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0),
-			genlmsg_attrlen(gnlh, 0), attribute_policy);
-
-	if (!tb[WPROBE_ATTR_MAC] || (nla_len(tb[WPROBE_ATTR_MAC]) != 6))
-		return -1;
-
-	addr = nla_data(tb[WPROBE_ATTR_MAC]);
-	link = get_link(&cb->old_list, addr);
-	if (!link)
-		return -1;
-
-	if (tb[WPROBE_ATTR_FLAGS])
-		link->flags = nla_get_u32(tb[WPROBE_ATTR_FLAGS]);
-
-	list_add_tail(&link->list, cb->list);
-	return 0;
-}
-
-
-int
-wprobe_update_links(struct wprobe_iface *dev)
-{
-	struct wprobe_link *l, *tmp;
-	struct nl_msg *msg;
-	struct wprobe_save_cb cb;
-	int err;
-
-	INIT_LIST_HEAD(&cb.old_list);
-	list_splice_init(&dev->links, &cb.old_list);
-	cb.list = &dev->links;
-
-	msg = wprobe_new_msg(dev, WPROBE_CMD_GET_LINKS, true);
-	if (!msg)
-		return -ENOMEM;
-
-	err = dev->ops->send_msg(dev, msg, save_link_handler, &cb);
-	if (err < 0)
-		return err;
-
-	list_for_each_entry_safe(l, tmp, &cb.old_list, list) {
-		list_del(&l->list);
-		free(l);
-	}
-
-	return 0;
-}
-
-
-struct wprobe_filter_data
-{
-	wprobe_filter_cb cb;
-	void *arg;
-	struct wprobe_filter_item *buf;
-	int buflen;
-};
-
-static int
-dump_filter_handler(struct nl_msg *msg, void *arg)
-{
-	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
-	struct wprobe_filter_data *data = arg;
-	struct nlattr *p;
-	const char *name;
-	int count = 0;
-	int len;
-
-	nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0),
-			genlmsg_attrlen(gnlh, 0), attribute_policy);
-
-	if (!tb[WPROBE_ATTR_NAME] || !tb[WPROBE_ATTR_FILTER_GROUP])
-		return -1;
-
-	name = nla_data(tb[WPROBE_ATTR_NAME]);
-	nla_for_each_nested(p, tb[WPROBE_ATTR_FILTER_GROUP], len) {
-		count++;
-	}
-
-	if (data->buflen < count) {
-		if (data->buf)
-			free(data->buf);
-		data->buflen = count;
-		data->buf = malloc(sizeof(struct wprobe_filter_item) * count);
-		memset(data->buf, 0, sizeof(struct wprobe_filter_item) * count);
-	}
-
-	count = 0;
-	nla_for_each_nested(p, tb[WPROBE_ATTR_FILTER_GROUP], len) {
-		struct wprobe_filter_item *fi;
-
-		nla_parse(tb, WPROBE_ATTR_LAST, nla_data(p),
-				nla_len(p), attribute_policy);
-
-		if (!tb[WPROBE_ATTR_NAME] || !tb[WPROBE_ATTR_RXCOUNT]
-				|| !tb[WPROBE_ATTR_TXCOUNT])
-			continue;
-
-		fi = &data->buf[count++];
-		strncpy(fi->name, nla_data(tb[WPROBE_ATTR_NAME]), sizeof(fi->name) - 1);
-		fi->name[sizeof(fi->name) - 1] = 0;
-		fi->rx = nla_get_u64(tb[WPROBE_ATTR_RXCOUNT]);
-		fi->tx = nla_get_u64(tb[WPROBE_ATTR_TXCOUNT]);
-	}
-	data->cb(data->arg, name, data->buf, count);
-
-	return 0;
-}
-
-int
-wprobe_dump_filters(struct wprobe_iface *dev, wprobe_filter_cb cb, void *arg)
-{
-	struct wprobe_filter_data data;
-	struct nl_msg *msg;
-	int err;
-
-	data.buf = 0;
-	data.buflen = 0;
-	data.cb = cb;
-	data.arg = arg;
-
-	msg = wprobe_new_msg(dev, WPROBE_CMD_GET_FILTER, true);
-	if (!msg)
-		return -ENOMEM;
-
-	err = dev->ops->send_msg(dev, msg, dump_filter_handler, &data);
-	if (err < 0)
-		return err;
-
-	return 0;
-}
-
-int
-wprobe_apply_config(struct wprobe_iface *dev)
-{
-	struct nl_msg *msg;
-
-	msg = wprobe_new_msg(dev, WPROBE_CMD_CONFIG, false);
-	if (!msg)
-		return -ENOMEM;
-
-	if (dev->interval >= 0)
-		NLA_PUT_MSECS(msg, WPROBE_ATTR_INTERVAL, dev->interval);
-
-	if (dev->filter_len < 0) {
-		NLA_PUT(msg, WPROBE_ATTR_FILTER, 0, NULL);
-		dev->filter_len = 0;
-	} else if (dev->filter && dev->filter_len > 0) {
-		NLA_PUT(msg, WPROBE_ATTR_FILTER, dev->filter_len, dev->filter);
-	}
-	dev->filter = NULL;
-
-	dev->ops->send_msg(dev, msg, NULL, NULL);
-	return 0;
-
-nla_put_failure:
-	nlmsg_free(msg);
-	return -ENOMEM;
-}
-
-int
-wprobe_measure(struct wprobe_iface *dev)
-{
-	struct nl_msg *msg;
-
-	msg = wprobe_new_msg(dev, WPROBE_CMD_MEASURE, false);
-	if (!msg)
-		return -ENOMEM;
-
-	dev->ops->send_msg(dev, msg, NULL, NULL);
-	return 0;
-}
-
-struct wprobe_request_cb {
-	struct list_head *list;
-	struct list_head old_list;
-	char *addr;
-};
-
-static int
-save_attrdata_handler(struct nl_msg *msg, void *arg)
-{
-	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
-	struct wprobe_request_cb *cb = arg;
-	struct wprobe_attribute *attr;
-	int type, id;
-
-	nla_parse(tb, WPROBE_ATTR_LAST, genlmsg_attrdata(gnlh, 0),
-			genlmsg_attrlen(gnlh, 0), attribute_policy);
-
-	if (!tb[WPROBE_ATTR_ID])
-		return -1;
-
-	if (!tb[WPROBE_ATTR_TYPE])
-		return -1;
-
-	id = nla_get_u32(tb[WPROBE_ATTR_ID]);
-	list_for_each_entry(attr, &cb->old_list, list) {
-		if (attr->id == id)
-			goto found;
-	}
-	/* not found */
-	return -1;
-
-found:
-	list_del_init(&attr->list);
-
-	type = nla_get_u8(tb[WPROBE_ATTR_TYPE]);
-	if (type != attr->type) {
-		DPRINTF("WARNING: type mismatch for %s attribute '%s' (%d != %d)\n",
-			(cb->addr ? "link" : "global"),
-			attr->name,
-			type, attr->type);
-		goto out;
-	}
-
-	if ((type < WPROBE_VAL_STRING) ||
-		(type > WPROBE_VAL_U64))
-		goto out;
-
-	memset(&attr->val, 0, sizeof(attr->val));
-
-#define HANDLE_INT_TYPE(_idx, _type) \
-	case WPROBE_VAL_S##_type: \
-	case WPROBE_VAL_U##_type: \
-		attr->val.U##_type = nla_get_u##_type(tb[_idx]); \
-		break
-
-	switch(type) {
-		HANDLE_INT_TYPE(type, 8);
-		HANDLE_INT_TYPE(type, 16);
-		HANDLE_INT_TYPE(type, 32);
-		HANDLE_INT_TYPE(type, 64);
-		case WPROBE_VAL_STRING:
-			/* unimplemented */
-			break;
-	}
-#undef HANDLE_TYPE
-
-	if (attr->flags & WPROBE_F_KEEPSTAT) {
-		if (tb[WPROBE_VAL_SUM])
-			attr->val.s = nla_get_u64(tb[WPROBE_VAL_SUM]);
-
-		if (tb[WPROBE_VAL_SUM_SQ])
-			attr->val.ss = nla_get_u64(tb[WPROBE_VAL_SUM_SQ]);
-
-		if (tb[WPROBE_VAL_SAMPLES])
-			attr->val.n = nla_get_u32(tb[WPROBE_VAL_SAMPLES]);
-
-		if (attr->val.n > 0) {
-			float avg = ((float) attr->val.s) / attr->val.n;
-			float stdev = sqrt((((float) attr->val.ss) / attr->val.n) - (avg * avg));
-			if (isnan(stdev))
-				stdev = 0.0f;
-			if (isnan(avg))
-				avg = 0.0f;
-			attr->val.avg = avg;
-			attr->val.stdev = stdev;
-		}
-	}
-
-out:
-	list_add_tail(&attr->list, cb->list);
-	return 0;
-}
-
-
-int
-wprobe_request_data(struct wprobe_iface *dev, const unsigned char *addr)
-{
-	struct wprobe_request_cb cb;
-	struct list_head *attrs;
-	struct nl_msg *msg;
-	int err;
-
-	msg = wprobe_new_msg(dev, WPROBE_CMD_GET_INFO, true);
-	if (!msg)
-		return -ENOMEM;
-
-	if (addr) {
-		attrs = &dev->link_attr;
-		NLA_PUT(msg, WPROBE_ATTR_MAC, 6, addr);
-	} else {
-		attrs = &dev->global_attr;
-	}
-
-	INIT_LIST_HEAD(&cb.old_list);
-	list_splice_init(attrs, &cb.old_list);
-	cb.list = attrs;
-
-	err = dev->ops->send_msg(dev, msg, save_attrdata_handler, &cb);
-	list_splice(&cb.old_list, attrs->prev);
-	return err;
-
-nla_put_failure:
-	nlmsg_free(msg);
-	return -ENOMEM;
-}
-
-
diff --git a/package/wprobe/src/user/wprobe-util.c b/package/wprobe/src/user/wprobe-util.c
deleted file mode 100644
index 654442f9c..000000000
--- a/package/wprobe/src/user/wprobe-util.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * wprobe-test.c: Wireless probe user space test code
- * Copyright (C) 2008-2009 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <stdint.h>
-#include <getopt.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#include <linux/wprobe.h>
-#include "wprobe.h"
-
-static bool simple_mode = false;
-
-static const char *
-wprobe_dump_value(struct wprobe_attribute *attr)
-{
-	static char buf[128];
-
-#define HANDLE_TYPE(_type, _format) \
-	case WPROBE_VAL_##_type: \
-		snprintf(buf, sizeof(buf), _format, attr->val._type); \
-		break
-
-	switch(attr->type) {
-		HANDLE_TYPE(S8, "%d");
-		HANDLE_TYPE(S16, "%d");
-		HANDLE_TYPE(S32, "%d");
-		HANDLE_TYPE(S64, "%lld");
-		HANDLE_TYPE(U8, "%d");
-		HANDLE_TYPE(U16, "%d");
-		HANDLE_TYPE(U32, "%d");
-		HANDLE_TYPE(U64, "%lld");
-		case WPROBE_VAL_STRING:
-			/* FIXME: implement this */
-		default:
-			strncpy(buf, "<unknown>", sizeof(buf));
-			break;
-	}
-	if ((attr->flags & WPROBE_F_KEEPSTAT) &&
-		(attr->val.n > 0)) {
-		int len = strlen(buf);
-		if (simple_mode)
-			snprintf(buf + len, sizeof(buf) - len, ";%.02f;%.02f;%d;%lld;%lld", attr->val.avg, attr->val.stdev, attr->val.n, attr->val.s, attr->val.ss);
-		else
-			snprintf(buf + len, sizeof(buf) - len, " (avg: %.02f; stdev: %.02f, n=%d)", attr->val.avg, attr->val.stdev, attr->val.n);
-	}
-#undef HANDLE_TYPE
-
-	return buf;
-}
-
-
-static void
-wprobe_dump_data(struct wprobe_iface *dev)
-{
-	struct wprobe_attribute *attr;
-	struct wprobe_link *link;
-	bool first = true;
-
-	if (!simple_mode)
-		fprintf(stdout, "\n");
-	wprobe_request_data(dev, NULL);
-	list_for_each_entry(attr, &dev->global_attr, list) {
-		if (simple_mode) {
-			if (first)
-				fprintf(stdout, "[global]\n");
-			fprintf(stdout, "%s=%s\n", attr->name, wprobe_dump_value(attr));
-		} else {
-			fprintf(stdout, (first ?
-				"Global:            %s=%s\n" :
-				"                   %s=%s\n"),
-				attr->name,
-				wprobe_dump_value(attr)
-			);
-		}
-		first = false;
-	}
-
-	list_for_each_entry(link, &dev->links, list) {
-		first = true;
-		wprobe_request_data(dev, link->addr);
-		list_for_each_entry(attr, &dev->link_attr, list) {
-			if (first) {
-				fprintf(stdout,
-					(simple_mode ?
-					 "[%02x:%02x:%02x:%02x:%02x:%02x]\n%s=%s\n" :
-					 "%02x:%02x:%02x:%02x:%02x:%02x: %s=%s\n"),
-					link->addr[0], link->addr[1], link->addr[2],
-					link->addr[3], link->addr[4], link->addr[5],
-					attr->name,
-					wprobe_dump_value(attr));
-				first = false;
-			} else {
-				fprintf(stdout,
-					(simple_mode ? "%s=%s\n" :
-					 "                   %s=%s\n"),
-					attr->name,
-					wprobe_dump_value(attr));
-			}
-		}
-	}
-	fflush(stdout);
-}
-
-static const char *attr_typestr[] = {
-	[0] = "Unknown",
-	[WPROBE_VAL_STRING] = "String",
-	[WPROBE_VAL_U8] = "Unsigned 8 bit",
-	[WPROBE_VAL_U16] = "Unsigned 16 bit",
-	[WPROBE_VAL_U32] = "Unsigned 32 bit",
-	[WPROBE_VAL_U64] = "Unsigned 64 bit",
-	[WPROBE_VAL_S8] = "Signed 8 bit",
-	[WPROBE_VAL_S16] = "Signed 16 bit",
-	[WPROBE_VAL_S32] = "Signed 32 bit",
-	[WPROBE_VAL_S64] = "Signed 64 bit",
-};
-
-static int usage(const char *prog)
-{
-	fprintf(stderr,
-#ifndef NO_LOCAL_ACCESS
-		"Usage: %s <interface>|<host>:<device>|-P [options]\n"
-#else
-		"Usage: %s <host>:<device> [options]\n"
-#endif
-		"\n"
-		"Options:\n"
-		"  -a:            Print attributes\n"
-		"  -c:            Only apply configuration\n"
-		"  -d:            Delay between measurement dumps (in milliseconds, default: 1000)\n"
-		"                 A value of 0 (zero) prints once and exits; useful for scripts\n"
-		"  -f:            Dump contents of layer 2 filter counters during measurement\n"
-		"  -F <file>:     Apply layer 2 filters from <file>\n"
-		"  -h:            This help text\n"
-		"  -i <interval>: Set measurement interval\n"
-		"  -m:            Run measurement loop\n"
-		"  -p:            Set the TCP port for server/client (default: 17990)\n"
-#ifndef NO_LOCAL_ACCESS
-		"  -P:            Run in proxy mode (listen on network)\n"
-#endif
-		"\n"
-		, prog);
-	exit(1);
-}
-
-static void show_attributes(struct wprobe_iface *dev)
-{
-	struct wprobe_attribute *attr;
-	if (simple_mode)
-		return;
-	list_for_each_entry(attr, &dev->global_attr, list) {
-		fprintf(stdout, "Global attribute: '%s' (%s)\n",
-			attr->name, attr_typestr[attr->type]);
-	}
-	list_for_each_entry(attr, &dev->link_attr, list) {
-		fprintf(stdout, "Link attribute: '%s' (%s)\n",
-			attr->name, attr_typestr[attr->type]);
-	}
-}
-
-static void show_filter_simple(void *arg, const char *group, struct wprobe_filter_item *items, int n_items)
-{
-	int i;
-
-	fprintf(stdout, "[filter:%s]\n", group);
-	for (i = 0; i < n_items; i++) {
-		fprintf(stdout, "%s=%lld;%lld\n",
-			items[i].name, items[i].tx, items[i].rx);
-	}
-	fflush(stdout);
-}
-
-
-static void show_filter(void *arg, const char *group, struct wprobe_filter_item *items, int n_items)
-{
-	int i;
-	fprintf(stdout, "Filter group: '%s' (tx/rx)\n", group);
-	for (i = 0; i < n_items; i++) {
-		fprintf(stdout, " - %s (%lld/%lld)\n",
-			items[i].name, items[i].tx, items[i].rx);
-	}
-}
-
-static void loop_measurement(struct wprobe_iface *dev, bool print_filters, unsigned long delay)
-{
-	do {
-		wprobe_update_links(dev);
-		wprobe_dump_data(dev);
-		if (print_filters)
-			wprobe_dump_filters(dev, simple_mode ? show_filter_simple : show_filter, NULL);
-		usleep(delay * 1000);
-	}
-	while (delay);
-}
-
-static void set_filter(struct wprobe_iface *dev, const char *filename)
-{
-	unsigned char *buf = NULL;
-	unsigned int buflen = 0;
-	unsigned int len = 0;
-	int fd;
-
-	/* clear filter */
-	if (filename[0] == 0) {
-		dev->filter_len = -1;
-		return;
-	}
-
-	fd = open(filename, O_RDONLY);
-	if (fd < 0) {
-		perror("open filter");
-		return;
-	}
-
-	do {
-		int rlen;
-
-		if (!buf) {
-			len = 0;
-			buflen = 1024;
-			buf = malloc(1024);
-		} else {
-			buflen *= 2;
-			buf = realloc(buf, buflen);
-		}
-		rlen = read(fd, buf + len, buflen - len);
-		if (rlen < 0)
-			break;
-
-		len += rlen;
-	} while (len == buflen);
-
-	dev->filter = buf;
-	dev->filter_len = len;
-	close(fd);
-}
-
-#ifndef NO_LOCAL_ACCESS
-
-static void sigchld_handler(int s)
-{
-	while (waitpid(-1, NULL, WNOHANG) > 0);
-}
-
-static int run_proxy(int port)
-{
-	struct sockaddr_in sa;
-	struct sigaction sig;
-	int v = 1;
-	int s;
-
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s < 0) {
-		perror("socket");
-		return 1;
-	}
-
-	sig.sa_handler = sigchld_handler;  // Signal Handler fuer Zombie Prozesse
-	sigemptyset(&sig.sa_mask);
-	sig.sa_flags = SA_RESTART;
-	sigaction(SIGCHLD, &sig, NULL);
-
-	memset(&sa, 0, sizeof(sa));
-	sa.sin_family = AF_INET;
-	sa.sin_addr.s_addr = htonl(INADDR_ANY);
-	sa.sin_port = htons(wprobe_port);
-
-	setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &v, sizeof(v));
-	if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
-		perror("bind");
-		return 1;
-	}
-	if (listen(s, 10)) {
-		perror("listen");
-		return 1;
-	}
-	while(1) {
-		unsigned int addrlen = sizeof(struct sockaddr_in);
-		int ret, c;
-
-		c = accept(s, (struct sockaddr *)&sa, &addrlen);
-		if (c < 0) {
-			if (errno == EINTR)
-				continue;
-
-			perror("accept");
-			return 1;
-		}
-		if (fork() == 0) {
-			/* close server socket, stdin, stdout, stderr */
-			close(s);
-			close(0);
-			close(1);
-			close(2);
-
-			wprobe_server_init(c);
-			do {
-				ret = wprobe_server_handle(c);
-			} while (ret >= 0);
-			wprobe_server_done();
-			close(c);
-			exit(0);
-		}
-		close(c);
-	}
-
-	return 0;
-}
-#endif
-
-int main(int argc, char **argv)
-{
-	struct wprobe_iface *dev = NULL;
-	const char *ifname;
-	const char *prog = argv[0];
-	char *err = NULL;
-	enum {
-		CMD_NONE,
-		CMD_CONFIG,
-		CMD_MEASURE,
-		CMD_PROXY,
-	} cmd = CMD_NONE;
-	const char *filter = NULL;
-	bool print_attributes = false;
-	bool print_filters = false;
-	unsigned long delay = 1000;
-	int interval = -1;
-	int ch;
-
-	if (argc < 2)
-		return usage(prog);
-
-#ifndef NO_LOCAL_ACCESS
-	if (!strcmp(argv[1], "-P")) {
-		while ((ch = getopt(argc - 1, argv + 1, "p:")) != -1) {
-			switch(ch) {
-			case 'p':
-				/* set port */
-				wprobe_port = strtoul(optarg, NULL, 0);
-				break;
-			default:
-				return usage(prog);
-			}
-		}
-		return run_proxy(wprobe_port);
-	}
-#endif
-
-	if (argv[1][0] == '-')
-		return usage(prog);
-
-	ifname = argv[1];
-	argv++;
-	argc--;
-
-	while ((ch = getopt(argc, argv, "acd:fF:hi:msp:")) != -1) {
-		switch(ch) {
-		case 'a':
-			print_attributes = true;
-			break;
-		case 'c':
-			cmd = CMD_CONFIG;
-			break;
-		case 'd':
-			delay = strtoul(optarg, NULL, 10);
-			break;
-		case 'm':
-			cmd = CMD_MEASURE;
-			break;
-		case 'i':
-			interval = strtoul(optarg, NULL, 10);
-			break;
-		case 'f':
-			print_filters = true;
-			break;
-		case 'F':
-			if (filter) {
-				fprintf(stderr, "Cannot set multiple filters\n");
-				return usage(prog);
-			}
-			filter = optarg;
-			break;
-		case 's':
-			simple_mode = true;
-			break;
-		case 'p':
-			/* set port */
-			wprobe_port = strtoul(optarg, NULL, 0);
-			break;
-		case 'h':
-		default:
-			usage(prog);
-			break;
-		}
-	}
-
-	dev = wprobe_get_auto(ifname, &err);
-	if (!dev || (list_empty(&dev->global_attr) &&
-		list_empty(&dev->link_attr))) {
-		if (err)
-			fprintf(stdout, "%s\n", err);
-		else
-			fprintf(stderr, "Interface '%s' not found\n", ifname);
-		return 1;
-	}
-
-	if (filter || interval >= 0) {
-		if (filter)
-			set_filter(dev, filter);
-		if (interval >= 0)
-			dev->interval = interval;
-
-		wprobe_apply_config(dev);
-	}
-
-	if (cmd != CMD_CONFIG) {
-		if (print_attributes)
-			show_attributes(dev);
-	}
-	if (cmd == CMD_MEASURE)
-		loop_measurement(dev, print_filters, delay);
-
-	wprobe_free_dev(dev);
-
-	return 0;
-}
diff --git a/package/wprobe/src/user/wprobe.h b/package/wprobe/src/user/wprobe.h
deleted file mode 100644
index 706facc80..000000000
--- a/package/wprobe/src/user/wprobe.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * wprobe.h: Wireless probe user space library
- * Copyright (C) 2008-2009 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __WPROBE_USER_H
-#define __WPROBE_USER_H
-#include <inttypes.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include "list.h"
-
-/**
- * struct wprobe_value: data structure for attribute values
- * @STRING: string value (currently unsupported)
- * @U8: unsigned 8-bit integer value
- * @U16: unsigned 16-bit integer value
- * @U32: unsigned 32-bit integer value
- * @U64: unsigned 64-bit integer value
- * @S8: signed 8-bit integer value
- * @S16: signed 16-bit integer value
- * @S32: signed 32-bit integer value
- * @S64: signed 64-bit integer value
- *
- * @n: number of sample values 
- * @avg: average value
- * @stdev: standard deviation
- * @s: sum of all sample values (internal use)
- * @ss: sum of all sample values squared (internal use)
- */
-struct wprobe_value {
-	/* attribute value */
-	union {
-		const char *STRING;
-		uint8_t U8;
-		uint16_t U16;
-		uint32_t U32;
-		uint64_t U64;
-		int8_t S8;
-		int16_t S16;
-		int32_t S32;
-		int64_t S64;
-	};
-	/* statistics */
-	int64_t s, ss;
-	float avg, stdev;
-	unsigned int n;
-};
-
-/**
- * struct wprobe_attribute: data structures for attribute descriptions
- * @list: linked list data structure for a list of attributes
- * @id: attribute id
- * @type: netlink type for the attribute (see kernel api documentation)
- * @flags: attribute flags (see kernel api documentation)
- * @val: cached version of the last netlink query, will be overwritten on each request
- * @name: attribute name
- */
-struct wprobe_attribute {
-	struct list_head list;
-	int id;
-	int type;
-	uint32_t flags;
-	struct wprobe_value val;
-	char name[];
-};
-
-/**
- * struct wprobe_link: data structure for the link description
- * @list: linked list data structure for a list of links 
- * @flags: link flags (see kernel api documentation)
- * @addr: mac address of the remote link partner
- */
-struct wprobe_link {
-	struct list_head list;
-	uint32_t flags;
-	unsigned char addr[6];
-};
-
-struct wprobe_filter_item {
-	char name[32];
-	uint64_t rx;
-	uint64_t tx;
-};
-
-struct wprobe_iface_ops;
-struct wprobe_iface {
-	const struct wprobe_iface_ops *ops;
-
-	int sockfd;
-	const char *ifname;
-	unsigned int genl_family;
-	char addr[6];
-
-	struct list_head global_attr;
-	struct list_head link_attr;
-	struct list_head links;
-
-	/* config */
-	int interval;
-	int scale_min;
-	int scale_max;
-	int scale_m;
-	int scale_d;
-
-	/* filter */
-	void *filter;
-
-	/* filter_len:
-	 *   set to -1 to drop the current filter
-	 *   automatically reset to 0 after config apply
-	 */
-	int filter_len;
-};
-
-typedef void (*wprobe_filter_cb)(void *arg, const char *group, struct wprobe_filter_item *items, int n_items);
-extern int wprobe_port;
-
-/**
- * wprobe_update_links: get a list of all link partners
- * @dev: wprobe device structure
- * @list: linked list for storing link descriptions
- *
- * when wprobe_update_links is called multiple times, the linked list 
- * is updated with new link partners, old entries are automatically expired
- */
-extern int wprobe_update_links(struct wprobe_iface *dev);
-
-/**
- * wprobe_dump_filters: dump all layer 2 filter counters
- * @dev: wprobe device structure
- * @cb: callback (called once per filter group)
- * @arg: user argument for the callback
- */
-extern int wprobe_dump_filters(struct wprobe_iface *dev, wprobe_filter_cb cb, void *arg);
-
-/**
- * wprobe_measure: start a measurement request for all global attributes
- * @dev: wprobe device structure
- *
- * not all attributes are automatically filled with data, since for some
- * it may be desirable to control the sampling interval from user space
- * you can use this function to do that.
- */
-extern int wprobe_measure(struct wprobe_iface *dev);
-
-/**
- * wprobe_get_dev: get a handle to a local wprobe device
- * @ifname: name of the wprobe interface
- *
- * queries the wprobe interface for all attributes
- * must be freed with wprobe_free_dev
- */
-extern struct wprobe_iface *wprobe_get_dev(const char *ifname);
-
-/**
- * wprobe_get_auto: get a handle to a local or remote wprobe device
- * @arg: pointer to the wprobe device, either <dev> (local) or <host>:<dev> (remote)
- */
-extern struct wprobe_iface *wprobe_get_auto(const char *arg, char **err);
-
-/**
- * wprobe_get_dev: free all device information
- * @dev: wprobe device structure
- */
-extern void wprobe_free_dev(struct wprobe_iface *dev);
-
-/**
- * wprobe_apply_config: apply configuration data
- * @dev: wprobe device structure
- *
- * uploads all configuration values from @dev that are not set to -1
- */
-extern int wprobe_apply_config(struct wprobe_iface *dev);
-
-/**
- * wprobe_request_data: request new sampling values for the given list of attributes
- * @dev: wprobe device structure
- * @addr: (optional) mac address of the link partner
- *
- * if addr is unset, global values are stored in the global attributes list
- * if addr is set, per-link values for the given address are stored in the link attributes list
- */
-extern int wprobe_request_data(struct wprobe_iface *dev, const unsigned char *addr);
-
-/**
- * wprobe_server_init: send a wprobe server init message to a server's client socket
- * @socket: socket of the connection to the client
- */
-extern int wprobe_server_init(int socket);
-
-/**
- * wprobe_server_handle: read a request from the client socket, process it, send the response
- * @socket: socket of the connection to the client
- */
-extern int wprobe_server_handle(int socket);
-
-/**
- * wprobe_server_done: release memory allocated for the server connection
- */
-extern void wprobe_server_done(void);
-
-#endif