diff options
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 20 | ||||
| -rw-r--r-- | plugins/netlink.c | 85 | 
4 files changed, 112 insertions, 2 deletions
| diff --git a/acinclude.m4 b/acinclude.m4 index 07572bb7..5aed6526 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -138,6 +138,12 @@ AC_DEFUN([AC_PATH_USB], [  		AC_DEFINE(NEED_USB_INTERRUPT_READ, 1, [Define to 1 if you need the usb_interrupt_read() function.]))  ]) +AC_DEFUN([AC_PATH_NETLINK], [ +	PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no) +	AC_SUBST(NETLINK_CFLAGS) +	AC_SUBST(NETLINK_LIBS) +]) +  AC_DEFUN([AC_PATH_SNDFILE], [  	PKG_CHECK_MODULES(SNDFILE, sndfile, sndfile_found=yes, sndfile_found=no)  	AC_SUBST(SNDFILE_CFLAGS) @@ -149,6 +155,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [  	debug_enable=no  	pie_enable=no  	sndfile_enable=${sndfile_found} +	netlink_enable=${netlink_found}  	usb_enable=${usb_found}  	alsa_enable=${alsa_found}  	glib_enable=no @@ -336,6 +343,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [  	AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])  	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") +	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")  	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")  	AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes")  	AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") diff --git a/configure.in b/configure.in index 824e7a27..3fdde2d9 100644 --- a/configure.in +++ b/configure.in @@ -31,6 +31,7 @@ AC_PATH_DBUS  AC_PATH_ALSA  AC_PATH_GSTREAMER  AC_PATH_USB +AC_PATH_NETLINK  AC_PATH_SNDFILE  AC_ARG_BLUEZ diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 6f07b99a..2a3212e1 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,7 +1,13 @@  plugindir = $(libdir)/bluetooth/plugins -plugin_LTLIBRARIES = libstorage.la +if NETLINK +netlink_plugins = libnetlink.la +else +netlink_plugins = +endif + +plugin_LTLIBRARIES = libstorage.la $(netlink_plugins)  libstorage_la_SOURCES = storage.c @@ -9,16 +15,24 @@ noinst_LTLIBRARIES = libecho.la  libecho_la_SOURCES = echo.c +if NETLINK +libnetlink_la_SOURCES = netlink.c + +libnetlink_la_LIBADD = @NETLINK_LIBS@ +endif +  AM_LDFLAGS = -module -avoid-version -no-undefined \  			-export-symbols-regex bluetooth_plugin_desc -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ @NETLINK_CFLAGS@  INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/hcid  MAINTAINERCLEANFILES = Makefile.in  all-local: +	@$(LN_S) -f $(top_srcdir)/plugins/.libs/libstorage.so +	@$(LN_S) -f $(top_srcdir)/plugins/.libs/libnetlink.so  	@$(LN_S) -f $(top_srcdir)/input/.libs/libinput.so  	@$(LN_S) -f $(top_srcdir)/audio/.libs/libaudio.so  	@$(LN_S) -f $(top_srcdir)/serial/.libs/libserial.so @@ -29,3 +43,5 @@ clean-local:  	@rm -f libserial.so  	@rm -f libaudio.so  	@rm -f libinput.so +	@rm -f libnetlink.so +	@rm -f libstorage.so diff --git a/plugins/netlink.c b/plugins/netlink.c new file mode 100644 index 00000000..e1b1bb96 --- /dev/null +++ b/plugins/netlink.c @@ -0,0 +1,85 @@ +/* + * + *  BlueZ - Bluetooth protocol stack for Linux + * + *  Copyright (C) 2004-2008  Marcel Holtmann <marcel@holtmann.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. + * + *  You should have received a copy of the GNU General Public License + *  along with this program; if not, write to the Free Software + *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <errno.h> + +#include <netlink/netlink.h> +#include <netlink/genl/genl.h> +#include <netlink/genl/ctrl.h> +#include <netlink/genl/family.h> + +#include <bluetooth/bluetooth.h> + +#include "plugin.h" +#include "logging.h" + +static struct nl_handle *handle; +static struct nl_cache *cache; +static struct genl_family *family; + +static int netlink_init(void) +{ +	info("Starting experimental netlink support"); + +	handle = nl_handle_alloc(); +	if (!handle) { +		error("Failed to allocate netlink handle"); +		return -ENOMEM; +	} + +	if (genl_connect(handle) < 0) { +		error("Failed to connect to generic netlink"); +		nl_handle_destroy(handle); +		return -ENOLINK; +	} + +	cache = genl_ctrl_alloc_cache(handle); +	if (!cache) { +		error("Failed to allocate generic netlink cache"); +		return -ENOMEM; +		nl_handle_destroy(handle); +	} + +	family = genl_ctrl_search_by_name(cache, "bluetooth"); +	if (!family) { +		error("Failed to find Bluetooth netlink family"); +		nl_cache_free(cache); +		nl_handle_destroy(handle); +		return -ENOENT; +	} + +	return 0; +} + +static void netlink_exit(void) +{ +	nl_handle_destroy(handle); +	nl_cache_free(cache); +	nl_handle_destroy(handle); +} + +BLUETOOTH_PLUGIN_DEFINE("netlink", netlink_init, netlink_exit) | 
