August 2016 - connman

[PATCH RFC] Always Connect to Interfaces with AutoConnect

by Collin Richards

Hi, I would like to have people's input on the included patch that enables autoconnecting to all interfaces that have AutoConnect=true, a feature I am calling AlwaysConnect. I believe this feature or a similar one has been asked about multiple times [1] [2] [3]. [1] https://www.mail-archive.com/connman%40connman.net/msg17388.html [2] https://lists.01.org/pipermail/connman/2016-July/000819.html [3] https://www.mail-archive.com/connman@connman.net/msg18683.html Thanks, Collin Collin Richards (1): service: Add AlwaysConnect feature src/main.c | 14 ++++++++++++++ src/main.conf | 6 ++++++ src/service.c | 9 +++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) -- 1.9.1

4 years, 2 months

2
2
0 / 0

[PATCH] src/proxy.c: modify the proxy_lookup () supporting non-browser schemes

by Atul Anand

As discussed, the proxy lookup for browser and non browser schemes should be handled in an order as follows: A request for a "browser" protocol would match the following configs order of preference (if they exist): • Matching "Domains", BrowserOnly==TRUE • Matching "Domains", BrowserOnly==FALSE • Domains==NULL, BrowserOnly==TRUE • Domains==NULL, BrowserOnly==FALSE A request for a non-browser protocol would match the following: • Matching "Domains", BrowserOnly==FALSE • Domains==NULL, BrowserOnly==FALSE (except if a config exists with Matching "Domains", BrowserOnly==TRUE, in which case we need to return NULL). --- doc/manager-api.txt | 5 ++ src/manager.c | 11 +++- src/pacrunner.h | 2 +- src/proxy.c | 116 ++++++++++++++++++++++++++++++++++++----- unit/suite/manual_basic.test | 5 ++ unit/suite/manual_exclude.test | 2 + unit/suite/pac_basic.test | 2 + unit/suite/pac_direct.test | 2 + unit/suite/proxy_domain.test | 5 ++ unit/suite/stub.test | 3 ++ unit/test-pacrunner.c | 39 ++++++++++---- 11 files changed, 164 insertions(+), 28 deletions(-) diff --git a/doc/manager-api.txt b/doc/manager-api.txt index 9e6209d..de304c0 100644 --- a/doc/manager-api.txt +++ b/doc/manager-api.txt @@ -60,6 +60,11 @@ Methods object CreateProxyConfiguration(dict settings) Interface name like "wlan0" etc. to provide consistent results for myIpAddress function. + boolean BrowserOnly [optional] + + If this value is set, proxy configuration will + be used for only browser schemes. + array{string} Domains [optional] Domain names and IP range for which this proxy diff --git a/src/manager.c b/src/manager.c index 5a8b4fd..06e399a 100644 --- a/src/manager.c +++ b/src/manager.c @@ -142,6 +142,7 @@ static DBusMessage *create_proxy_config(DBusConnection *conn, const char *url = NULL, *script = NULL; char **servers = NULL, **excludes = NULL; char **domains = NULL, **nameservers = NULL; + gboolean browser_only = FALSE; sender = dbus_message_get_sender(msg); @@ -199,13 +200,18 @@ static DBusMessage *create_proxy_config(DBusConnection *conn, nameservers = extract_string_array(&list); } break; + case DBUS_TYPE_BOOLEAN: + if (g_str_equal(key, "BrowserOnly")) + dbus_message_iter_get_basic(&value, &browser_only); + + break; } dbus_message_iter_next(&array); } DBG("sender %s method %s interface %s", sender, method, interface); - DBG("url %s script %p", url, script); + DBG("browser-only %u url %s script %p", browser_only, url, script); if (!method) { reply = g_dbus_create_error(msg, @@ -226,7 +232,8 @@ static DBusMessage *create_proxy_config(DBusConnection *conn, nameservers = NULL; - if (pacrunner_proxy_set_domains(config->proxy, domains) < 0) + if (pacrunner_proxy_set_domains(config->proxy, domains, + browser_only) < 0) pacrunner_error("Failed to set proxy domains"); if (g_str_equal(method, "direct")) { diff --git a/src/pacrunner.h b/src/pacrunner.h index 87c51da..e31d7ef 100644 --- a/src/pacrunner.h +++ b/src/pacrunner.h @@ -64,7 +64,7 @@ const char *pacrunner_proxy_get_interface(struct pacrunner_proxy *proxy); const char *pacrunner_proxy_get_script(struct pacrunner_proxy *proxy); int pacrunner_proxy_set_domains(struct pacrunner_proxy *proxy, - char **domains); + char **domains, gboolean browser_only); int pacrunner_proxy_set_direct(struct pacrunner_proxy *proxy); int pacrunner_proxy_set_manual(struct pacrunner_proxy *proxy, char **servers, char **excludes); diff --git a/src/proxy.c b/src/proxy.c index db49c58..934fb7a 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -40,6 +40,7 @@ struct pacrunner_proxy { char *script; GList **servers; GList **excludes; + gboolean browser_only; GList *domains; void *jsctx; }; @@ -159,13 +160,40 @@ const char *pacrunner_proxy_get_script(struct pacrunner_proxy *proxy) return proxy->script; } -int pacrunner_proxy_set_domains(struct pacrunner_proxy *proxy, char **domains) +static gboolean check_browser_protocol(const char *url) +{ + static const char *browser_schemes[] = { + "http://", + "https://", + "ftp://", + "socks://", + "socks4://", + "socks5://", + "nntp://", + "nntps://", + }; + guint i; + + for(i = 0; i < G_N_ELEMENTS(browser_schemes); i++) { + if(strncmp(browser_schemes[i], url, strlen(browser_schemes[i])) + == 0) + return TRUE; + } + + return FALSE; +} + +int pacrunner_proxy_set_domains(struct pacrunner_proxy *proxy, char **domains, + gboolean browser_only) { int len; char *slash, **domain; char ip[INET6_ADDRSTRLEN + 1]; - DBG("proxy %p domains %p", proxy, domains); + DBG("proxy %p domains %p browser-only %u", proxy, + domains, browser_only); + + proxy->browser_only = browser_only; if (!proxy) return -EINVAL; @@ -479,13 +507,17 @@ static int compare_host_in_domain(const char *host, struct proxy_domain *match) char *pacrunner_proxy_lookup(const char *url, const char *host) { GList *l, *list; + gboolean browser_request, remember = FALSE; struct in_addr ip4_addr; struct in6_addr ip6_addr; - struct pacrunner_proxy *selected_proxy = NULL, *default_proxy = NULL; + struct pacrunner_proxy *selected_proxy = NULL; + struct pacrunner_proxy *default_browser = NULL, *default_all = NULL; int protocol = 0; DBG("url %s host %s", url, host); + browser_request = check_browser_protocol(url); + pthread_mutex_lock(&proxy_mutex); while (proxy_updating) pthread_cond_wait(&proxy_cond, &proxy_mutex); @@ -516,8 +548,11 @@ char *pacrunner_proxy_lookup(const char *url, const char *host) struct pacrunner_proxy *proxy = list->data; if (!proxy->domains) { - if (!default_proxy) - default_proxy = proxy; + if (proxy->browser_only && !default_browser) + default_browser = proxy; + else if (!proxy->browser_only && !default_all) + default_all = proxy; + continue; } @@ -531,27 +566,71 @@ char *pacrunner_proxy_lookup(const char *url, const char *host) case 4: 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; + if (browser_request) { + if (proxy->browser_only) { + selected_proxy = proxy; + goto matches; + } else if (!selected_proxy) + selected_proxy = proxy; + } + else { + if (!proxy->browser_only) { + selected_proxy = proxy; + goto matches; + } else { + /* + * Remember that domain + * matched config exist + * ed with browser_only + * TRUE.(We shouldn't + * fallback default_all) + */ + remember = TRUE; + } + } } break; case 6: if (compare_ipv6_in_net(&ip6_addr, data) == 0) { - selected_proxy = proxy; DBG("match proxy %p IPv6 range %s", proxy, data->domain); - goto found; + if (browser_request) { + if (proxy->browser_only) { + selected_proxy = proxy; + goto matches; + } else if (!selected_proxy) + selected_proxy = proxy; + } + else { + if (!proxy->browser_only) { + selected_proxy = proxy; + goto matches; + } else + remember = TRUE; + } } 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; + if (browser_request) { + if (proxy->browser_only) { + selected_proxy = proxy; + goto matches; + } else if (!selected_proxy) + selected_proxy = proxy; + } + else { + if (!proxy->browser_only) { + selected_proxy = proxy; + goto matches; + } else + remember = TRUE; + } } break; } @@ -559,11 +638,20 @@ char *pacrunner_proxy_lookup(const char *url, const char *host) } if (!selected_proxy) { - DBG("default proxy %p", default_proxy); - selected_proxy = default_proxy; + if (browser_request) { + DBG("default proxy browser %p all %p", + default_browser, default_all); + if (default_browser) + selected_proxy = default_browser; + else + selected_proxy = default_all; + } else if (!browser_request && !remember) { + DBG("default proxy all %p", default_all); + selected_proxy = default_all; + } } -found: +matches: pthread_mutex_unlock(&proxy_mutex); if (!selected_proxy) diff --git a/unit/suite/manual_basic.test b/unit/suite/manual_basic.test index 4406d9c..bfe1ff3 100644 --- a/unit/suite/manual_basic.test +++ b/unit/suite/manual_basic.test @@ -10,6 +10,9 @@ socks4://sockproxy.internal.com [excludes] +[browseronly] +FALSE + [domains] [config] @@ -24,3 +27,5 @@ https://bar.net/?property=true bar.net PROXY secproxy.internal.com; PROXY proxy.internal.com; SOCKS4 sockproxy.internal.com socks4://sockaccess.external.net:8888/sock_script sockaccess.external.net SOCKS4 sockproxy.internal.com; PROXY proxy.internal.com; PROXY secproxy.internal.com +smtp://mail.client.com/drafts mail.client.com +PROXY proxy.internal.com; PROXY secproxy.internal.com; SOCKS4 sockproxy.internal.com diff --git a/unit/suite/manual_exclude.test b/unit/suite/manual_exclude.test index 211ae16..841505a 100644 --- a/unit/suite/manual_exclude.test +++ b/unit/suite/manual_exclude.test @@ -15,6 +15,8 @@ ftp:// *net tri* +[browser_only] + [domains] [config] diff --git a/unit/suite/pac_basic.test b/unit/suite/pac_basic.test index c63757e..4217b6c 100644 --- a/unit/suite/pac_basic.test +++ b/unit/suite/pac_basic.test @@ -17,6 +17,8 @@ function FindProxyForURL(url, host) [excludes] +[browseronly] + [domains] [config] diff --git a/unit/suite/pac_direct.test b/unit/suite/pac_direct.test index b820abc..9b93214 100644 --- a/unit/suite/pac_direct.test +++ b/unit/suite/pac_direct.test @@ -11,6 +11,8 @@ function FindProxyForURL(url, host) [excludes] +[browseronly] + [domains] [config] diff --git a/unit/suite/proxy_domain.test b/unit/suite/proxy_domain.test index 8c2c5e4..1cf84d1 100644 --- a/unit/suite/proxy_domain.test +++ b/unit/suite/proxy_domain.test @@ -8,6 +8,9 @@ http://proxy.suite.com [excludes] +[browseronly] +TRUE + [domains] suite.com test.suite.com @@ -35,3 +38,5 @@ socks4://baz.domain3.com/xyz baz.domain3.com SOCKS4 sockproxy3.com; PROXY proxy3.com http://[fe80:96db:12ce::43ef]/ip6.mp4 [fe80:96db:12ce::43ef] PROXY proxy3.com; SOCKS4 sockproxy3.com +imap://mail.google.com/id=inbox mail.google.com +DIRECT diff --git a/unit/suite/stub.test b/unit/suite/stub.test index cde0aeb..2b1238f 100644 --- a/unit/suite/stub.test +++ b/unit/suite/stub.test @@ -11,6 +11,9 @@ Stub suite file [excludes] # If so, optional exlusion rules can be written here +[browseronly] +# Specifies if this configuration is for browser only schemes. + [domains] # List of domains are here diff --git a/unit/test-pacrunner.c b/unit/test-pacrunner.c index 0c4ac69..ccdeca5 100644 --- a/unit/test-pacrunner.c +++ b/unit/test-pacrunner.c @@ -38,14 +38,15 @@ #include "pacrunner.h" enum test_suite_part { - SUITE_TITLE = 0, - SUITE_PAC = 1, - SUITE_SERVERS = 2, - SUITE_EXCLUDES = 3, - SUITE_DOMAINS = 4, - SUITE_CONFIG = 5, - SUITE_TESTS = 6, - SUITE_NOTHING = 7, + SUITE_TITLE = 0, + SUITE_PAC = 1, + SUITE_SERVERS = 2, + SUITE_EXCLUDES = 3, + SUITE_BROWSER_ONLY = 4, + SUITE_DOMAINS = 5, + SUITE_CONFIG = 6, + SUITE_TESTS = 7, + SUITE_NOTHING = 8, }; enum cu_test_mode { @@ -59,6 +60,7 @@ struct pacrunner_test_suite { gchar *pac; gchar **servers; gchar **excludes; + gboolean browser_only; gchar **domains; bool config_result; @@ -145,6 +147,9 @@ static void print_test_suite(struct pacrunner_test_suite *suite) } else printf("(none)\n"); + printf("\nBrowser Only: %s\n", + suite->browser_only ? "TRUE" : "FALSE"); + printf("\nDomains:\n"); if (suite->domains) { for (line = suite->domains; *line; line++) @@ -250,6 +255,13 @@ static struct pacrunner_test_suite *read_test_suite(const char *path) suite->excludes = array; break; + case SUITE_BROWSER_ONLY: + if (strncmp(*line, "TRUE", 4) == 0) + suite->browser_only = TRUE; + else + suite->browser_only = FALSE; + + break; case SUITE_DOMAINS: array = _g_strappendv(suite->domains, *line); if (!array) @@ -291,6 +303,8 @@ static struct pacrunner_test_suite *read_test_suite(const char *path) part = SUITE_SERVERS; else if (strncmp(*line, "[excludes]", 10) == 0) part = SUITE_EXCLUDES; + else if (strncmp(*line, "[browseronly]", 13) == 0) + part = SUITE_BROWSER_ONLY; else if (strncmp(*line, "[domains]", 9) == 0) part = SUITE_DOMAINS; else if (strncmp(*line, "[config]", 8) == 0) @@ -363,7 +377,8 @@ static void test_proxy_domain(void) { int val = 0; - if (pacrunner_proxy_set_domains(proxy, test_suite->domains) != 0) + if (pacrunner_proxy_set_domains(proxy, test_suite->domains, + test_suite->browser_only) != 0) val = -1; proxy2 = pacrunner_proxy_create("eth1"); @@ -381,7 +396,8 @@ static void test_proxy_domain(void) if (pacrunner_proxy_set_manual(proxy2, servers, NULL) != 0) val = -1; - if (pacrunner_proxy_set_domains(proxy2, domains) != 0) + if (pacrunner_proxy_set_domains(proxy2, domains, + test_suite->browser_only) != 0) val = -1; } @@ -400,7 +416,8 @@ static void test_proxy_domain(void) if (pacrunner_proxy_set_manual(proxy3, servers, NULL) != 0) val = -1; - if (pacrunner_proxy_set_domains(proxy3, domains) != 0) + if (pacrunner_proxy_set_domains(proxy3, domains, + test_suite->browser_only) != 0) val = -1; } -- 2.5.5

4 years, 2 months

2
1
0 / 0

[PATCH 1/2] manual: support for non browser scheme in 'manual' mode

by Atul Anand

when a client request proxy for a url with non browser scheme (eg: smtp://mail.client.com from a mail client) it is an unknown scheme for PacRunner i.e PACRUNNER_PROTOCOL_UNKNOWN. So, PacRunner replies with a proxy string iterating from the start (http/https/ftp proxies at head). Though these proxies are not for the non browser protocols. Instead, we should reply with only SOCKs proxies (if stored) otherwise "DIRECT". --- src/manual.c | 18 ++++++++++++++++++ unit/suite/manual_basic.test | 2 ++ unit/suite/manual_exclude.test | 2 ++ 3 files changed, 22 insertions(+) diff --git a/src/manual.c b/src/manual.c index f6077bc..d69a089 100644 --- a/src/manual.c +++ b/src/manual.c @@ -593,6 +593,24 @@ static char *generate_proxy_string(GList **servers, enum pacrunner_manual_protocol i; char *result = NULL; + /* if the protocol is unknown (e.g: request from a mail client + * for a smtp:// connection), we will prefer SOCKs proxies (if + * available) otherwise simply return "DIRECT". + */ + if (proto == PACRUNNER_PROTOCOL_UNKNOWN) { + if (servers[PACRUNNER_PROTOCOL_SOCKS]) + result = append_servers_to_proxy_string(result, + servers[PACRUNNER_PROTOCOL_SOCKS]); + if (servers[PACRUNNER_PROTOCOL_SOCKS4]) + result = append_servers_to_proxy_string(result, + servers[PACRUNNER_PROTOCOL_SOCKS4]); + if (servers[PACRUNNER_PROTOCOL_SOCKS5]) + result = append_servers_to_proxy_string(result, + servers[PACRUNNER_PROTOCOL_SOCKS5]); + + return result; + } + /* if the protocol is known, we will prefer to set same * protocol-based proxies first, if any... */ if (proto >= PACRUNNER_PROTOCOL_HTTP && diff --git a/unit/suite/manual_basic.test b/unit/suite/manual_basic.test index 4406d9c..eeb9373 100644 --- a/unit/suite/manual_basic.test +++ b/unit/suite/manual_basic.test @@ -24,3 +24,5 @@ https://bar.net/?property=true bar.net PROXY secproxy.internal.com; PROXY proxy.internal.com; SOCKS4 sockproxy.internal.com socks4://sockaccess.external.net:8888/sock_script sockaccess.external.net SOCKS4 sockproxy.internal.com; PROXY proxy.internal.com; PROXY secproxy.internal.com +smtp://mail.client.com/drafts mail.client.com +SOCKS4 sockproxy.internal.com diff --git a/unit/suite/manual_exclude.test b/unit/suite/manual_exclude.test index 211ae16..95b2599 100644 --- a/unit/suite/manual_exclude.test +++ b/unit/suite/manual_exclude.test @@ -33,3 +33,5 @@ trivial.co.uk:2984 trivial.co.uk DIRECT http://failed.com:99999/ failed.com DIRECT +imap://imap.session.com/id=inbox imap.session.com +SOCKS4 sockproxy.internal.com -- 2.5.5

4 years, 2 months

2
4
0 / 0

[PATCH 6/6] Add duktape support

by David Woodhouse

--- Makefile.am | 10 +- configure.ac | 5 + duktape/duk_config.h | 3753 +++ duktape/duktape.c | 86379 +++++++++++++++++++++++++++++++++++++++++++++++++ duktape/duktape.h | 1567 + plugins/duktape.c | 229 + 6 files changed, 91942 insertions(+), 1 deletion(-) create mode 100644 duktape/duk_config.h create mode 100644 duktape/duktape.c create mode 100644 duktape/duktape.h create mode 100644 plugins/duktape.c (duktape/*.[ch] omitted from this message) diff --git a/Makefile.am b/Makefile.am index d637baf..8f1f9fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,6 +41,12 @@ builtin_sources += plugins/v8.cc builtin_libadd += @V8_LIBS@ endif +if DUKTAPE +js_sources = src/js_funcs.c +builtin_modules += duktape +builtin_sources += plugins/duktape.c duktape/duktape.c +endif + sbin_PROGRAMS = src/pacrunner src_pacrunner_SOURCES = $(gdbus_sources) $(builtin_sources) $(js_sources) \ @@ -126,11 +132,13 @@ unit_test_mozjs_LDADD = @MOZJS_LIBS@ @GLIB_LIBS@ @PTHREAD_LIBS@ endif if V8 - unit_test_pacrunner_SOURCES += plugins/v8.cc unit_test_pacrunner_LDADD += @V8_LIBS@ +endif +if DUKTAPE +unit_test_pacrunner_SOURCES += plugins/duktape.c duktape/duktape.c endif endif #UNIT diff --git a/configure.ac b/configure.ac index c788c7f..d31cdcc 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,11 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], fi ]) +AC_ARG_ENABLE(duktape, AC_HELP_STRING([--enable-duktape], + [enable Duktape Javascript plugin support])) + +AM_CONDITIONAL(DUKTAPE, test "${enable_duktape}" = "yes") + AC_ARG_ENABLE(mozjs, AC_HELP_STRING([--enable-mozjs], [enable Mozilla Javascript plugin support])) if (test "${enable_mozjs}" = "yes"); then diff --git a/plugins/duktape.c b/plugins/duktape.c new file mode 100644 index 0000000..6343023 --- /dev/null +++ b/plugins/duktape.c @@ -0,0 +1,229 @@ +/* + * PACrunner JavaScript Engine + * + * Copyright © 2013-2016 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify + * it under the terms and conditions of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 <unistd.h> +#include <string.h> +#include <sys/ioctl.h> + +#include <stdio.h> +#include <stdlib.h> +#include <pthread.h> +#include <ctype.h> + +#include <netdb.h> + +#include "pacrunner.h" +#include "js.h" + +#include "duktape/duktape.h" + +struct pacrunner_duktape { + struct pacrunner_proxy *proxy; + pthread_mutex_t lock; + duk_context *dctx; +}; + +static duk_ret_t myipaddress(duk_context *dkctx) +{ + struct pacrunner_duktape *ctx; + duk_memory_functions fns; + char address[NI_MAXHOST]; + + duk_get_memory_functions(dkctx, &fns); + ctx = fns.udata; + + if (__pacrunner_js_getipaddr(ctx->proxy, address, sizeof(address)) < 0) + duk_push_string(dkctx, NULL); + else + duk_push_string(dkctx, address); + + DBG("address %s", address); + + return 1; +} + +static duk_ret_t dnsresolve(duk_context *dkctx) +{ + struct pacrunner_duktape *ctx; + const char *host = duk_require_string(dkctx, 0); + duk_memory_functions fns; + char address[NI_MAXHOST]; + + DBG("host %s", host); + + duk_get_memory_functions(dkctx, &fns); + ctx = fns.udata; + + address[0] = 0; + if (__pacrunner_js_resolve(ctx->proxy, host, address, sizeof(address)) < 0) + duk_push_string(dkctx, NULL); + else + duk_push_string(dkctx, address); + + DBG("address %s", address); + + return 1; +} + +static int create_object(struct pacrunner_proxy *proxy) +{ + struct pacrunner_duktape *ctx; + const char *script; + + script = (char *) pacrunner_proxy_get_script(proxy); + if (!script) { + pacrunner_error("no script\n"); + return 0; + } + + ctx = g_malloc0(sizeof(struct pacrunner_duktape)); + + ctx->proxy = proxy; + ctx->dctx = duk_create_heap(NULL, NULL, NULL, ctx, NULL); + if (!ctx->dctx) { + pacrunner_error("no headp\n"); + g_free(ctx); + return -ENOMEM; + } + duk_push_global_object(ctx->dctx); + + /* Register the C functions so the script can use them */ + duk_push_c_function(ctx->dctx, myipaddress, 0); + duk_put_prop_string(ctx->dctx, -2, "myIpAddress"); + + duk_push_c_function(ctx->dctx, dnsresolve, 1); + duk_put_prop_string(ctx->dctx, -2, "dnsResolve"); + + if (duk_peval_string_noresult(ctx->dctx, __pacrunner_js_routines) != 0 || + duk_peval_string_noresult(ctx->dctx, script) != 0) { + pacrunner_error("Error: %s\n", + duk_safe_to_string(ctx->dctx, -1)); + duk_destroy_heap(ctx->dctx); + g_free(ctx); + return -EINVAL; + } + + if (pthread_mutex_init(&ctx->lock, NULL) != 0) { + pacrunner_error("Failed to init mutex lock\n"); + duk_destroy_heap(ctx->dctx); + g_free(ctx); + return -EIO; + } + + __pacrunner_proxy_set_jsctx(proxy, ctx); + pacrunner_error("done %p\n", ctx); + return 0; +} + +static int duktape_clear_proxy(struct pacrunner_proxy *proxy) +{ + struct pacrunner_duktape *ctx = __pacrunner_proxy_get_jsctx(proxy); + + DBG("proxy %p ctx %p", proxy, ctx); + + if (!ctx) + return -EINVAL; + + duk_destroy_heap(ctx->dctx); + pthread_mutex_destroy(&ctx->lock); + + __pacrunner_proxy_set_jsctx(proxy, NULL); + return 0; +} + +static int duktape_set_proxy(struct pacrunner_proxy *proxy) +{ + DBG("proxy %p", proxy); + + if (!proxy) + return 0; + + duktape_clear_proxy(proxy); + + return create_object(proxy); +} + +static char *duktape_execute(struct pacrunner_proxy *proxy, + const char *url, const char *host) +{ + struct pacrunner_duktape *ctx = __pacrunner_proxy_get_jsctx(proxy); + char *result; + + DBG("proxy %p ctx %p url %s host %s", proxy, ctx, url, host); + + if (!ctx) + return NULL; + + pthread_mutex_lock(&ctx->lock); + + duk_get_prop_string(ctx->dctx, -1 /*index*/, "FindProxyForURL"); + + duk_push_string(ctx->dctx, url); + duk_push_string(ctx->dctx, host); + if (duk_pcall(ctx->dctx, 2 /*nargs*/) != 0) { + pacrunner_error("Error: %s\n", + duk_safe_to_string(ctx->dctx, -1)); + result = NULL; + } else { + result = strdup(duk_safe_to_string(ctx->dctx, -1)); + } + duk_pop(ctx->dctx); /* pop result/error */ + + if (result) { + DBG("the return string is: %s\n", result); + } + + pthread_mutex_unlock(&ctx->lock); + + return result; +} + + +static struct pacrunner_js_driver duktape_driver = { + .name = "duktape", + .priority = PACRUNNER_JS_PRIORITY_HIGH, + .set_proxy = duktape_set_proxy, + .clear_proxy = duktape_clear_proxy, + .execute = duktape_execute, +}; + +static int duktape_init(void) +{ + DBG(""); + + return pacrunner_js_driver_register(&duktape_driver); +} + + +static void duktape_exit(void) +{ + DBG(""); + + pacrunner_js_driver_unregister(&duktape_driver); + + duktape_set_proxy(NULL); +} + +PACRUNNER_PLUGIN_DEFINE(duktape, duktape_init, duktape_exit) -- 2.5.5 -- dwmw2

4 years, 2 months

2
2
0 / 0

[PATCH 1/6] mozjs: Fix error handling for wrongly-formatted hostname

by David Woodhouse

From: David Woodhouse <David.Woodhouse(a)intel.com> In commit d9ea7b8a ("plugins: Do not try to resolve a wrongly formated hostname") we introduced a check on the string before we attempt to resolve it. In the mozjs case we simply return a NULL result instead of raising an exception when this function fails... except that the new sanity check was placed before the JS_SET_RVAL() call, and no return value was set at all. Move it to the right place. --- plugins/mozjs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/mozjs.c b/plugins/mozjs.c index 130c3c9..feaabd9 100644 --- a/plugins/mozjs.c +++ b/plugins/mozjs.c @@ -132,6 +132,8 @@ static JSBool dnsresolve(JSContext *ctx, uintN argc, jsval *vp) DBG("host %s", host); + JS_SET_RVAL(ctx, vp, JSVAL_NULL); + /* Q&D test on host to know if it is a proper hostname */ split_res = g_strsplit_set(host, ":%?!,;@\\'*|<>{}[]()+=$&~# \"", -1); if (split_res) { @@ -142,8 +144,6 @@ static JSBool dnsresolve(JSContext *ctx, uintN argc, jsval *vp) goto out; } - JS_SET_RVAL(ctx, vp, JSVAL_NULL); - if (resolve(host, address, sizeof(address)) < 0) goto out; -- 2.7.4

4 years, 2 months

2
7
0 / 0

[PATCH] technolgoy: avoid redundant saving to the file system

by Yusuke Nakamura

Even if OfflineMode is the same as before, Connman always saves to the file system. This patch makes Connman to save OfflineMode only when it is actually changed in order to avoid redundant data writing. --- src/technology.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/technology.c b/src/technology.c index 1891d06..b672dfa 100644 --- a/src/technology.c +++ b/src/technology.c @@ -444,15 +444,31 @@ bool __connman_technology_get_offlinemode(void) static void connman_technology_save_offlinemode(void) { GKeyFile *keyfile; + GError *error = NULL; + bool offlinemode; keyfile = __connman_storage_load_global(); - if (!keyfile) + + if (!keyfile) { keyfile = g_key_file_new(); + g_key_file_set_boolean(keyfile, "global", + "OfflineMode", global_offlinemode); - g_key_file_set_boolean(keyfile, "global", + __connman_storage_save_global(keyfile); + } + else { + offlinemode = g_key_file_get_boolean(keyfile, "global", + "OfflineMode", &error); + + if (error || offlinemode != global_offlinemode) { + g_key_file_set_boolean(keyfile, "global", "OfflineMode", global_offlinemode); + if (error) + g_clear_error(&error); - __connman_storage_save_global(keyfile); + __connman_storage_save_global(keyfile); + } + } g_key_file_free(keyfile); -- 1.7.9.5

4 years, 2 months

1
0
0 / 0

storage handling

by Nakamura, Yusuke (ADITJ/SWG)

Hi I'm working on Connman integrated in an automotive system. I'd like to reduce the frequency of writing data to the file system as much as possible since it requires to support long term lifecycle and limited storage capability. Connman always saves a keyfile to the file system (/var/lib/connman/service_name) when it connects to an access point successfully. If the user connects to the usual access point, the key to be updated in the keyfile is usually only "Modified". As far as I can see no one in the Connman seems to rely on this key. Therefore I'd like to make Connman not to save the keyfile to the file system if updated key is only "Modified". What do you think? Thanks, Yusuke.

4 years, 2 months

3
4
0 / 0

[PATCH] stats: add --enable-stats/--disable-stats compile flag.

by Feng Wang

This flag turns on/off the persistent statistic numbers support. --- Makefile.am | 4 ++++ configure.ac | 5 +++++ src/stats.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/Makefile.am b/Makefile.am index d70725c..fd38bb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -223,6 +223,10 @@ else AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus endif +if STATS +AM_CPPFLAGS += -DCONNMAN_WITH_STATS +endif + src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \ @GNUTLS_CFLAGS@ $(builtin_cflags) \ -DCONNMAN_PLUGIN_BUILTIN \ diff --git a/configure.ac b/configure.ac index c330314..a8a03a3 100644 --- a/configure.ac +++ b/configure.ac @@ -352,6 +352,11 @@ AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools], [enable_tools=${enableval}]) AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no") +AC_ARG_ENABLE(stats, AC_HELP_STRING([--disable-stats], + [disable stats file support]), + [enable_stats=${enableval}]) +AM_CONDITIONAL(STATS, test "${enable_stats}" != "no") + if (test "${enable_tools}" != "no"); then AC_PATH_PROGS(IPTABLES_SAVE, [iptables-save], [], $PATH:/sbin:/usr/sbin) diff --git a/src/stats.c b/src/stats.c index 26343b1..8fb2139 100644 --- a/src/stats.c +++ b/src/stats.c @@ -37,6 +37,7 @@ #include "connman.h" +#ifdef CONNMAN_WITH_STATS #define MODE (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | \ S_IXGRP | S_IROTH | S_IXOTH) @@ -823,3 +824,38 @@ void __connman_stats_cleanup(void) g_hash_table_destroy(stats_hash); stats_hash = NULL; } + +#else + +int __connman_stats_service_register(struct connman_service *service) +{ + return -ENOTSUP; +} + +void __connman_stats_service_unregister(struct connman_service *service) +{ +} + +int __connman_stats_update(struct connman_service *service, + bool roaming, + struct connman_stats_data *data) +{ + return 0; +} + +int __connman_stats_get(struct connman_service *service, + bool roaming, + struct connman_stats_data *data) +{ + return 0; +} + +int __connman_stats_init(void) +{ + return 0; +} + +void __connman_stats_cleanup(void) +{ +} +#endif /* CONNMAN_WITH_STATS */ -- 2.8.0.rc3.226.g39d4020

4 years, 2 months

1
0
0 / 0

NTP service

by Thomas Green

All, Is there a way to easily disable the NTP service? Our application does our own time services, and when connman conflicts with it, it breaks our application. Tom

4 years, 2 months

2
2
0 / 0

[PATCH] rtnl: Treat bond interfaces as ethernet

by Justin Maggard

Since Linux 3.9, the kernel started setting the sysfs DEVTYPE for bond interfaces to 'bond', which made connman start classifying the service type and device type as UNKNOWN. So we need to handle DEVTYPE=bond so we can configure bond inferfaces on modern kernels. Signed-off-by: Justin Maggard <jmaggard(a)netgear.com> --- src/rtnl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rtnl.c b/src/rtnl.c index d1b851f..0e58eef 100644 --- a/src/rtnl.c +++ b/src/rtnl.c @@ -173,7 +173,9 @@ static void read_uevent(struct interface_data *interface) } else if (strcmp(line + 8, "vlan") == 0) { interface->service_type = CONNMAN_SERVICE_TYPE_ETHERNET; interface->device_type = CONNMAN_DEVICE_TYPE_ETHERNET; - + } else if (strcmp(line + 8, "bond") == 0) { + interface->service_type = CONNMAN_SERVICE_TYPE_ETHERNET; + interface->device_type = CONNMAN_DEVICE_TYPE_ETHERNET; } else { interface->service_type = CONNMAN_SERVICE_TYPE_UNKNOWN; interface->device_type = CONNMAN_DEVICE_TYPE_UNKNOWN; -- 2.9.1

4 years, 2 months

2
1
0 / 0

2020

2019

2018

2017

2016

2015

connman August 2016