KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wprobe: use libnl-tiny instead of libnl

Browse source 
SVN-Revision: 15632
This commit is contained in:
Felix Fietkau 2009-05-06 11:51:16 +00:00
parent b48047bd01
commit 23d3e5ad03
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package/wprobe/Makefile
View file

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=wprobe PKG_NAME:=wprobe
PKG_VERSION:=1 PKG_VERSION:=1
PKG_BUILD_DEPENDS:=libnl PACKAGE_wprobe-export:libipfix PKG_BUILD_DEPENDS:=PACKAGE_wprobe-export:libipfix
PKG_CONFIG_DEPENDS = \ PKG_CONFIG_DEPENDS = \
CONFIG_PACKAGE_kmod-wprobe \ CONFIG_PACKAGE_kmod-wprobe \
@ -33,7 +33,7 @@ endef
define Package/wprobe-info define Package/wprobe-info
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+kmod-wprobe DEPENDS:=+kmod-wprobe +libnl-tiny
TITLE:=Wireless measurement utility TITLE:=Wireless measurement utility
endef endef
@ -45,7 +45,7 @@ endef
define Package/wprobe-export define Package/wprobe-export
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+kmod-wprobe DEPENDS:=+kmod-wprobe +libnl-tiny
TITLE:=Wireless measurement data exporter TITLE:=Wireless measurement data exporter
endef endef
@ -59,7 +59,9 @@ define Build/Prepare
$(CP) src/* $(PKG_BUILD_DIR)/ $(CP) src/* $(PKG_BUILD_DIR)/
endef endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include/libnl-tiny \
-I$(STAGING_DIR)/usr/include
ifdef CONFIG_PACKAGE_kmod-wprobe ifdef CONFIG_PACKAGE_kmod-wprobe
define Build/Compile/kmod define Build/Compile/kmod
@ -80,7 +82,7 @@ define Build/Compile/lib
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel" \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
LIBNL="$(STAGING_DIR)/usr/lib/libnl.a" LIBNL="-lnl-tiny"
endef endef
ifdef CONFIG_PACKAGE_wprobe-export ifdef CONFIG_PACKAGE_wprobe-export
@ -90,7 +92,7 @@ ifdef CONFIG_PACKAGE_wprobe-export
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libmisc.a $(STAGING_DIR)/usr/lib/libnl.a -lm" LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libmisc.a -lnl-tiny -lm"
endef endef
endif endif

12
package/wprobe/src/user/wprobe.c
View file

@ -35,7 +35,7 @@
#define DPRINTF(fmt, ...) do {} while (0) #define DPRINTF(fmt, ...) do {} while (0)
#endif #endif
static struct nl_handle *handle = NULL; static struct nl_sock *handle = NULL;
static struct nl_cache *cache = NULL; static struct nl_cache *cache = NULL;
static struct genl_family *family = NULL; static struct genl_family *family = NULL;
static struct nlattr *tb[WPROBE_ATTR_LAST+1]; static struct nlattr *tb[WPROBE_ATTR_LAST+1];
@ -89,7 +89,7 @@ wprobe_free(void)
if (cache) if (cache)
nl_cache_free(cache); nl_cache_free(cache);
if (handle) if (handle)
nl_handle_destroy(handle); nl_socket_free(handle);
handle = NULL; handle = NULL;
cache = NULL; cache = NULL;
} }
@ -97,7 +97,9 @@ wprobe_free(void)
int int
wprobe_init(void) wprobe_init(void)
{ {
handle = nl_handle_alloc(); int ret;
handle = nl_socket_alloc();
if (!handle) { if (!handle) {
DPRINTF("Failed to create handle\n"); DPRINTF("Failed to create handle\n");
goto err; goto err;
@ -108,8 +110,8 @@ wprobe_init(void)
goto err; goto err;
} }
cache = genl_ctrl_alloc_cache(handle); ret = genl_ctrl_alloc_cache(handle, &cache);
if (!cache) { if (ret < 0) {
DPRINTF("Failed to allocate netlink cache\n"); DPRINTF("Failed to allocate netlink cache\n");
goto err; goto err;
} }