diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-06 11:51:16 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-06 11:51:16 +0000 |
| commit | 6f2c5c53e8bd71563c3968bf0c81f4d8a388e687 (patch) | |
| tree | 62f4911b894aa3ce7e05540999a6b9ba87748d8e /package/wprobe | |
| parent | ee5bdf5fc89064099baf34062693835772b25671 (diff) | |
wprobe: use libnl-tiny instead of libnl
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15632 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/wprobe')
| -rw-r--r-- | package/wprobe/Makefile | 14 | ||||
| -rw-r--r-- | package/wprobe/src/user/wprobe.c | 12 |
2 files changed, 15 insertions, 11 deletions
diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile index cea23d2a3..7b49b6598 100644 --- a/package/wprobe/Makefile +++ b/package/wprobe/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wprobe PKG_VERSION:=1 -PKG_BUILD_DEPENDS:=libnl PACKAGE_wprobe-export:libipfix +PKG_BUILD_DEPENDS:=PACKAGE_wprobe-export:libipfix PKG_CONFIG_DEPENDS = \ CONFIG_PACKAGE_kmod-wprobe \ @@ -33,7 +33,7 @@ endef define Package/wprobe-info SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-wprobe + DEPENDS:=+kmod-wprobe +libnl-tiny TITLE:=Wireless measurement utility endef @@ -45,7 +45,7 @@ endef define Package/wprobe-export SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-wprobe + DEPENDS:=+kmod-wprobe +libnl-tiny TITLE:=Wireless measurement data exporter endef @@ -59,7 +59,9 @@ define Build/Prepare $(CP) src/* $(PKG_BUILD_DIR)/ 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 define Build/Compile/kmod @@ -80,7 +82,7 @@ define Build/Compile/lib CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel" \ LDFLAGS="$(TARGET_LDFLAGS)" \ - LIBNL="$(STAGING_DIR)/usr/lib/libnl.a" + LIBNL="-lnl-tiny" endef ifdef CONFIG_PACKAGE_wprobe-export @@ -90,7 +92,7 @@ ifdef CONFIG_PACKAGE_wprobe-export CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \ 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 endif diff --git a/package/wprobe/src/user/wprobe.c b/package/wprobe/src/user/wprobe.c index d591207da..1f8df6c7e 100644 --- a/package/wprobe/src/user/wprobe.c +++ b/package/wprobe/src/user/wprobe.c @@ -35,7 +35,7 @@ #define DPRINTF(fmt, ...) do {} while (0) #endif -static struct nl_handle *handle = NULL; +static struct nl_sock *handle = NULL; static struct nl_cache *cache = NULL; static struct genl_family *family = NULL; static struct nlattr *tb[WPROBE_ATTR_LAST+1]; @@ -89,7 +89,7 @@ wprobe_free(void) if (cache) nl_cache_free(cache); if (handle) - nl_handle_destroy(handle); + nl_socket_free(handle); handle = NULL; cache = NULL; } @@ -97,7 +97,9 @@ wprobe_free(void) int wprobe_init(void) { - handle = nl_handle_alloc(); + int ret; + + handle = nl_socket_alloc(); if (!handle) { DPRINTF("Failed to create handle\n"); goto err; @@ -108,8 +110,8 @@ wprobe_init(void) goto err; } - cache = genl_ctrl_alloc_cache(handle); - if (!cache) { + ret = genl_ctrl_alloc_cache(handle, &cache); + if (ret < 0) { DPRINTF("Failed to allocate netlink cache\n"); goto err; } |