June 2016 - connman - Ml01.01.Org

API to get List of Connected STA's to an AP's

by Lamsoge, Abhijit

Hi Patrick/All, I have a few queries after long time. 1) Does connman support list of connected station/client to AP? 2) If yes, how we can access list of connected station ? 3) If no, then how/where we can implement this feature? I think it's quiet an important feature if it is not supported in connman. Abhijit

4 years, 4 months

3
4
0 / 0

avoid redundant saving to the file system

by Nakamura, Yusuke (ADITJ/SWG)

Hi all, I had a looked at the piece of code in technology.c and found there was a redundant data saving. connman_technology_save_offline() always loads the keyfile and saves it even if OfflineMode is not changed. In order to avoid this I'd like to save the keyfile only when OfflineMode is actually changed. Do you agree with this ? If yes, I'll send a patch to review. Best Regards, Yusuke

4 years, 4 months

2
1
0 / 0

[PATCH] supplicant: Do not set ProcessCredentials each time WPS is started

by Jose Blanquicet

The property ProcessCredentials of WPS is set each time a WPS session is started. This patch aims to avoid such a redundancy and do it just once when the interface is initialized and WPS capabilities are known. Additionally, with this change the returned value by the function g_supplicant_interface_connect will be the actual returned value of the WPS.Start method, because currently it is the one returned by the SetProperty method. --- gsupplicant/supplicant.c | 65 +++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 40 deletions(-) diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index 09a3ac5..acad111 100644 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -2107,6 +2107,15 @@ static void interface_bss_removed(DBusMessageIter *iter, void *user_data) g_hash_table_remove(interface->network_table, network->group); } +static void wps_process_credentials(DBusMessageIter *iter, void *user_data) +{ + dbus_bool_t credentials = TRUE; + + SUPPLICANT_DBG(""); + + dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &credentials); +} + static void set_config_methods(DBusMessageIter *iter, void *user_data) { const char *config_methods = "push_button"; @@ -2141,12 +2150,6 @@ static void interface_property(const char *key, DBusMessageIter *iter, debug_strvalmap("Mode capability", mode_capa_map, interface->mode_capa); - - supplicant_dbus_property_set(interface->path, - SUPPLICANT_INTERFACE ".Interface.WPS", - "ConfigMethods", DBUS_TYPE_STRING_AS_STRING, - set_config_methods, NULL, NULL, NULL); - if (interface->ready) callback_interface_added(interface); @@ -2158,6 +2161,18 @@ static void interface_property(const char *key, DBusMessageIter *iter, interface); if (interface->mode_capa & G_SUPPLICANT_CAPABILITY_MODE_P2P) interface->p2p_support = true; + + if (interface->keymgmt_capa & G_SUPPLICANT_KEYMGMT_WPS) { + supplicant_dbus_property_set(interface->path, + SUPPLICANT_INTERFACE ".Interface.WPS", + "ProcessCredentials", DBUS_TYPE_BOOLEAN_AS_STRING, + wps_process_credentials, NULL, NULL, NULL); + + supplicant_dbus_property_set(interface->path, + SUPPLICANT_INTERFACE ".Interface.WPS", + "ConfigMethods", DBUS_TYPE_STRING_AS_STRING, + set_config_methods, NULL, NULL, NULL); + } } else if (g_strcmp0(key, "State") == 0) { const char *str = NULL; @@ -4738,36 +4753,6 @@ static void interface_add_wps_params(DBusMessageIter *iter, void *user_data) supplicant_dbus_dict_close(iter, &dict); } -static void wps_start(const char *error, DBusMessageIter *iter, void *user_data) -{ - struct interface_connect_data *data = user_data; - - SUPPLICANT_DBG(""); - - if (error) { - SUPPLICANT_DBG("error: %s", error); - g_free(data->path); - g_free(data->ssid); - dbus_free(data); - return; - } - - supplicant_dbus_method_call(data->interface->path, - SUPPLICANT_INTERFACE ".Interface.WPS", "Start", - interface_add_wps_params, - interface_wps_start_result, data, NULL); -} - -static void wps_process_credentials(DBusMessageIter *iter, void *user_data) -{ - dbus_bool_t credentials = TRUE; - - SUPPLICANT_DBG(""); - - dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &credentials); -} - - int g_supplicant_interface_connect(GSupplicantInterface *interface, GSupplicantSSID *ssid, GSupplicantInterfaceCallback callback, @@ -4800,10 +4785,10 @@ int g_supplicant_interface_connect(GSupplicantInterface *interface, memset(&interface->wps_cred, 0, sizeof(struct _GSupplicantWpsCredentials)); - ret = supplicant_dbus_property_set(interface->path, - SUPPLICANT_INTERFACE ".Interface.WPS", - "ProcessCredentials", DBUS_TYPE_BOOLEAN_AS_STRING, - wps_process_credentials, wps_start, data, interface); + ret = supplicant_dbus_method_call(data->interface->path, + SUPPLICANT_INTERFACE ".Interface.WPS", "Start", + interface_add_wps_params, + interface_wps_start_result, data, NULL); } else { /* By the time there is a request for connect and the network * path is not NULL it means that connman has not removed the -- 1.9.1

4 years, 4 months

1
0
0 / 0

[PATCH 6/6] proxy: add debugging on proxy selection

by David Woodhouse

--- src/proxy.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/proxy.c b/src/proxy.c index 08ae3dd..db49c58 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -181,6 +181,8 @@ int pacrunner_proxy_set_domains(struct pacrunner_proxy *proxy, char **domains) data = g_malloc0(sizeof(struct proxy_domain)); + DBG("proxy %p domain %s", proxy, *domain); + slash = strchr(*domain, '/'); if (!slash) { data->domain = g_strdup(*domain); @@ -530,6 +532,8 @@ char *pacrunner_proxy_lookup(const char *url, const char *host) if (compare_legacy_ip_in_net(&ip4_addr, data) == 0) { selected_proxy = proxy; + DBG("match proxy %p Legacy IP range %s", + proxy, data->domain); goto found; } break; @@ -537,12 +541,16 @@ char *pacrunner_proxy_lookup(const char *url, const char *host) if (compare_ipv6_in_net(&ip6_addr, data) == 0) { selected_proxy = proxy; + DBG("match proxy %p IPv6 range %s", + proxy, data->domain); goto found; } break; default: if (compare_host_in_domain(host, data) == 0) { selected_proxy = proxy; + DBG("match proxy %p DNS domain %s", + proxy, data->domain); goto found; } break; @@ -550,8 +558,10 @@ char *pacrunner_proxy_lookup(const char *url, const char *host) } } - if (!selected_proxy) + if (!selected_proxy) { + DBG("default proxy %p", default_proxy); selected_proxy = default_proxy; + } found: pthread_mutex_unlock(&proxy_mutex); -- 2.7.4 -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation

4 years, 4 months

1
0
0 / 0

[PATCH 4/6] proxy: Add pacrunner_js_clear_proxy()

by David Woodhouse

We'll want this for a sane per-proxy-config cleanup of the JS context. --- plugins/v8.cc | 1 + src/js.c | 16 ++++++++++++++++ src/js.h | 1 + src/pacrunner.h | 1 + src/proxy.c | 2 ++ 5 files changed, 21 insertions(+) diff --git a/plugins/v8.cc b/plugins/v8.cc index e947bed..93a1ea5 100644 --- a/plugins/v8.cc +++ b/plugins/v8.cc @@ -302,6 +302,7 @@ static struct pacrunner_js_driver v8_driver = { "v8", PACRUNNER_JS_PRIORITY_HIGH, v8_set_proxy, + NULL, v8_execute, }; diff --git a/src/js.c b/src/js.c index ff08cee..3a9274e 100644 --- a/src/js.c +++ b/src/js.c @@ -69,6 +69,22 @@ int __pacrunner_js_set_proxy(struct pacrunner_proxy *proxy) return -ENXIO; } +int __pacrunner_js_clear_proxy(struct pacrunner_proxy *proxy) +{ + GSList *list; + + for (list = js_driver_list; list; list = list->next) { + struct pacrunner_js_driver *driver = list->data; + + if (driver->clear_proxy) + return driver->clear_proxy(proxy); + else + return 0; + } + + return -ENXIO; +} + char *__pacrunner_js_execute(struct pacrunner_proxy *proxy, const char *url, const char *host) { diff --git a/src/js.h b/src/js.h index ea76849..e5d7abc 100644 --- a/src/js.h +++ b/src/js.h @@ -27,6 +27,7 @@ struct pacrunner_js_driver { const char *name; int priority; int (*set_proxy) (struct pacrunner_proxy *proxy); + int (*clear_proxy) (struct pacrunner_proxy *proxy); char *(*execute)(struct pacrunner_proxy *proxy, const char *url, const char *host); }; diff --git a/src/pacrunner.h b/src/pacrunner.h index 7b7ad15..87c51da 100644 --- a/src/pacrunner.h +++ b/src/pacrunner.h @@ -113,5 +113,6 @@ char *__pacrunner_mozjs_execute(const char *url, const char *host); int __pacrunner_js_init(void); void __pacrunner_js_cleanup(void); int __pacrunner_js_set_proxy(struct pacrunner_proxy *proxy); +int __pacrunner_js_clear_proxy(struct pacrunner_proxy *proxy); char *__pacrunner_js_execute(struct pacrunner_proxy *proxy, const char *url, const char *host); diff --git a/src/proxy.c b/src/proxy.c index 47be08a..08ae3dd 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -128,6 +128,8 @@ void pacrunner_proxy_unref(struct pacrunner_proxy *proxy) if (!g_atomic_int_dec_and_test(&proxy->refcount)) return; + __pacrunner_js_clear_proxy(proxy); + reset_proxy(proxy); g_list_free_full(proxy->domains, proxy_domain_destroy); -- 2.7.4 -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation

4 years, 4 months

1
0
0 / 0

[PATCH 3/6] proxy: Add get/set methods for new jsctx pointer

by David Woodhouse

If we want the JS backends to be able to store context per proxy config, then we need to give them somewhere to put it... --- src/pacrunner.h | 3 +++ src/proxy.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/pacrunner.h b/src/pacrunner.h index 71913bb..7b7ad15 100644 --- a/src/pacrunner.h +++ b/src/pacrunner.h @@ -76,6 +76,9 @@ int pacrunner_proxy_disable(struct pacrunner_proxy *proxy); char *pacrunner_proxy_lookup(const char *url, const char *host); +void __pacrunner_proxy_set_jsctx(struct pacrunner_proxy *proxy, void *jsctx); +void *__pacrunner_proxy_get_jsctx(struct pacrunner_proxy *proxy); + int __pacrunner_proxy_init(void); void __pacrunner_proxy_cleanup(void); diff --git a/src/proxy.c b/src/proxy.c index e913a3a..47be08a 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -41,6 +41,7 @@ struct pacrunner_proxy { GList **servers; GList **excludes; GList *domains; + void *jsctx; }; struct proxy_domain { @@ -584,6 +585,16 @@ static gboolean proxy_config_timeout(gpointer user_data) return FALSE; } +void __pacrunner_proxy_set_jsctx(struct pacrunner_proxy *proxy, void *jsctx) +{ + proxy->jsctx = jsctx; +} + +void *__pacrunner_proxy_get_jsctx(struct pacrunner_proxy *proxy) +{ + return proxy->jsctx; +} + int __pacrunner_proxy_init(void) { DBG(""); -- 2.7.4 -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation

4 years, 4 months

1
0
0 / 0

[PATCH 2/6] js: Add proxy argument to JS execute() methods.

by David Woodhouse

For now, just make the back ends automatically switch over, if they're being invoked on a different context to the last invocation. We'll fix them shortly to support multiple contexts. --- plugins/mozjs.c | 8 ++++++-- plugins/v8.cc | 10 +++++++--- src/js.c | 5 +++-- src/js.h | 3 ++- src/pacrunner.h | 3 ++- src/proxy.c | 2 +- unit/test-mozjs.c | 16 ++++++++++------ 7 files changed, 31 insertions(+), 16 deletions(-) diff --git a/plugins/mozjs.c b/plugins/mozjs.c index af91fea..77a0c13 100644 --- a/plugins/mozjs.c +++ b/plugins/mozjs.c @@ -222,17 +222,21 @@ static int mozjs_set_proxy(struct pacrunner_proxy *proxy) return 0; } -static char * mozjs_execute(const char *url, const char *host) +static char * mozjs_execute(struct pacrunner_proxy *proxy, const char *url, + const char *host) { JSBool result; jsval rval, args[2]; char *answer, *g_answer; - DBG("url %s host %s", url, host); + DBG("proxy %p url %s host %s", proxy, url, host); if (!jsctx) return NULL; + if (proxy != current_proxy && mozjs_set_proxy(proxy)) + return NULL; + pthread_mutex_lock(&mozjs_mutex); JS_BeginRequest(jsctx); diff --git a/plugins/v8.cc b/plugins/v8.cc index 6cb28ca..e947bed 100644 --- a/plugins/v8.cc +++ b/plugins/v8.cc @@ -251,11 +251,15 @@ static int v8_set_proxy(struct pacrunner_proxy *proxy) } -static char *v8_execute(const char *url, const char *host) +static char *v8_execute(struct pacrunner_proxy *proxy, const char *url, + const char *host) { - v8::Locker lck; + DBG("proxy %p url %s host %s", proxy, url, host); + + if (current_proxy != proxy && v8_set_proxy(proxy)) + return NULL; - DBG("url %s host %s", url, host); + v8::Locker lck; if (jsctx.IsEmpty() || jsfn.IsEmpty()) return NULL; diff --git a/src/js.c b/src/js.c index 84b8ada..ff08cee 100644 --- a/src/js.c +++ b/src/js.c @@ -69,7 +69,8 @@ int __pacrunner_js_set_proxy(struct pacrunner_proxy *proxy) return -ENXIO; } -char *__pacrunner_js_execute(const char *url, const char *host) +char *__pacrunner_js_execute(struct pacrunner_proxy *proxy, const char *url, + const char *host) { GSList *list; @@ -77,7 +78,7 @@ char *__pacrunner_js_execute(const char *url, const char *host) struct pacrunner_js_driver *driver = list->data; if (driver->execute) - return driver->execute(url, host); + return driver->execute(proxy, url, host); } return NULL; diff --git a/src/js.h b/src/js.h index 91143d1..ea76849 100644 --- a/src/js.h +++ b/src/js.h @@ -27,7 +27,8 @@ struct pacrunner_js_driver { const char *name; int priority; int (*set_proxy) (struct pacrunner_proxy *proxy); - char *(*execute)(const char *url, const char *host); + char *(*execute)(struct pacrunner_proxy *proxy, const char *url, + const char *host); }; int pacrunner_js_driver_register(struct pacrunner_js_driver *driver); diff --git a/src/pacrunner.h b/src/pacrunner.h index db534cf..71913bb 100644 --- a/src/pacrunner.h +++ b/src/pacrunner.h @@ -110,4 +110,5 @@ char *__pacrunner_mozjs_execute(const char *url, const char *host); int __pacrunner_js_init(void); void __pacrunner_js_cleanup(void); int __pacrunner_js_set_proxy(struct pacrunner_proxy *proxy); -char *__pacrunner_js_execute(const char *url, const char *host); +char *__pacrunner_js_execute(struct pacrunner_proxy *proxy, const char *url, + const char *host); diff --git a/src/proxy.c b/src/proxy.c index 536345f..e913a3a 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -565,7 +565,7 @@ found: selected_proxy->servers, selected_proxy->excludes); case PACRUNNER_PROXY_METHOD_AUTO: - return __pacrunner_js_execute(url, host); + return __pacrunner_js_execute(selected_proxy, url, host); } return NULL; diff --git a/unit/test-mozjs.c b/unit/test-mozjs.c index 8ac9741..7ccdee9 100644 --- a/unit/test-mozjs.c +++ b/unit/test-mozjs.c @@ -97,7 +97,7 @@ static void test_single_execute_without_pac(void) g_assert(mozjs_init() == 0); - result = __pacrunner_js_execute(EXAMPLE_URL, EXAMPLE_HOST); + result = __pacrunner_js_execute(proxy, EXAMPLE_URL, EXAMPLE_HOST); g_test_message("result: %s", result); mozjs_exit(); @@ -111,7 +111,8 @@ static void test_multiple_execute_without_pac(void) g_assert(mozjs_init() == 0); for (i = 0; i < MULTIPLE_COUNT; i++) { - result = __pacrunner_js_execute(EXAMPLE_URL, EXAMPLE_HOST); + result = __pacrunner_js_execute(proxy, EXAMPLE_URL, + EXAMPLE_HOST); g_test_message("result %d: %s", i, result); } @@ -126,7 +127,7 @@ static void test_single_execute_with_direct_pac(void) g_assert(pacrunner_proxy_set_auto(proxy, NULL, DIRECT_PAC) == 0); - result = __pacrunner_js_execute(EXAMPLE_URL, EXAMPLE_HOST); + result = __pacrunner_js_execute(proxy, EXAMPLE_URL, EXAMPLE_HOST); g_test_message("result: %s", result); pacrunner_proxy_disable(proxy); @@ -144,7 +145,8 @@ static void test_multiple_execute_with_direct_pac(void) g_assert(pacrunner_proxy_set_auto(proxy, NULL, DIRECT_PAC) == 0); for (i = 0; i < MULTIPLE_COUNT; i++) { - result = __pacrunner_js_execute(EXAMPLE_URL, EXAMPLE_HOST); + result = __pacrunner_js_execute(proxy, EXAMPLE_URL, + EXAMPLE_HOST); g_test_message("result %d: %s", i, result); } @@ -163,7 +165,8 @@ static void test_massive_execute_with_direct_pac(void) g_assert(pacrunner_proxy_set_auto(proxy, NULL, DIRECT_PAC) == 0); for (i = 0; i < MASSIVE_COUNT; i++) { - result = __pacrunner_js_execute(EXAMPLE_URL, EXAMPLE_HOST); + result = __pacrunner_js_execute(proxy, EXAMPLE_URL, + EXAMPLE_HOST); g_test_message("result %d: %s", i, result); } @@ -182,7 +185,8 @@ static void test_multiple_execute_with_example_pac(void) g_assert(pacrunner_proxy_set_auto(proxy, NULL, EXAMPLE_PAC) == 0); for (i = 0; i < MULTIPLE_COUNT; i++) { - result = __pacrunner_js_execute(EXAMPLE_URL, EXAMPLE_HOST); + result = __pacrunner_js_execute(proxy, EXAMPLE_URL, + EXAMPLE_HOST); g_test_message("result %d: %s", i, result); } -- 2.7.4 -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation

4 years, 4 months

1
0
0 / 0

[PATCH 1/6] proxy: Fix handling of proxy->domains

by David Woodhouse

In create_proxy_config() we were calling pacrunner_proxy_set_domains(), which was returning an error if passed a NULL list of domains. Then we were calling pacrunner_proxy_set_auto() or one of its friends, which all call reset_proxy() and *delete* the list of domains, if one was set. Treat proxy->domains like proxy->interface, and don't reset it in reset_proxy(). And fix up pacrunner_proxy_set_domains() so that it happily accepts a NULL domains list and behaves appropriately. As a side-effect, this stops pacrunner_proxy_set_domains() from being additive — if you call it a second time it'll clear the original set and set just the ones you've just passed, instead of adding new domains to the list. Which is a much saner semantic. --- src/proxy.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/proxy.c b/src/proxy.c index 2ebc75d..536345f 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -115,10 +115,6 @@ static void reset_proxy(struct pacrunner_proxy *proxy) __pacrunner_manual_destroy_excludes(proxy->excludes); proxy->excludes = NULL; - - if (proxy->domains) - g_list_free_full(proxy->domains, proxy_domain_destroy); - proxy->domains = NULL; } void pacrunner_proxy_unref(struct pacrunner_proxy *proxy) @@ -133,6 +129,9 @@ void pacrunner_proxy_unref(struct pacrunner_proxy *proxy) reset_proxy(proxy); + g_list_free_full(proxy->domains, proxy_domain_destroy); + proxy->domains = NULL; + g_free(proxy->interface); g_free(proxy); } @@ -168,8 +167,11 @@ int pacrunner_proxy_set_domains(struct pacrunner_proxy *proxy, char **domains) if (!proxy) return -EINVAL; + g_list_free_full(proxy->domains, proxy_domain_destroy); + proxy->domains = NULL; + if (!domains) - return -EINVAL; + return 0; for (domain = domains; *domain; domain++) { struct proxy_domain *data; -- 2.7.4 -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation

4 years, 4 months

1
0
0 / 0

useful info

by Cliff McDiarmid

Hello, I've recently read some useful information, I guess it might be useful for you too, please read at <http://loquoltoxi.gvmlawoffice.com/aelrfhn> Regards, Cliff McDiarmid

4 years, 4 months

1
0
0 / 0

[PATCH 1/2] proxy: Fix handling of proxy->domains

by David Woodhouse

In create_proxy_config() we were calling pacrunner_proxy_set_domains(), which was returning an error if passed a NULL list of domains. Then we were calling pacrunner_proxy_set_auto() or one of its friends, which all call reset_proxy() and *delete* the list of domains, if one was set. Treat proxy->domains like proxy->interface, and don't reset it in reset_proxy(). And fix up pacrunner_proxy_set_domains() so that it happily accepts a NULL domains list and behaves appropriately. As a side-effect, this stops pacrunner_proxy_set_domains() from being additive — if you call it a second time it'll clear the original set and set just the ones you've just passed, instead of adding new domains to the list. Which is a much saner semantic. --- src/proxy.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/proxy.c b/src/proxy.c index 2ebc75d..70efd98 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -115,10 +115,6 @@ static void reset_proxy(struct pacrunner_proxy *proxy) __pacrunner_manual_destroy_excludes(proxy->excludes); proxy->excludes = NULL; - - if (proxy->domains) - g_list_free_full(proxy->domains, proxy_domain_destroy); - proxy->domains = NULL; } void pacrunner_proxy_unref(struct pacrunner_proxy *proxy) @@ -133,6 +129,10 @@ void pacrunner_proxy_unref(struct pacrunner_proxy *proxy) reset_proxy(proxy); + if (proxy->domains) + g_list_free_full(proxy->domains, proxy_domain_destroy); + proxy->domains = NULL; + g_free(proxy->interface); g_free(proxy); } @@ -168,8 +168,13 @@ int pacrunner_proxy_set_domains(struct pacrunner_proxy *proxy, char **domains) if (!proxy) return -EINVAL; + if (proxy->domains) + g_list_free_full(proxy->domains, proxy_domain_destroy); + + proxy->domains = NULL; + if (!domains) - return -EINVAL; + return 0; for (domain = domains; *domain; domain++) { struct proxy_domain *data; -- 2.7.4 -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation

4 years, 4 months

2
5
0 / 0

2020

2019

2018

2017

2016

2015

connman June 2016