From: Daniel Wagner <daniel.wagner(a)bmw-carit.de&gt; --- Makefile.am | 12 +++ bootstrap-configure | 1 + configure.ac | 4 + elect/elect.h | 46 +++++++++ elect/main.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 318 insertions(+), 0 deletions(-) create mode 100644 elect/elect.h create mode 100644 elect/main.c diff --git a/Makefile.am b/Makefile.am index 337aeb7..5b7f5ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -647,6 +647,18 @@ tools_lookup_provider_name_SOURCES = plugins/mbpi.c plugins/mbpi.h \ tools_lookup_provider_name_LDADD = @GLIB_LIBS@ endif +if ELECT + +sbin_PROGRAMS += elect/electd + +elect_electd_SOURCES = $(gdbus_sources) \ + src/log.c src/dbus.c \ + elect/main.c + +elect_electd_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl + +endif + noinst_PROGRAMS += gatchat/gsmdial gatchat/test-server gatchat/test-qcdm gatchat_gsmdial_SOURCES = gatchat/gsmdial.c $(gatchat_sources) diff --git a/bootstrap-configure b/bootstrap-configure index db70c66..d80ed8b 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -14,4 +14,5 @@ fi --localstatedir=/var \ --enable-capng \ --enable-tools \ + --enable-elect \ --disable-datafiles $* diff --git a/configure.ac b/configure.ac index 5e4d34f..f8f3387 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,10 @@ if (test "${enable_tools}" = "yes"); then fi AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes") +AC_ARG_ENABLE(elect, AC_HELP_STRING([--enable-elect], + [enable DUN deamon support]), [enable_elect=${enableval}]) +AM_CONDITIONAL(ELECT, test "${enable_elect}" = "yes") + AC_ARG_ENABLE(atmodem, AC_HELP_STRING([--disable-atmodem], [disable ETSI AT modem support]), [enable_atmodem=${enableval}]) diff --git a/elect/elect.h b/elect/elect.h new file mode 100644 index 0000000..8786240 --- /dev/null +++ b/elect/elect.h @@ -0,0 +1,46 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 Intel Corporation. All rights reserved. + * Copyright (C) 2011 BMW Car IT GmbH. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 <glib.h> + +#define OFONO_API_SUBJECT_TO_CHANGE + +#include <ofono/types.h> + +void __elect_exit(void); + +#include <ofono/log.h> + +int __ofono_log_init(const char *program, const char *debug, + ofono_bool_t detach); +void __ofono_log_cleanup(void); +void __ofono_log_enable(struct ofono_debug_desc *start, + struct ofono_debug_desc *stop); + +#include <ofono/dbus.h> + +#define ELECT_SERVICE "org.ofono.elect" + +int __ofono_dbus_init(DBusConnection *conn); +void __ofono_dbus_cleanup(void); + +void __ofono_dbus_pending_reply(DBusMessage **msg, DBusMessage *reply); diff --git a/elect/main.c b/elect/main.c new file mode 100644 index 0000000..714f8c8 --- /dev/null +++ b/elect/main.c @@ -0,0 +1,255 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 Intel Corporation. All rights reserved. + * Copyright (C) 2011 BMW Car IT GmbH. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <signal.h> +#include <sys/signalfd.h> + +#include <gdbus.h> + +#ifdef HAVE_CAPNG +#include <cap-ng.h> +#endif + +#include "elect.h" + +#define SHUTDOWN_GRACE_SECONDS 10 + +static GMainLoop *event_loop; + +void __elect_exit(void) +{ + g_main_loop_quit(event_loop); +} + +static gboolean quit_eventloop(gpointer user_data) +{ + __elect_exit(); + return FALSE; +} + +static unsigned int __terminated = 0; + +static gboolean signal_handler(GIOChannel *channel, GIOCondition cond, + gpointer user_data) +{ + struct signalfd_siginfo si; + ssize_t result; + int fd; + + if (cond & (G_IO_NVAL | G_IO_ERR | G_IO_HUP)) + return FALSE; + + fd = g_io_channel_unix_get_fd(channel); + + result = read(fd, &si, sizeof(si)); + if (result != sizeof(si)) + return FALSE; + + switch (si.ssi_signo) { + case SIGINT: + case SIGTERM: + if (__terminated == 0) { + ofono_info("Terminating"); + g_timeout_add_seconds(SHUTDOWN_GRACE_SECONDS, + quit_eventloop, NULL); + + quit_eventloop(NULL); + } + + __terminated = 1; + break; + } + + return TRUE; +} + +static guint setup_signalfd(void) +{ + GIOChannel *channel; + guint source; + sigset_t mask; + int fd; + + sigemptyset(&mask); + sigaddset(&mask, SIGINT); + sigaddset(&mask, SIGTERM); + + if (sigprocmask(SIG_BLOCK, &mask, NULL) < 0) { + perror("Failed to set signal mask"); + return 0; + } + + fd = signalfd(-1, &mask, 0); + if (fd < 0) { + perror("Failed to create signal descriptor"); + return 0; + } + + channel = g_io_channel_unix_new(fd); + + g_io_channel_set_close_on_unref(channel, TRUE); + g_io_channel_set_encoding(channel, NULL, NULL); + g_io_channel_set_buffered(channel, FALSE); + + source = g_io_add_watch(channel, + G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL, + signal_handler, NULL); + + g_io_channel_unref(channel); + + return source; +} + +static void system_bus_disconnected(DBusConnection *conn, void *user_data) +{ + ofono_error("System bus has disconnected!"); + + g_main_loop_quit(event_loop); +} + +static gchar *option_debug = NULL; +static gboolean option_detach = TRUE; +static gboolean option_version = FALSE; + +static gboolean parse_debug(const char *key, const char *value, + gpointer user_data, GError **error) +{ + if (value) + option_debug = g_strdup(value); + else + option_debug = g_strdup("*"); + + return TRUE; +} + +static GOptionEntry options[] = { + { "debug", 'd', G_OPTION_FLAG_OPTIONAL_ARG, + G_OPTION_ARG_CALLBACK, parse_debug, + "Specify debug options to enable", "DEBUG" }, + { "nodetach", 'n', G_OPTION_FLAG_REVERSE, + G_OPTION_ARG_NONE, &option_detach, + "Don't run as daemon in background" }, + { "version", 'v', 0, G_OPTION_ARG_NONE, &option_version, + "Show version information and exit" }, + { NULL }, +}; + +int main(int argc, char **argv) +{ + GOptionContext *context; + GError *err = NULL; + DBusConnection *conn; + DBusError error; + guint signal; + +#ifdef HAVE_CAPNG + /* Drop capabilities */ + capng_clear(CAPNG_SELECT_BOTH); + capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, + CAP_NET_BIND_SERVICE, CAP_NET_ADMIN, + CAP_NET_RAW, CAP_SYS_ADMIN, -1); + capng_apply(CAPNG_SELECT_BOTH); +#endif + + context = g_option_context_new(NULL); + g_option_context_add_main_entries(context, options, NULL); + + if (g_option_context_parse(context, &argc, &argv, &err) == FALSE) { + if (err != NULL) { + g_printerr("%s\n", err->message); + g_error_free(err); + return 1; + } + + g_printerr("An unknown error occurred\n"); + return 1; + } + + g_option_context_free(context); + + if (option_version == TRUE) { + printf("%s\n", VERSION); + exit(0); + } + + if (option_detach == TRUE) { + if (daemon(0, 0)) { + perror("Can't start daemon"); + return 1; + } + } + + event_loop = g_main_loop_new(NULL, FALSE); + + signal = setup_signalfd(); + + __ofono_log_init(argv[0], option_debug, option_detach); + + dbus_error_init(&error); + + conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, ELECT_SERVICE, &error); + if (conn == NULL) { + if (dbus_error_is_set(&error) == TRUE) { + ofono_error("Unable to hop onto D-Bus: %s", + error.message); + dbus_error_free(&error); + } else { + ofono_error("Unable to hop onto D-Bus"); + } + + goto cleanup; + } + + g_dbus_set_disconnect_function(conn, system_bus_disconnected, + NULL, NULL); + + __ofono_dbus_init(conn); + + /* + * The reason why this DBG is here is that we have the __stop__debug, + * __start__debug linking symbols in the object. As soon we + * have real DBG we can remove this one again. + */ + DBG(""); + + g_main_loop_run(event_loop); + + __ofono_dbus_cleanup(); + dbus_connection_unref(conn); + +cleanup: + g_source_remove(signal); + + g_main_loop_unref(event_loop); + + __ofono_log_cleanup(); + + return 0; +} -- 1.7.8.110.g4cb5d1

From: Daniel Wagner <daniel.wagner(a)bmw-carit.de&gt; --- Makefile.am | 6 ++++++ elect/elect.conf | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 elect/elect.conf diff --git a/Makefile.am b/Makefile.am index 38e5d90..70ea5de 100644 --- a/Makefile.am +++ b/Makefile.am @@ -657,6 +657,12 @@ elect_electd_SOURCES = $(gdbus_sources) \ elect_electd_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl +if DATAFILES + +dist_dbusconf_DATA += elect/elect.conf + +endif + endif noinst_PROGRAMS += gatchat/gsmdial gatchat/test-server gatchat/test-qcdm diff --git a/elect/elect.conf b/elect/elect.conf new file mode 100644 index 0000000..548ffe8 --- /dev/null +++ b/elect/elect.conf @@ -0,0 +1,23 @@ +<!-- This configuration file specifies the required security policies + for oFono elect (DUN) daemon to work. --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + + <!-- ../system.conf have denied everything, so we just punch some holes --> + + <policy user="root"> + <allow own="org.ofono.elect"/> + <allow send_destination="org.ofono.elect"/> + </policy> + + <policy at_console="true"> + <allow send_destination="org.ofono.elect"/> + </policy> + + <policy context="default"> + <deny send_destination="org.ofono.elect"/> + </policy> + +</busconfig> -- 1.7.8.110.g4cb5d1

From: Daniel Wagner <daniel.wagner(a)bmw-carit.de&gt; --- Makefile.am | 2 +- elect/elect.h | 6 +++ elect/main.c | 9 ++--- elect/manager.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 7 deletions(-) create mode 100644 elect/manager.c diff --git a/Makefile.am b/Makefile.am index 43311b0..628cd0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -653,7 +653,7 @@ sbin_PROGRAMS += elect/electd elect_electd_SOURCES = $(gdbus_sources) \ src/log.c src/dbus.c \ - elect/main.c elect/dbus.c + elect/main.c elect/dbus.c elect/manager.c elect_electd_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl diff --git a/elect/elect.h b/elect/elect.h index 7338c18..8ecd694 100644 --- a/elect/elect.h +++ b/elect/elect.h @@ -39,6 +39,8 @@ void __ofono_log_enable(struct ofono_debug_desc *start, #include <ofono/dbus.h> #define ELECT_SERVICE "org.ofono.elect" +#define ELECT_MANAGER_INTERFACE "org.ofono.elect.Manager" +#define ELECT_MANAGER_PATH "/" int __ofono_dbus_init(DBusConnection *conn); void __ofono_dbus_cleanup(void); @@ -48,3 +50,7 @@ void __ofono_dbus_pending_reply(DBusMessage **msg, DBusMessage *reply); DBusMessage *__elect_error_invalid_args(DBusMessage *msg); DBusMessage *__elect_error_failed(DBusMessage *msg); DBusMessage *__elect_error_connection_refused(DBusMessage *msg); + + +int __elect_manager_init(void); +void __elect_manager_cleanup(void); diff --git a/elect/main.c b/elect/main.c index 714f8c8..66c3ea9 100644 --- a/elect/main.c +++ b/elect/main.c @@ -232,15 +232,12 @@ int main(int argc, char **argv) __ofono_dbus_init(conn); - /* - * The reason why this DBG is here is that we have the __stop__debug, - * __start__debug linking symbols in the object. As soon we - * have real DBG we can remove this one again. - */ - DBG(""); + __elect_manager_init(); g_main_loop_run(event_loop); + __elect_manager_cleanup(); + __ofono_dbus_cleanup(); dbus_connection_unref(conn); diff --git a/elect/manager.c b/elect/manager.c new file mode 100644 index 0000000..65c8242 --- /dev/null +++ b/elect/manager.c @@ -0,0 +1,97 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 Intel Corporation. All rights reserved. + * Copyright (C) 2011 BMW Car IT GmbH. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 <string.h> +#include <glib.h> +#include <gdbus.h> + +#include "elect.h" + +static DBusMessage *manager_get_devices(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + DBusMessage *reply; + DBusMessageIter iter; + DBusMessageIter array; + + DBG(""); + + reply = dbus_message_new_method_return(msg); + if (reply == NULL) + return NULL; + + dbus_message_iter_init_append(reply, &iter); + + dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, + DBUS_STRUCT_BEGIN_CHAR_AS_STRING + DBUS_TYPE_OBJECT_PATH_AS_STRING + DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING + DBUS_TYPE_VARIANT_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING + DBUS_STRUCT_END_CHAR_AS_STRING, + &array); + + dbus_message_iter_close_container(&iter, &array); + + return reply; +} + +static GDBusMethodTable manager_methods[] = { + { "GetDevices", "", "a(oa{sv})", manager_get_devices }, + { } +}; + +static GDBusSignalTable manager_signals[] = { + { "DeviceAdded", "oa{sv}" }, + { "DeviceRemoved", "o" }, + { } +}; + +int __elect_manager_init(void) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + gboolean ret; + + ret = g_dbus_register_interface(conn, ELECT_MANAGER_PATH, + ELECT_MANAGER_INTERFACE, + manager_methods, manager_signals, + NULL, NULL, NULL); + + if (ret == FALSE) + return -1; + + return 0; +} + +void __elect_manager_cleanup(void) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + + g_dbus_unregister_interface(conn, ELECT_MANAGER_PATH, + ELECT_MANAGER_INTERFACE); +} -- 1.7.8.110.g4cb5d1

From: Daniel Wagner <daniel.wagner(a)bmw-carit.de&gt; --- elect/manager.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/elect/manager.c b/elect/manager.c index 65c8242..99ad216 100644 --- a/elect/manager.c +++ b/elect/manager.c @@ -30,6 +30,26 @@ #include "elect.h" +static void append_device(struct elect_device *device, void *userdata) +{ + DBusMessageIter *array = userdata; + const char *path = __elect_device_get_path(device); + DBusMessageIter entry, dict; + + dbus_message_iter_open_container(array, DBUS_TYPE_STRUCT, + NULL, &entry); + dbus_message_iter_append_basic(&entry, DBUS_TYPE_OBJECT_PATH, + &path); + dbus_message_iter_open_container(&entry, DBUS_TYPE_ARRAY, + OFONO_PROPERTIES_ARRAY_SIGNATURE, + &dict); + + __elect_device_append_properties(device, &dict); + + dbus_message_iter_close_container(&entry, &dict); + dbus_message_iter_close_container(array, &entry); +} + static DBusMessage *manager_get_devices(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -56,6 +76,8 @@ static DBusMessage *manager_get_devices(DBusConnection *conn, DBUS_STRUCT_END_CHAR_AS_STRING, &array); + __elect_device_foreach(append_device, &array); + dbus_message_iter_close_container(&iter, &array); return reply; -- 1.7.8.110.g4cb5d1

From: Daniel Wagner <daniel.wagner(a)bmw-carit.de&gt; --- Makefile.am | 4 +- elect/device.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 142 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index cdeab8d..a11176e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -651,8 +651,8 @@ if ELECT sbin_PROGRAMS += elect/electd -elect_electd_SOURCES = $(gdbus_sources) \ - src/log.c src/dbus.c \ +elect_electd_SOURCES = $(gdbus_sources) $(btio_sources) \ + src/log.c src/dbus.c plugins/bluetooth.c \ elect/main.c elect/dbus.c elect/manager.c elect/device.c elect_electd_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl diff --git a/elect/device.c b/elect/device.c index 1198083..13999fd 100644 --- a/elect/device.c +++ b/elect/device.c @@ -31,16 +31,28 @@ #include <glib.h> #include <gdbus.h> +#include "plugins/bluetooth.h" + #include "elect.h" +static int next_device_id = 0; static GHashTable *device_hash; struct elect_device { + /* The D-Bus path to this device */ + char *elect_path; + + /* BlueZ device information */ + char *path; + char *address; + char *name; + + DBusPendingCall *call; }; const char *__elect_device_get_path(struct elect_device *device) { - return "/"; + return device->elect_path; } void __elect_device_append_properties(struct elect_device *device, @@ -64,10 +76,129 @@ void __elect_device_foreach(elect_device_foreach_func func, void *userdata) } } +static int bt_probe(const char *path, const char *dev_addr, + const char *adapter_addr, const char *alias) +{ + struct elect_device *device; + char buf[256]; + + DBG(""); + + /* We already have this device in our hash, ignore */ + if (g_hash_table_lookup(device_hash, path) != NULL) + return -EALREADY; + + ofono_info("Using device: %s, devaddr: %s, adapter: %s", + path, dev_addr, adapter_addr); + + strcpy(buf, "dun/"); + bluetooth_create_path(dev_addr, adapter_addr, buf + 4, sizeof(buf) - 4); + + device = g_try_new0(struct elect_device, 1); + if (device == 0) { + DBG("Failed to create device data structure"); + return -ENOMEM; + } + + DBG("%p", device); + + device->elect_path = g_strdup_printf("/device%d", next_device_id); + if (device->elect_path == NULL) + goto free; + + device->path = g_strdup(path); + if (device->path == NULL) + goto free; + + device->address = g_strdup(dev_addr); + if (device->address == NULL) + goto free; + + device->name = g_strdup(alias); + if (device->name == NULL) + goto free; + + g_hash_table_insert(device_hash, g_strdup(path), device); + + next_device_id += 1; + + return 0; + +free: + g_free(device->path); + g_free(device->address); + g_free(device->name); + g_free(device->elect_path); + g_free(device); + + return -ENOMEM; +} + +static gboolean bt_remove_device(gpointer key, gpointer value, + gpointer user_data) +{ + struct elect_device *device = value; + const char *path = key; + const char *prefix = user_data; + + DBG("%p", device); + + if (device->call != NULL) + dbus_pending_call_cancel(device->call); + + if (prefix && g_str_has_prefix(path, prefix) == FALSE) + return FALSE; + + return TRUE; +} + +static void bt_remove(const char *prefix) +{ + DBG("%s", prefix); + + if (device_hash == NULL) + return; + + g_hash_table_foreach_remove(device_hash, bt_remove_device, + (gpointer) prefix); +} + +static void bt_set_alias(const char *path, const char *alias) +{ + struct elect_device *device; + + DBG(""); + + if (path == NULL || alias == NULL) + return; + + device = g_hash_table_lookup(device_hash, path); + if (device == NULL) + return; + + g_free(device->name); + device->name = g_strdup(alias); +} + +static struct bluetooth_profile dun_profile = { + .name = "dun_dt", + .probe = bt_probe, + .remove = bt_remove, + .set_alias = bt_set_alias, +}; + static void destroy_device(gpointer user) { struct elect_device *device = user; + if (device->call) + dbus_pending_call_cancel(device->call); + + g_free(device->elect_path); + g_free(device->path); + g_free(device->address); + g_free(device->name); + g_free(device); } @@ -84,8 +215,14 @@ void __elect_device_shutdown(void) int __elect_device_init(void) { + int err; + DBG(""); + err = bluetooth_register_uuid(DUN_GW_UUID, &dun_profile); + if (err < 0) + return err; + device_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, destroy_device); @@ -96,5 +233,7 @@ void __elect_device_cleanup(void) { DBG(""); + bluetooth_unregister_uuid(DUN_GW_UUID); + g_hash_table_destroy(device_hash); } -- 1.7.8.110.g4cb5d1

From: Daniel Wagner <daniel.wagner(a)bmw-carit.de&gt; --- elect/device.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 122 insertions(+), 2 deletions(-) diff --git a/elect/device.c b/elect/device.c index f9a01fd..b404546 100644 --- a/elect/device.c +++ b/elect/device.c @@ -58,7 +58,10 @@ struct elect_device { gboolean active; struct ipv4_settings settings; + char *tty; + DBusPendingCall *call; + DBusMessage *pending; }; const char *__elect_device_get_path(struct elect_device *device) @@ -187,11 +190,116 @@ static DBusMessage *device_get_properties(DBusConnection *conn, return reply; } +static void bt_disconnect_reply(DBusPendingCall *call, gpointer user_data) +{ + struct elect_device *device = user_data; + DBusMessage *reply; + + DBG("%p", device); + + reply = dbus_pending_call_steal_reply(call); + dbus_message_unref(reply); + + device->call = NULL; + + g_free(device->tty); + device->tty = NULL; +} + +static int bt_disconnect(struct elect_device *device) +{ + DBusPendingCall *call; + int status; + + DBG("%p", device); + + if (device->tty == NULL) + return 0; + + status = bluetooth_send_with_reply(device->path, + BLUEZ_SERIAL_INTERFACE, "Disconnect", + &call, bt_disconnect_reply, + device, NULL, DBUS_TIMEOUT, + DBUS_TYPE_STRING, &device->tty, + DBUS_TYPE_INVALID); + if (status < 0) + return -EINVAL; + + device->call = call; + + return -EINPROGRESS; +} + +static void bt_connect_reply(DBusPendingCall *call, gpointer user_data) +{ + struct elect_device *device = user_data; + DBusMessage *reply; + DBusError derr; + char *tty; + + DBG("%p", device); + + reply = dbus_pending_call_steal_reply(call); + + device->call = NULL; + + dbus_error_init(&derr); + if (dbus_set_error_from_message(&derr, reply)) { + DBG("Connection to bt serial returned with error: %s, %s", + derr.name, derr.message); + + dbus_error_free(&derr); + goto done; + } + + dbus_message_get_args(reply, NULL, DBUS_TYPE_STRING, &tty, + DBUS_TYPE_INVALID); + + DBG("%p tty %s", device, tty); + + device->tty = g_strdup(tty); + +done: + dbus_message_unref(reply); + + if (device->tty != NULL) + reply = dbus_message_new_method_return(device->pending); + else + reply = __elect_error_failed(device->pending); + + __ofono_dbus_pending_reply(&device->pending, reply); + + device->pending = NULL; +} + +static int bt_connect(struct elect_device *device) +{ + DBusPendingCall *call; + int status; + char *profile = "dun"; + + DBG("%p", device); + + status = bluetooth_send_with_reply(device->path, + BLUEZ_SERIAL_INTERFACE, "Connect", + &call, bt_connect_reply, + device, NULL, DBUS_TIMEOUT, + DBUS_TYPE_STRING, &profile, + DBUS_TYPE_INVALID); + if (status < 0) + return -EINVAL; + + device->call = call; + + return -EINPROGRESS; +} + static DBusMessage *set_property_active(struct elect_device *device, DBusMessage *msg, DBusMessageIter *var) { ofono_bool_t active; + int err; DBG("%p elect_path %s", device, device->elect_path); @@ -200,9 +308,17 @@ static DBusMessage *set_property_active(struct elect_device *device, dbus_message_iter_get_basic(var, &active); - device->active = active; + if (active) + err = bt_connect(device); + else + err = bt_disconnect(device); - return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); + if (err != -EINPROGRESS && err < 0) + return __elect_error_failed(msg); + + device->pending = dbus_message_ref(msg); + + return NULL; } static DBusMessage *device_set_property(DBusConnection *conn, @@ -419,6 +535,9 @@ static void destroy_device(gpointer user) { struct elect_device *device = user; + if (device->pending) + dbus_message_unref(device->pending); + if (device->call) dbus_pending_call_cancel(device->call); @@ -430,6 +549,7 @@ static void destroy_device(gpointer user) g_free(device->path); g_free(device->address); g_free(device->name); + g_free(device->tty); g_free(device); } -- 1.7.8.110.g4cb5d1

From: Daniel Wagner <daniel.wagner(a)bmw-carit.de&gt; --- Makefile.am | 3 +- elect/dial.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ elect/elect.h | 16 +++++++++++ 3 files changed, 101 insertions(+), 1 deletions(-) create mode 100644 elect/dial.c diff --git a/Makefile.am b/Makefile.am index a11176e..588183d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -653,7 +653,8 @@ sbin_PROGRAMS += elect/electd elect_electd_SOURCES = $(gdbus_sources) $(btio_sources) \ src/log.c src/dbus.c plugins/bluetooth.c \ - elect/main.c elect/dbus.c elect/manager.c elect/device.c + elect/main.c elect/dbus.c elect/manager.c elect/device.c \ + elect/dial.c elect_electd_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl diff --git a/elect/dial.c b/elect/dial.c new file mode 100644 index 0000000..6f83981 --- /dev/null +++ b/elect/dial.c @@ -0,0 +1,83 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 Intel Corporation. All rights reserved. + * Copyright (C) 2011 BMW Car IT GmbH. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 <glib.h> + +#include "elect.h" + +struct elect_dial { + char *path; + void *data; + + elect_dial_connect_cb_t connect_cb; + elect_dial_disconnect_cb_t disconnect_cb; +}; + +struct elect_dial *__elect_dial_create(elect_dial_connect_cb_t connect_cb, + elect_dial_disconnect_cb_t disconnect_cb, + void *data) +{ + struct elect_dial *dial; + + DBG(""); + + dial = g_try_new0(struct elect_dial, 1); + if (dial == NULL) + return NULL; + + dial->data = data; + + dial->connect_cb = connect_cb; + dial->disconnect_cb = disconnect_cb; + + return dial; +} + +int __elect_dial_connect(struct elect_dial *dial, const char *path) +{ + DBG("%s", dial->path); + + g_free(dial->path); + dial->path = g_strdup(path); + + return 0; +} + +int __elect_dial_disconnect(struct elect_dial *dial) +{ + DBG("%s", dial->path); + + return 0; +} + +void __elect_dial_unref(struct elect_dial *dial) +{ + DBG("%s", dial->path); + + g_free(dial->path); + + g_free(dial); +} diff --git a/elect/elect.h b/elect/elect.h index b8cccda..e79acf7 100644 --- a/elect/elect.h +++ b/elect/elect.h @@ -70,3 +70,19 @@ void __elect_device_foreach(elect_device_foreach_func cb, void *userdata); const char *__elect_device_get_path(struct elect_device *device); void __elect_device_append_properties(struct elect_device *device, DBusMessageIter *dict); + + +struct elect_dial; + +typedef void (*elect_dial_connect_cb_t)(const char *interface, const char *ip, + const char *peer, + const char *dns1, const char *dns2, + void *data); +typedef void (*elect_dial_disconnect_cb_t)(void *data); + +struct elect_dial *__elect_dial_create(elect_dial_connect_cb_t connect_cb, + elect_dial_disconnect_cb_t disconnect_cb, + void *data); +int __elect_dial_connect(struct elect_dial *dial, const char *path); +int __elect_dial_disconnect(struct elect_dial *dial); +void __elect_dial_unref(struct elect_dial *dial); -- 1.7.8.110.g4cb5d1

From: Daniel Wagner <daniel.wagner(a)bmw-carit.de&gt; --- elect/device.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/elect/device.c b/elect/device.c index b404546..b4cbbfc 100644 --- a/elect/device.c +++ b/elect/device.c @@ -59,6 +59,7 @@ struct elect_device { struct ipv4_settings settings; char *tty; + struct elect_dial *dial; DBusPendingCall *call; DBusMessage *pending; @@ -165,6 +166,27 @@ void __elect_device_foreach(elect_device_foreach_func func, void *userdata) } } +static void settings_changed(struct elect_device *device) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + DBusMessage *signal; + DBusMessageIter iter; + const char *key = "Settings"; + + signal = dbus_message_new_signal(device->elect_path, + ELECT_DEVICE_INTERFACE, + "PropertyChanged"); + + if (signal == NULL) + return; + dbus_message_iter_init_append(signal, &iter); + dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &key); + + settings_append(device, &iter); + + g_dbus_send_message(conn, signal); +} + static DBusMessage *device_get_properties(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -230,6 +252,73 @@ static int bt_disconnect(struct elect_device *device) return -EINPROGRESS; } +static void disconnect_cb(void *data) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + struct elect_device *device = data; + + DBG("%p", device); + + g_free(device->settings.interface); + g_free(device->settings.ip); + g_strfreev(device->settings.nameservers); + device->settings.interface = NULL; + device->settings.ip = NULL; + device->settings.nameservers = NULL; + + device->active = FALSE; + + settings_changed(device); + ofono_dbus_signal_property_changed(conn, device->elect_path, + ELECT_DEVICE_INTERFACE, "Active", + DBUS_TYPE_BOOLEAN, &device->active); + + bt_disconnect(device); +} + +static void connect_cb(const char *interface, const char *ip, + const char *peer, const char *dns1, const char *dns2, + void *data) +{ + DBusConnection *conn = ofono_dbus_get_connection(); + struct elect_device *device = data; + const char *dns[3] = { dns1, dns2, 0 }; + + DBG("%p", device); + + g_free(device->settings.interface); + device->settings.interface = g_strdup(interface); + if (device->settings.interface == NULL) + goto err; + + g_free(device->settings.ip); + device->settings.ip = g_strdup(ip); + if (device->settings.ip == NULL) + goto err; + + g_strfreev(device->settings.nameservers); + device->settings.nameservers = g_strdupv((gchar **)dns); + if (device->settings.nameservers == NULL) + goto err; + + device->active = TRUE; + + settings_changed(device); + ofono_dbus_signal_property_changed(conn, device->elect_path, + ELECT_DEVICE_INTERFACE, "Active", + DBUS_TYPE_BOOLEAN, &device->active); + + return; + +err: + g_free(device->settings.interface); + g_free(device->settings.ip); + g_strfreev(device->settings.nameservers); + device->settings.interface = NULL; + device->settings.ip = NULL; + device->settings.nameservers = NULL; +} + static void bt_connect_reply(DBusPendingCall *call, gpointer user_data) { struct elect_device *device = user_data; @@ -258,6 +347,10 @@ static void bt_connect_reply(DBusPendingCall *call, gpointer user_data) DBG("%p tty %s", device, tty); device->tty = g_strdup(tty); + if (device->tty == NULL) + goto done; + + __elect_dial_connect(device->dial, device->tty); done: dbus_message_unref(reply); @@ -458,6 +551,10 @@ static int bt_probe(const char *path, const char *dev_addr, if (device->name == NULL) goto free; + device->dial = __elect_dial_create(connect_cb, disconnect_cb, device); + if (device->dial == NULL) + goto free; + g_hash_table_insert(device_hash, g_strdup(path), device); register_device(device); @@ -488,6 +585,9 @@ static gboolean bt_remove_device(gpointer key, gpointer value, if (device->call != NULL) dbus_pending_call_cancel(device->call); + if (device->dial != NULL) + __elect_dial_unref(device->dial); + if (prefix && g_str_has_prefix(path, prefix) == FALSE) return FALSE; @@ -541,6 +641,9 @@ static void destroy_device(gpointer user) if (device->call) dbus_pending_call_cancel(device->call); + if (device->dial) + __elect_dial_unref(device->dial); + g_free(device->settings.interface); g_free(device->settings.ip); g_strfreev(device->settings.nameservers); -- 1.7.8.110.g4cb5d1

From: Daniel Wagner <daniel.wagner(a)bmw-carit.de&gt; --- doc/elect-api.txt | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) create mode 100644 doc/elect-api.txt diff --git a/doc/elect-api.txt b/doc/elect-api.txt new file mode 100644 index 0000000..a603266 --- /dev/null +++ b/doc/elect-api.txt @@ -0,0 +1,86 @@ + +Manager hierarchy +================= + +Service org.ofono.elect +Interface org.ofono.elect.Manager +Object path / + +Methods array{object,dict} GetDevices() + + Get an array of device objects and properties + that represent the currently attached devices. + + This method call should only be used once when an + application starts up. Further device additions + and removal shall be monitored via DeviceAdded and + DeviceRemoved signals. + +Signals DeviceAdded(object path, dict properties) + + Signal that is sent when a new device is added. It + contains the object path of new device and its + properties. + + DeviceRemoved(object path) + + Signal that is sent when a device has been removed. + The object path is no longer accessible after this + signal and only emitted for reference. + + +Device hierarchy +================ + +Service org.ofono.elect +Interface org.ofono.elect.Device +Object path /{device0,device1,...} + +Methods dict GetProperties() + + Returns properties for the device object. See + the properties section for available properties. + +Signals PropertyChanged(string name, variant value) + + This signal indicates a changed value of the given + property. + +Properties string Name [readonly] + + Friendly name of the device. + + boolean Active [readwrite] + + Holds whether the device is connected. A + connection will be established when this value + is set to true. A existing connection will be + teared down when set to false. + + dict Settings [readonly] + + Holds all the IP network settings. + + string Interface [readonly, optional] + + Holds the interface of the network interface + used by this connection (e.g. "ppp0" "usb0") + + string Method [readonly, optional] + + Holds the IP network config method. + "static"- Set IP network statically + "dhcp" - Set IP network through DHCP + + string Address [readonly, optional] + + Holds the IP address for this connection. + + string Netmask [readonly, optional] + + Holds the Netmask for this connection. + + array{string} DomainNameServers [readonly, optional] + + Holds the list of domain name servers for this + connection. -- 1.7.8.110.g4cb5d1