diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | sap/main.c | 55 | ||||
| -rw-r--r-- | sap/manager.c | 93 | ||||
| -rw-r--r-- | sap/manager.h | 22 | ||||
| -rw-r--r-- | sap/server.c | 48 | ||||
| -rw-r--r-- | sap/server.h | 26 |
7 files changed, 257 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 025f6d392..49c45c149 100644 --- a/Makefile.am +++ b/Makefile.am @@ -143,6 +143,13 @@ audio_libtelephony_a_SOURCES = audio/telephony.h audio/telephony-dummy.c \ audio/telephony-maemo6.c endif +if SAPPLUGIN +builtin_modules += sap +builtin_sources += sap/main.c \ + sap/manager.h sap/manager.c \ + sap/server.h sap/server.c +endif + if INPUTPLUGIN builtin_modules += input builtin_sources += input/main.c \ diff --git a/acinclude.m4 b/acinclude.m4 index a8171a14f..d07418f3a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -185,6 +185,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ input_enable=yes serial_enable=yes network_enable=yes + sap_enable=no service_enable=yes health_enable=no pnat_enable=no @@ -221,6 +222,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ network_enable=${enableval} ]) + AC_ARG_ENABLE(sap, AC_HELP_STRING([--enable-sap], [enable sap plugin]), [ + sap_enable=${enableval} + ]) + AC_ARG_ENABLE(serial, AC_HELP_STRING([--disable-serial], [disable serial plugin]), [ serial_enable=${enableval} ]) @@ -362,6 +367,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(INPUTPLUGIN, test "${input_enable}" = "yes") AM_CONDITIONAL(SERIALPLUGIN, test "${serial_enable}" = "yes") AM_CONDITIONAL(NETWORKPLUGIN, test "${network_enable}" = "yes") + AM_CONDITIONAL(SAPPLUGIN, test "${sap_enable}" = "yes") AM_CONDITIONAL(SERVICEPLUGIN, test "${service_enable}" = "yes") AM_CONDITIONAL(HEALTHPLUGIN, test "${health_enable}" = "yes") AM_CONDITIONAL(MCAP, test "${health_enable}" = "yes") diff --git a/sap/main.c b/sap/main.c new file mode 100644 index 000000000..c9c90bd23 --- /dev/null +++ b/sap/main.c @@ -0,0 +1,55 @@ +/* + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2010 Instituto Nokia de Tecnologia - INdT + * + * 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 <gdbus.h> +#include "plugin.h" +#include "manager.h" + +static DBusConnection *connection; + +static int sap_init(void) +{ + connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); + + if (!connection) + return -EIO; + + if (sap_manager_init(connection) < 0) { + dbus_connection_unref(connection); + return -EIO; + } + + return 0; +} + +static void sap_exit(void) +{ + sap_manager_exit(); + + dbus_connection_unref(connection); +} + +BLUETOOTH_PLUGIN_DEFINE(sap, VERSION, + BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, sap_init, sap_exit) diff --git a/sap/manager.c b/sap/manager.c new file mode 100644 index 000000000..a97f43485 --- /dev/null +++ b/sap/manager.c @@ -0,0 +1,93 @@ +/* + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2010 Instituto Nokia de Tecnologia - INdT + * + * 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 <bluetooth/bluetooth.h> +#include <bluetooth/hci.h> +#include <bluetooth/sdp.h> +#include <bluetooth/sdp_lib.h> + +#include <gdbus.h> + +#include "log.h" +#include "adapter.h" +#include "device.h" + +#include "manager.h" +#include "server.h" + +static DBusConnection *connection = NULL; + +static int sap_server_probe(struct btd_adapter *adapter) +{ + const char *path = adapter_get_path(adapter); + bdaddr_t src; + + DBG("path %s", path); + + adapter_get_address(adapter, &src); + + return sap_server_register(path, &src); +} + +static void sap_server_remove(struct btd_adapter *adapter) +{ + const char *path = adapter_get_path(adapter); + + DBG("path %s", path); + + sap_server_unregister(path); +} + +static struct btd_adapter_driver sap_server_driver = { + .name = "sap-server", + .probe = sap_server_probe, + .remove = sap_server_remove, +}; + +int sap_manager_init(DBusConnection *conn) +{ + connection = dbus_connection_ref(conn); + + if (sap_server_init(connection) < 0) { + error("Can't init SAP server"); + dbus_connection_unref(conn); + return -1; + } + + btd_register_adapter_driver(&sap_server_driver); + + return 0; +} + +void sap_manager_exit(void) +{ + btd_unregister_adapter_driver(&sap_server_driver); + + dbus_connection_unref(connection); + connection = NULL; + + sap_server_exit(); +} diff --git a/sap/manager.h b/sap/manager.h new file mode 100644 index 000000000..e08c882c4 --- /dev/null +++ b/sap/manager.h @@ -0,0 +1,22 @@ +/* + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2010 Instituto Nokia de Tecnologia - INdT + * + * 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 + */ + +int sap_manager_init(DBusConnection *conn); +void sap_manager_exit(void); diff --git a/sap/server.c b/sap/server.c new file mode 100644 index 000000000..27287789d --- /dev/null +++ b/sap/server.c @@ -0,0 +1,48 @@ +/* + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2010 ST-Ericsson SA + * + * Author: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> for ST-Ericsson. + * + * 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; version 2 of the License. + * + * 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 + */ + +#include "bluetooth.h" +#include "log.h" + +#include "server.h" + +int sap_server_register(const char *path, bdaddr_t *src) +{ + DBG("Register SAP server."); + return 0; +} + +int sap_server_unregister(const char *path) +{ + DBG("Unregister SAP server."); + return 0; +} + +int sap_server_init(DBusConnection *conn) +{ + DBG("Init SAP server."); + return 0; +} + +void sap_server_exit(void) +{ + DBG("Exit SAP server."); +} diff --git a/sap/server.h b/sap/server.h new file mode 100644 index 000000000..ef2b7b894 --- /dev/null +++ b/sap/server.h @@ -0,0 +1,26 @@ +/* + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2010 ST-Ericsson SA + * + * 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 + */ + +#include <gdbus.h> + +int sap_server_init(DBusConnection *conn); +void sap_server_exit(void); +int sap_server_register(const char *path, bdaddr_t *src); +int sap_server_unregister(const char *path); |