From 06cf2e1b5bd7368b6dbcd7708c066a892a1c2114 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 23 Jul 2010 17:09:50 +0200 Subject: [PATCH] Initial on-demand connection implementation This first implementation tracks the connection status, and provides a simple API for starting the on-demand session. --- Makefile.am | 5 +-- include/ondemand.h | 38 +++++++++++++++++++++++ src/connman.h | 3 ++ src/main.c | 2 ++ src/ondemand.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 include/ondemand.h create mode 100644 src/ondemand.c diff --git a/Makefile.am b/Makefile.am index 42bb9e7..2aeaaac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,8 @@ include_HEADERS = include/types.h include/log.h include/plugin.h \ include/security.h include/notifier.h \ include/storage.h include/service.h \ include/resolver.h include/ipconfig.h \ - include/device.h include/network.h include/inet.h + include/device.h include/network.h include/inet.h \ + include/ondemand.h nodist_include_HEADERS = include/version.h @@ -56,7 +57,7 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) $(builtin_sources) \ src/utsname.c src/timeserver.c src/rfkill.c \ src/wifi.c src/storage.c src/dbus.c src/config.c \ src/technology.c src/counter.c src/location.c \ - src/session.c src/tethering.c + src/session.c src/tethering.c src/ondemand.c if UDEV src_connmand_SOURCES += src/udev.c diff --git a/include/ondemand.h b/include/ondemand.h new file mode 100644 index 0000000..ca68925 --- /dev/null +++ b/include/ondemand.h @@ -0,0 +1,38 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2010 Intel Corporation. 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 + * + */ + +#ifndef __CONNMAN_ONDEMAND_H +#define __CONNMAN_ONDEMAND_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +gboolean connman_ondemand_connected(void); +int connman_ondemand_start(const char *pref_bearer, unsigned int idle_timeout); + +#ifdef __cplusplus +} +#endif + +#endif /* __CONNMAN_ONDEMAND_H */ diff --git a/src/connman.h b/src/connman.h index d2696d9..f33f745 100644 --- a/src/connman.h +++ b/src/connman.h @@ -541,3 +541,6 @@ int __connman_session_release(const char *owner); struct connman_service *__connman_session_request(const char *bearer, const char *owner); int __connman_session_init(void); void __connman_session_cleanup(void); + +int __connman_ondemand_init(void); +void __connman_ondemand_cleanup(void); diff --git a/src/main.c b/src/main.c index a01f2fe..aa63225 100644 --- a/src/main.c +++ b/src/main.c @@ -221,6 +221,7 @@ int main(int argc, char *argv[]) __connman_agent_init(); __connman_tethering_init(); __connman_counter_init(); + __connman_ondemand_init(); __connman_manager_init(option_compat); __connman_profile_init(); __connman_config_init(); @@ -264,6 +265,7 @@ int main(int argc, char *argv[]) __connman_config_cleanup(); __connman_profile_cleanup(); __connman_manager_cleanup(); + __connman_ondemand_cleanup(); __connman_counter_cleanup(); __connman_agent_cleanup(); __connman_tethering_cleanup(); diff --git a/src/ondemand.c b/src/ondemand.c new file mode 100644 index 0000000..64d7d0f --- /dev/null +++ b/src/ondemand.c @@ -0,0 +1,89 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2010 Intel Corporation. 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 +#endif + +#include +#include +#include +#include + +#include "connman.h" + +static volatile gint started; +static gboolean connected; +struct connman_service *ondemand_service; + +static void ondemand_default_changed(struct connman_service *service) +{ + DBG("service %p", service); + + if (service == NULL) { + connected = FALSE; + return; + } + + connected = TRUE; +} + +static struct connman_notifier ondemand_notifier = { + .name = "ondemand", + .default_changed = ondemand_default_changed, +}; + +gboolean connman_ondemand_connected(void) +{ + DBG("connected %d", connected); + + return connected; +} + +int connman_ondemand_start(const char *bearer, unsigned int idle_timeout) +{ + DBG(""); + + if (g_atomic_int_get(&started) > 0) + return 0; + + g_atomic_int_inc(&started); + + ondemand_service = __connman_session_request(bearer, "__ondemand__"); + + /* TODO: + * 1) Set IDLETIMER target. + * 2) Listen for the sysfs/netlink event. + * 3) Stop the session. + */ + + return 0; +} + +int __connman_ondemand_init(void) +{ + return connman_notifier_register(&ondemand_notifier); +} + +void __connman_ondemand_cleanup(void) +{ + connman_notifier_unregister(&ondemand_notifier); +} -- 2.7.4