October 2017 - connman

[PATCH v3 1/5] dnsproxy: add a new function to the API.

by Ismo Puustinen

int __connman_dnsproxy_set_mdns(int index, bool enabled); Turn mDNS support for the interface with specified interface index on or off. --- src/connman.h | 1 + src/dns-systemd-resolved.c | 35 +++++++++++++++++++++++++++++++++++ src/dnsproxy.c | 5 +++++ 3 files changed, 41 insertions(+) diff --git a/src/connman.h b/src/connman.h index da4446a4..72f8b113 100644 --- a/src/connman.h +++ b/src/connman.h @@ -952,6 +952,7 @@ int __connman_dnsproxy_add_listener(int index); void __connman_dnsproxy_remove_listener(int index); int __connman_dnsproxy_append(int index, const char *domain, const char *server); int __connman_dnsproxy_remove(int index, const char *domain, const char *server); +int __connman_dnsproxy_set_mdns(int index, bool enabled); int __connman_6to4_probe(struct connman_service *service); void __connman_6to4_remove(struct connman_ipconfig *ipconfig); diff --git a/src/dns-systemd-resolved.c b/src/dns-systemd-resolved.c index 4e9b2ff1..5fe306c3 100644 --- a/src/dns-systemd-resolved.c +++ b/src/dns-systemd-resolved.c @@ -36,6 +36,11 @@ #define SYSTEMD_RESOLVED_SERVICE "org.freedesktop.resolve1" #define SYSTEMD_RESOLVED_PATH "/org/freedesktop/resolve1" +struct mdns_data { + int index; + bool enabled; +}; + static GHashTable *interface_hash; static DBusConnection *connection; static GDBusClient *client; @@ -399,6 +404,36 @@ static int setup_resolved(void) return 0; } +static void setlinkmulticastdns_append(DBusMessageIter *iter, void *user_data) { + struct mdns_data *data = user_data; + char *val = "no"; + + if (data->enabled) + val = "yes"; + + DBG("SetLinkMulticastDNS: %d/%s", data->index, val); + + dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &data->index); + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &val); +} + +int __connman_dnsproxy_set_mdns(int index, bool enabled) +{ + struct mdns_data data = { .index = index, .enabled = enabled }; + + if (!resolved_proxy) + return -ENOENT; + + if (index < 0) + return -EINVAL; + + if (!g_dbus_proxy_method_call(resolved_proxy, "SetLinkMulticastDNS", + setlinkmulticastdns_append, NULL, &data, NULL)) + return -EINVAL; + + return 0; +} + int __connman_dnsproxy_init(void) { int ret; diff --git a/src/dnsproxy.c b/src/dnsproxy.c index 8b2827a5..1db3eae9 100644 --- a/src/dnsproxy.c +++ b/src/dnsproxy.c @@ -3947,6 +3947,11 @@ destroy: return err; } +int __connman_dnsproxy_set_mdns(int index, bool enabled) +{ + return -ENOTSUP; +} + void __connman_dnsproxy_cleanup(void) { DBG(""); -- 2.13.6

2 years, 5 months

2
5
0 / 0

[PATCH v2 1/6] dnsproxy: move dns module prototypes to a separate file.

by Ismo Puustinen

--- include/dnsproxy.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/connman.h | 7 ------- src/dns-systemd-resolved.c | 1 + src/dnsproxy.c | 1 + src/resolver.c | 1 + src/tethering.c | 1 + 6 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 include/dnsproxy.h diff --git a/include/dnsproxy.h b/include/dnsproxy.h new file mode 100644 index 00000000..40971b96 --- /dev/null +++ b/include/dnsproxy.h @@ -0,0 +1,46 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2017 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_DNSPROXY_H +#define __CONNMAN_DNSPROXY_H + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * SECTION:dnsproxy + * @title: dnsproxy premitives + * @short_description: Functions for registering dnsproxy modules + */ + +int __connman_dnsproxy_init(void); +void __connman_dnsproxy_cleanup(void); +int __connman_dnsproxy_add_listener(int index); +void __connman_dnsproxy_remove_listener(int index); +int __connman_dnsproxy_append(int index, const char *domain, const char *server); +int __connman_dnsproxy_remove(int index, const char *domain, const char *server); + +#ifdef __cplusplus +} +#endif + +#endif /* __CONNMAN_DNSPROXY_H */ diff --git a/src/connman.h b/src/connman.h index da4446a4..fe7e1b0d 100644 --- a/src/connman.h +++ b/src/connman.h @@ -946,13 +946,6 @@ int __connman_iptables_init(void); void __connman_iptables_cleanup(void); int __connman_iptables_commit(const char *table_name); -int __connman_dnsproxy_init(void); -void __connman_dnsproxy_cleanup(void); -int __connman_dnsproxy_add_listener(int index); -void __connman_dnsproxy_remove_listener(int index); -int __connman_dnsproxy_append(int index, const char *domain, const char *server); -int __connman_dnsproxy_remove(int index, const char *domain, const char *server); - int __connman_6to4_probe(struct connman_service *service); void __connman_6to4_remove(struct connman_ipconfig *ipconfig); int __connman_6to4_check(struct connman_ipconfig *ipconfig); diff --git a/src/dns-systemd-resolved.c b/src/dns-systemd-resolved.c index 4e9b2ff1..0ab24e8d 100644 --- a/src/dns-systemd-resolved.c +++ b/src/dns-systemd-resolved.c @@ -32,6 +32,7 @@ #include <connman/dbus.h> #include "connman.h" +#include "dnsproxy.h" #define SYSTEMD_RESOLVED_SERVICE "org.freedesktop.resolve1" #define SYSTEMD_RESOLVED_PATH "/org/freedesktop/resolve1" diff --git a/src/dnsproxy.c b/src/dnsproxy.c index 8b2827a5..efc582fa 100644 --- a/src/dnsproxy.c +++ b/src/dnsproxy.c @@ -40,6 +40,7 @@ #include <glib.h> #include "connman.h" +#include "dnsproxy.h" #define debug(fmt...) do { } while (0) diff --git a/src/resolver.c b/src/resolver.c index 75ea5ba6..e8157e8c 100644 --- a/src/resolver.c +++ b/src/resolver.c @@ -34,6 +34,7 @@ #include <netdb.h> #include "connman.h" +#include "dnsproxy.h" #define RESOLV_CONF_STATEDIR STATEDIR"/resolv.conf" #define RESOLV_CONF_ETC "/etc/resolv.conf" diff --git a/src/tethering.c b/src/tethering.c index c929ba71..28620567 100644 --- a/src/tethering.c +++ b/src/tethering.c @@ -39,6 +39,7 @@ #include <linux/if_bridge.h> #include "connman.h" +#include "dnsproxy.h" #include <gdhcp/gdhcp.h> -- 2.13.6

2 years, 5 months

3
7
0 / 0

[PATCH] peer: Don't try to connect to already connected peer

by Saurav Babu

Signed-off-by: Saurav Babu <saurav.babu(a)samsung.com> --- src/peer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/peer.c b/src/peer.c index 340cbcc..1b9b80e 100644 --- a/src/peer.c +++ b/src/peer.c @@ -606,6 +606,9 @@ static int peer_connect(struct connman_peer *peer) { int err = -ENOTSUP; + if (is_connected(peer)) + return -EISCONN; + if (peer_driver->connect) err = peer_driver->connect(peer, CONNMAN_PEER_WPS_UNKNOWN, NULL); -- 1.9.1

2 years, 5 months

2
1
0 / 0

[PATCH] client: add newline to every error message

by Mikhail Kovyazin

--- client/commands.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/commands.c b/client/commands.c index 583095b1..39f15b0a 100644 --- a/client/commands.c +++ b/client/commands.c @@ -245,7 +245,7 @@ static int state_print(DBusMessageIter *iter, const char *error, DBusMessageIter entry; if (error) { - fprintf(stderr, "Error: %s", error); + fprintf(stderr, "Error: %s\n", error); return 0; } @@ -272,7 +272,7 @@ static int clock_print(DBusMessageIter *iter, const char *error, DBusMessageIter entry; if (error) { - fprintf(stderr, "Error: %s", error); + fprintf(stderr, "Error: %s\n", error); return 0; } @@ -1735,7 +1735,7 @@ static int session_connect_cb(DBusMessageIter *iter, const char *error, void *user_data) { if (error) { - fprintf(stderr, "Error: %s", error); + fprintf(stderr, "Error: %s\n", error); return 0; } @@ -1754,7 +1754,7 @@ static int session_disconnect_cb(DBusMessageIter *iter, const char *error, void *user_data) { if (error) - fprintf(stderr, "Error: %s", error); + fprintf(stderr, "Error: %s\n", error); return 0; } @@ -3012,7 +3012,7 @@ static int populate_technology_hash(DBusMessageIter *iter, const char *error, void *user_data) { if (error) { - fprintf(stderr, "Error getting technologies: %s", error); + fprintf(stderr, "Error getting technologies: %s\n", error); return 0; } -- 2.14.2

2 years, 5 months

2
1
0 / 0

WiFi autoscan improvement

by Raul.Camacho＠continental-corporation.com

Hi All, My name is Raul Camacho and I am software developer on Continental Automotive company. I am involved on projects which use connman to handle WiFi technology (STA) and currently we have a customer requirement which specifies that our product needs to perform a periodic autoscan when WiFi is enabled (STA). connman by itself has predefined autoscan scheme "exponential:3:300", however in order to meet our customer requeriment, I proposed the following implemetation on connman (wifi plugin): diff --git a/plugins/wifi.c b/plugins/wifi.c index 9d56671..4bc7bec 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -64,7 +64,7 @@ #define FAVORITE_MAXIMUM_RETRIES 2 #define BGSCAN_DEFAULT "simple:30:-45:300" -#define AUTOSCAN_DEFAULT "exponential:3:300" +#define AUTOSCAN_DEFAULT "periodic:15" #define P2P_FIND_TIMEOUT 30 #define P2P_CONNECTION_TIMEOUT 100 @@ -83,6 +83,11 @@ enum wifi_ap_capability{ WIFI_AP_NOT_SUPPORTED = 2, }; +enum wifi_autoscan_module{ + WIFI_AUTOSCAN_EXPONENTIAL = 0, + WIFI_AUTOSCAN_PERIODIC = 1, +}; + struct hidden_params { char ssid[32]; unsigned int ssid_len; @@ -99,6 +104,7 @@ struct hidden_params { * Should be removed when wpa_s autoscan support will be by default. */ struct autoscan_params { + enum wifi_autoscan_module module; int base; int limit; int interval; @@ -825,13 +831,14 @@ static void reset_autoscan(struct connman_device *device) autoscan = wifi->autoscan; - if (autoscan->timeout == 0 && autoscan->interval == 0) + if (autoscan->timeout == 0) return; g_source_remove(autoscan->timeout); - autoscan->timeout = 0; - autoscan->interval = 0; + + if (autoscan->module == WIFI_AUTOSCAN_EXPONENTIAL) + autoscan->interval = 0; connman_device_unref(device); } @@ -1346,25 +1353,30 @@ static gboolean autoscan_timeout(gpointer data) autoscan = wifi->autoscan; - if (autoscan->interval <= 0) { - interval = autoscan->base; - goto set_interval; - } else - interval = autoscan->interval * autoscan->base; + if (autoscan->module == WIFI_AUTOSCAN_EXPONENTIAL){ + if (autoscan->interval <= 0) { + interval = autoscan->base; + goto set_interval; + } else + interval = autoscan->interval * autoscan->base; - if (interval > autoscan->limit) - interval = autoscan->limit; + if (interval > autoscan->limit) + interval = autoscan->limit; - throw_wifi_scan(wifi->device, scan_callback_hidden); + throw_wifi_scan(wifi->device, scan_callback_hidden); set_interval: - DBG("interval %d", interval); - - autoscan->interval = interval; - - autoscan->timeout = g_timeout_add_seconds(interval, - autoscan_timeout, device); - + DBG("exponential interval %d", interval); + autoscan->interval = interval; + autoscan->timeout = g_timeout_add_seconds(interval, + autoscan_timeout, device); + } + else if (autoscan->module == WIFI_AUTOSCAN_PERIODIC) { + throw_wifi_scan(wifi->device, scan_callback_hidden); + DBG("periodic interval %d", autoscan->interval); + autoscan->timeout = g_timeout_add_seconds(autoscan->interval, + autoscan_timeout, device); + } return FALSE; } @@ -1388,7 +1400,7 @@ static void start_autoscan(struct connman_device *device) if (!autoscan) return; - if (autoscan->timeout > 0 || autoscan->interval > 0) + if (autoscan->timeout > 0) return; connman_device_ref(device); @@ -1400,8 +1412,11 @@ static struct autoscan_params *parse_autoscan_params(const char *params) { struct autoscan_params *autoscan; char **list_params; + enum wifi_autoscan_module module; int limit; int base; + int interval; + int num_params; DBG("Emulating autoscan"); @@ -1409,13 +1424,28 @@ static struct autoscan_params *parse_autoscan_params(const char *params) if (list_params == 0) return NULL; - if (g_strv_length(list_params) < 3) { + num_params = g_strv_length(list_params); + if (num_params < 2 || num_params > 3) { g_strfreev(list_params); return NULL; } - base = atoi(list_params[1]); - limit = atoi(list_params[2]); + if (0 == g_strcmp0("exponential", list_params[0])){ + module = WIFI_AUTOSCAN_EXPONENTIAL; + base = atoi(list_params[1]); + limit = atoi(list_params[2]); + interval = 0; + } + else if (0 == g_strcmp0("periodic", list_params[0])) { + module = WIFI_AUTOSCAN_PERIODIC; + base = 0; + limit = 0; + interval = atoi(list_params[1]); + } + else { + g_strfreev(list_params); + return NULL; + } g_strfreev(list_params); @@ -1425,10 +1455,13 @@ static struct autoscan_params *parse_autoscan_params(const char *params) return NULL; } - DBG("base %d - limit %d", base, limit); + autoscan->module = module; autoscan->base = base; autoscan->limit = limit; + autoscan->interval = interval; + DBG("module %s - base %d - limit %d - interval %d", (autoscan->module == WIFI_AUTOSCAN_EXPONENTIAL) ? "exponential" : "periodic", + autoscan->base, autoscan->limit, autoscan->interval); return autoscan; } With this patch, connman will be able to perform either a "periodic" or "exponential" autoscan scheme by setting the AUTOSCAN_DEFAULT var as "exponential:xxx:xxx" or "periodic:xxx", exactly same way in which wpa_supplicant (autoscan) can be set on config file. The connman version I use is 1.33. The reason why I am sending this to you, is because I would like to know if this feature can be implemented on connman oficial release. We really want to contribute to the connman community. Due to this is my fist time that I participate on this community, I hope I did it in a correct way. Best Regards. Raúl Camacho Software Developer

2 years, 5 months

3
2
0 / 0

autoconnect should be disabled while password input is in progress

by Vasyl Vavrychuk

Hi All, I can reproduce situation described in this commit https://git.merproject.org/mer-core/connman/commit/b060f70489a431b9fa13f9... 1. Suppose we are already connected to some network. 2. Click on another WPA-personal network to connect for which we do not have password recorded. 3. Password popup dialog will appear. Problem: status of connected network will be changed to: connect-failed, connecting... etc. Is it possible to integrate mentioned patch? Regards, Vasyl

2 years, 5 months

2
1
0 / 0

[PATCH 1/5] dnsproxy: move dns module prototypes to a separate file.

by Ismo Puustinen

--- include/dnsproxy.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/connman.h | 7 ------- src/dns-systemd-resolved.c | 1 + src/dnsproxy.c | 1 + src/resolver.c | 1 + src/tethering.c | 1 + 6 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 include/dnsproxy.h diff --git a/include/dnsproxy.h b/include/dnsproxy.h new file mode 100644 index 00000000..40971b96 --- /dev/null +++ b/include/dnsproxy.h @@ -0,0 +1,46 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2017 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_DNSPROXY_H +#define __CONNMAN_DNSPROXY_H + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * SECTION:dnsproxy + * @title: dnsproxy premitives + * @short_description: Functions for registering dnsproxy modules + */ + +int __connman_dnsproxy_init(void); +void __connman_dnsproxy_cleanup(void); +int __connman_dnsproxy_add_listener(int index); +void __connman_dnsproxy_remove_listener(int index); +int __connman_dnsproxy_append(int index, const char *domain, const char *server); +int __connman_dnsproxy_remove(int index, const char *domain, const char *server); + +#ifdef __cplusplus +} +#endif + +#endif /* __CONNMAN_DNSPROXY_H */ diff --git a/src/connman.h b/src/connman.h index da4446a4..fe7e1b0d 100644 --- a/src/connman.h +++ b/src/connman.h @@ -946,13 +946,6 @@ int __connman_iptables_init(void); void __connman_iptables_cleanup(void); int __connman_iptables_commit(const char *table_name); -int __connman_dnsproxy_init(void); -void __connman_dnsproxy_cleanup(void); -int __connman_dnsproxy_add_listener(int index); -void __connman_dnsproxy_remove_listener(int index); -int __connman_dnsproxy_append(int index, const char *domain, const char *server); -int __connman_dnsproxy_remove(int index, const char *domain, const char *server); - int __connman_6to4_probe(struct connman_service *service); void __connman_6to4_remove(struct connman_ipconfig *ipconfig); int __connman_6to4_check(struct connman_ipconfig *ipconfig); diff --git a/src/dns-systemd-resolved.c b/src/dns-systemd-resolved.c index 4e9b2ff1..0ab24e8d 100644 --- a/src/dns-systemd-resolved.c +++ b/src/dns-systemd-resolved.c @@ -32,6 +32,7 @@ #include <connman/dbus.h> #include "connman.h" +#include "dnsproxy.h" #define SYSTEMD_RESOLVED_SERVICE "org.freedesktop.resolve1" #define SYSTEMD_RESOLVED_PATH "/org/freedesktop/resolve1" diff --git a/src/dnsproxy.c b/src/dnsproxy.c index 8b2827a5..efc582fa 100644 --- a/src/dnsproxy.c +++ b/src/dnsproxy.c @@ -40,6 +40,7 @@ #include <glib.h> #include "connman.h" +#include "dnsproxy.h" #define debug(fmt...) do { } while (0) diff --git a/src/resolver.c b/src/resolver.c index 75ea5ba6..e8157e8c 100644 --- a/src/resolver.c +++ b/src/resolver.c @@ -34,6 +34,7 @@ #include <netdb.h> #include "connman.h" +#include "dnsproxy.h" #define RESOLV_CONF_STATEDIR STATEDIR"/resolv.conf" #define RESOLV_CONF_ETC "/etc/resolv.conf" diff --git a/src/tethering.c b/src/tethering.c index c929ba71..28620567 100644 --- a/src/tethering.c +++ b/src/tethering.c @@ -39,6 +39,7 @@ #include <linux/if_bridge.h> #include "connman.h" +#include "dnsproxy.h" #include <gdhcp/gdhcp.h> -- 2.13.6

2 years, 5 months

2
5
0 / 0

[PATCH] wifi: Stop autoscanning once tethering has started

by blanquicet＠gmail.com

From: Jose Blanquicet <jose.blanquicet(a)magnetimarelli.com> --- plugins/wifi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/wifi.c b/plugins/wifi.c index 34c16dfd4486..74f216d2d6ca 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -2370,17 +2370,20 @@ static void interface_state(GSupplicantInterface *interface) if (!wifi) return; + device = wifi->device; + if (!device) + return; + if (state == G_SUPPLICANT_STATE_COMPLETED) { if (wifi->tethering_param) { g_free(wifi->tethering_param->ssid); g_free(wifi->tethering_param); wifi->tethering_param = NULL; } - } - device = wifi->device; - if (!device) - return; + if (wifi->tethering) + stop_autoscan(device); + } if (g_supplicant_interface_get_ready(interface) && !wifi->interface_ready) { -- 1.9.1

2 years, 5 months

2
1
0 / 0

[PATCH v2] client: Add session contextIdentifier config support

by sutar.mounesh＠gmail.com

From: Bjoern Thorwirth <external.bjoern.thorwirth(a)de.bosch.com> Added contextIdentifier field in session config. This allows processes to select a service context dependent behaviour for which the routing decision is made. diff --git a/client/commands.c b/client/commands.c index 583095b..56e098b 100644 --- a/client/commands.c +++ b/client/commands.c @@ -901,6 +901,13 @@ struct config_append { int values; }; +struct session_options { + char **args; + int num; + char *notify_path; + struct connman_option *options; +}; + static void config_append_ipv4(DBusMessageIter *iter, void *user_data) { @@ -1796,28 +1803,141 @@ static int session_create_cb(DBusMessageIter *iter, const char *error, return -EINPROGRESS; } +static void session_config_append_array(DBusMessageIter *iter, + void *user_data) +{ + struct config_append *append = user_data; + char **opts = append->opts; + int i = 1; + + if (!opts) + return; + + while (opts[i] && strncmp(opts[i], "--", 2) != 0) { + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, + &opts[i]); + i++; + } + + append->values = i; +} + +static void session_create_append_dict(DBusMessageIter *iter, void *user_data) +{ + struct session_options *args_struct = user_data; + int index = 0, res = 0; + struct config_append append; + char c; + char *ifname; + dbus_bool_t source_ip_rule; + + while (index < args_struct->num && args_struct->args[index]) { + append.opts = &args_struct->args[index]; + append.values = 0; + + c = parse_args(args_struct->args[index], args_struct->options); + + switch (c) { + case 'b': + __connmanctl_dbus_append_dict_string_array(iter, "AllowedBearers", + session_config_append_array, + &append); + break; + case 't': + if (! args_struct->args[index + 1]) { + res = -EINVAL; + break; + } + __connmanctl_dbus_append_dict_entry(iter, "ConnectionType", + DBUS_TYPE_STRING, + &args_struct->args[index + 1]); + append.values = 2; + break; + case 'i': + if (index + 1 < args_struct->num) + ifname = args_struct->args[index + 1]; + else + ifname = ""; + __connmanctl_dbus_append_dict_entry(iter, "AllowedInterface", + DBUS_TYPE_STRING, + &ifname); + append.values = 2; + break; + case 's': + if (! args_struct->args[index + 1]) { + res = -EINVAL; + break; + } + switch (parse_boolean( args_struct->args[index + 1])) { + case 1: + source_ip_rule = TRUE; + break; + case 0: + source_ip_rule = FALSE; + break; + default: + res = -EINVAL; + break; + } + __connmanctl_dbus_append_dict_entry(iter, "SourceIPRule", + DBUS_TYPE_BOOLEAN, + &source_ip_rule); + append.values = 2; + break; + case 'c': + if (!args_struct->args[index + 1]) { + res = -EINVAL; + break; + } + __connmanctl_dbus_append_dict_entry(iter, "ContextIdentifier", + DBUS_TYPE_STRING, + &args_struct->args[index + 1]); + append.values = 2; + break; + default: + res = -EINVAL; + } + + if (res < 0 && res != -EINPROGRESS) { + printf("Error '%s': %s\n", args_struct->args[index], + strerror(-res)); + return; + } + + index += append.values; + } + + return; +} static void session_create_append(DBusMessageIter *iter, void *user_data) { - const char *notify_path = user_data; + struct session_options *args_struct = user_data; - __connmanctl_dbus_append_dict(iter, NULL, NULL); + __connmanctl_dbus_append_dict(iter, session_create_append_dict, + args_struct); dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, - &notify_path); + &args_struct->notify_path); } -static int session_create(gboolean connect) +static int session_create(gboolean connect, char *args[], int num, + struct connman_option *options) { int res; char *notify_path; + struct session_options args_struct; + args_struct.args = args; + args_struct.num = num; + args_struct.options = options; notify_path = g_strdup_printf("/net/connman/connmanctl%d", getpid()); session_notify_add(notify_path); + args_struct.notify_path = notify_path; res = __connmanctl_dbus_method_call(connection, "net.connman", "/", "net.connman.Manager", "CreateSession", session_create_cb, GINT_TO_POINTER(connect), - session_create_append, notify_path); + session_create_append, &args_struct); g_free(notify_path); @@ -1871,25 +1991,6 @@ static int session_config_return(DBusMessageIter *iter, const char *error, return 0; } -static void session_config_append_array(DBusMessageIter *iter, - void *user_data) -{ - struct config_append *append = user_data; - char **opts = append->opts; - int i = 1; - - if (!opts) - return; - - while (opts[i] && strncmp(opts[i], "--", 2) != 0) { - dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, - &opts[i]); - i++; - } - - append->values = i; -} - static int session_config(char *args[], int num, struct connman_option *options) { @@ -1959,7 +2060,18 @@ static int session_config(char *args[], int num, DBUS_TYPE_BOOLEAN, &source_ip_rule); append.values = 2; break; + case 'c': + if (!args[index + 1]) { + res = -EINVAL; + break; + } + res = __connmanctl_dbus_session_change(connection, + session_path, session_config_return, + "ContextIdentifier", "ContextIdentifier", + DBUS_TYPE_STRING, &args[index + 1]); + append.values = 2; + break; default: res = -EINVAL; } @@ -1994,12 +2106,13 @@ static int cmd_session(char *args[], int num, struct connman_option *options) case 1: if (session_path) return -EALREADY; - return session_create(FALSE); + return session_create(FALSE, &args[2], num - 2, options); default: if (!strcmp(command, "connect")) { if (!session_path) - return session_create(TRUE); + return session_create(TRUE, &args[2], num - 2, + options); return session_connect(); @@ -2248,6 +2361,7 @@ static struct connman_option session_options[] = { {"type", 't', "local|internet|any"}, {"ifname", 'i', "[<interface_name>]"}, {"srciprule", 's', "yes|no"}, + {"contextIdentifier", 'c', "Context identifier"}, { NULL, } }; -- 2.7.4

2 years, 5 months

2
1
0 / 0

[PATCH] service: Return OperationAborted when agent gets Canceled

by Daniel Wagner

When the user decided to cancel the connect attempt, the agent sends net.connman.Agent.Error.Canceled. Currently, we return InvalidArgument for normal non-hidden networks and ConnectedAborted for hidden networks. Return OperationAborted also for non-hidden networks to avoid confusion on the user ends. That means the cancel operation was successful and nothing went wrong as invalid argument indicates. Reported by Vasyl Vavrychuk. --- Hi Vasyl, Can you give it a try and give feedback? Thanks, Daniel doc/agent-api.txt | 2 ++ src/service.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/agent-api.txt b/doc/agent-api.txt index aa7271d43484..e3c1dcde8cd3 100644 --- a/doc/agent-api.txt +++ b/doc/agent-api.txt @@ -54,6 +54,8 @@ Methods void Release() keys are the field names and the values are the actual fields. Alternatively an error indicating that the request got canceled can be returned. + OperationAborted will be return on a successfull + cancel request. Most common return field names are "Name" and of course "Passphrase". diff --git a/src/service.c b/src/service.c index 02cd51f2e104..219285439678 100644 --- a/src/service.c +++ b/src/service.c @@ -5341,7 +5341,7 @@ static void request_input_cb(struct connman_service *service, if (g_strcmp0(error, "net.connman.Agent.Error.Canceled") == 0) { - err = -EINVAL; + err = -ECONNABORTED; if (service->hidden) __connman_service_return_error(service, -- 2.9.5

2 years, 5 months

2
2
0 / 0

2020

2019

2018

2017

2016

2015

connman October 2017