October 2016 - connman

by Liang, Jian [TYCO GBS - Cork]

Hi, Daniel, I am trying to understand how per application routing works with session APIs. Here are two questions which confused me - In the 'session-policy-format.txt' file, the provided example of a xxx.policy file contains a 'uid' field. Does it mean 'per application routing' is only applicable when applications run through different users? - In session polices, is it possible to specify different order of services when multiple services are of a same type of technology, e.g. multiple Ethernet interfaces? If not, how can it be specified with connman APIs or policies? Many thanks. Kind regards, Jian ________________________________ This e-mail contains privileged and confidential information intended for the use of the addressees named above. If you are not the intended recipient of this e-mail, you are hereby notified that you must not disseminate, copy or take any action in respect of any information contained in it. If you have received this e-mail in error, please notify the sender immediately by e-mail and immediately destroy this e-mail and its attachments.

4 years

2
3
0 / 0

How to stop connection procedure?

by Fabio Emiliani

Dear all, I'm developing a Qt-based application using libconnman-qt and connman. Please consider the following use case: - the user starts the connection to a network - the connection starts - a passphrase is required - the user doesn't want to connect anymore Actually after the requestConnect() I've got back a serviceConnectionStarted() signal, then I receive a userInputRequested(QString,QVariantMap) (passphrase request). If I try to execute a requestDisconnect() I see in the logs: Reply from service.connect(): "Invalid arguments" This makes sense, I can't disconnect from a network I'm not connected in, the connection is "In progress", connman is still waiting for a password... * How can I abort the connection procedure? Which is the libconnman-qt/connman API to use? * How can I get the status of the connection procedure (e.g. "connecting", "waiting for a passphrase", "connected")? Thanks in advance for your time Regards, Fabio Emiliani -- *Fabio Emiliani* */Software Engineer/* /Ph. +39 075 8298 532/ /fabioemiliani(a)artgroup-spa.com/ <mailto:fabioemiliani@artgroup-spa.com> DISCLAIMER This email and any attachment may contain confidential information. If you are not the intended recipient you are not authorised to copy or disclose all or any part of it without the prior written consent of ART SpA. /ART SpA – Step Forward With US - //www.artgroup-spa.com/logo_ART_firma-1// /Ph. +39 075 8298 501 – Fax +39 075 8298 525 / P*Please consider our environment before printing this e-mail***

4 years

2
2
0 / 0

[PATCH 00/10] Coverity warnings cleanup and fixes

by Peter Meerwald-Stadler

I'm sending again the patch series posted Sept 17, addressing various Coverity warnings this updated series addresses Patrik's review comments and adds patches (#2, #3) to fix the issue of returning the correct errno: if (write(fd, ...) < 0) { close(fd); return -errno; } should be if (write(fd, ...) < 0) { int err = errno; close(fd); return -err; } I am not resending the proposed unification of get_random() Peter Meerwald-Stadler (10): gdhcp: Check setsockopt() retval gdhcp: Return correct errno value firewall-ntables: Return correct errno value gdhcp: Fix potential NULL deref ofono: Fix potential NULL deref peer_service: Setting retval ignored, always overwritten dhcpv6: Remove pointless compute_random() helper util: Make file handle of /dev/urandom static util: Reading from /dev/urandom ignores the number of bytes read shared: Drop unused shared/debugfs.c|.h gdhcp/client.c | 2 ++ gdhcp/common.c | 50 ++++++++++++++++++++++++++----------- gdhcp/ipv4ll.c | 6 +++-- plugins/ofono.c | 3 ++- src/dhcpv6.c | 14 +++-------- src/firewall-nftables.c | 3 ++- src/peer_service.c | 3 --- src/shared/debugfs.c | 66 ------------------------------------------------- src/shared/debugfs.h | 24 ------------------ src/util.c | 11 ++++++--- 10 files changed, 58 insertions(+), 124 deletions(-) delete mode 100644 src/shared/debugfs.c delete mode 100644 src/shared/debugfs.h -- 2.7.4

4 years

2
11
0 / 0

[PATCH] ntp: fix bad invalid timeout value.

by Antoine Aubert

g_timeout_add_second, use a 'stack' value to userdata. When send_timeout is called, userdata point to invalid stack value. --- src/ntp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ntp.c b/src/ntp.c index 7e66c9b..0a4c912 100644 --- a/src/ntp.c +++ b/src/ntp.c @@ -127,6 +127,7 @@ static struct sockaddr_in6 timeserver_addr; static gint poll_id = 0; static gint timeout_id = 0; static guint retries = 0; +static guint timeout_value = 0; static void send_packet(int fd, struct sockaddr *server, uint32_t timeout); @@ -142,14 +143,12 @@ static void next_server(void) static gboolean send_timeout(gpointer user_data) { - uint32_t timeout = GPOINTER_TO_UINT(user_data); - - DBG("send timeout %u (retries %d)", timeout, retries); + DBG("send timeout %u (retries %d)", timeout_value, retries); if (retries++ == NTP_SEND_RETRIES) next_server(); else - send_packet(transmit_fd, (struct sockaddr *)&timeserver_addr, timeout << 1); + send_packet(transmit_fd, (struct sockaddr *)&timeserver_addr, timeout_value << 1); return FALSE; } @@ -218,8 +217,9 @@ static void send_packet(int fd, struct sockaddr *server, uint32_t timeout) * trying another server. */ + timeout_value = timeout; timeout_id = g_timeout_add_seconds(timeout, send_timeout, - GUINT_TO_POINTER(timeout)); + NULL); } static gboolean next_poll(gpointer user_data) -- 2.7.4

4 years

2
2
0 / 0

Unable to setup connman using systemd

by Fabio Emiliani

Dear all, I'm trying to setup connman using systemd. When I try to execute the command: > connmanctl enable wifi I've got the following error: > Error wifi: Method "SetProperty" with signature "sv" on interface > "net.connman.Technology" doesn't exist I had the same error when I was using connman with the old SysVinit. After some tries I discovered that the cause of the error was the lack of the CONFIG_RFKILL=y in the kernel configuration options. After the enable of RFKILL everything had started to work. After the migration from SysVinit to systemd, connman doesn't want to see the wireless technology. The result is that connman can't control the wireless interface. Another bit of info: - I have RFKILL installed and correctly configured: > root@lam_icu:~# rfkill list 0 > 0: phy0: Wireless LAN > Soft blocked: no > Hard blocked: no - wpa_supplicant is installed and configured to start before connman - the wireless interface is correctly configured, I can perform a scan, I can connect to a network using wpa_supplicant - if launching connmand manually I see the following log: > root@lam_icu:~# connmand -n > connmand[4026]: Connection Manager version 1.28 > connmand[4026]: Checking loopback interface settings > connmand[4026]: System hostname is lam_icu > connmand[4026]: System domainname is artgroup > connmand[4026]: lo {newlink} index 1 address 00:00:00:00:00:00 mtu 65536 > connmand[4026]: lo {newlink} index 1 operstate 0 <UNKNOWN> > connmand[4026]: sit0 {newlink} index 2 address 00:00:00:00:08:00 mtu 1480 > connmand[4026]: sit0 {newlink} index 2 operstate 2 <DOWN> > connmand[4026]: usb0 {create} index 3 type 1 <ETHER> > connmand[4026]: usb0 {update} flags 36866 <DOWN> > connmand[4026]: usb0 {newlink} index 3 address 5E:88:F6:99:F3:4F mtu 1500 > connmand[4026]: usb0 {newlink} index 3 operstate 2 <DOWN> > connmand[4026]: Adding interface usb0 [ gadget ] > connmand[4026]: eth0 {create} index 4 type 1 <ETHER> > connmand[4026]: eth0 {RX} 16657 packets 1338888 bytes > connmand[4026]: eth0 {TX} 0 packets 185445 bytes > connmand[4026]: eth0 {update} flags 36866 <DOWN> > connmand[4026]: eth0 {newlink} index 4 address 00:90:9A:9D:AC:B2 mtu 1500 > connmand[4026]: eth0 {newlink} index 4 operstate 2 <DOWN> > connmand[4026]: Adding interface eth0 [ ethernet ] > *connmand[4026]: wlan0 {create} index 5 type 1 <ETHER>** > **connmand[4026]: wlan0 {update} flags 4098 <DOWN>** > **connmand[4026]: wlan0 {newlink} index 5 address DE:AD:BE:EF:00:00 > mtu 1500** > **connmand[4026]: wlan0 {newlink} index 5 operstate 2 <DOWN>** > **connmand[4026]: Adding interface wlan0 [ wifi ]* > connmand[4026]: eth0 {RX} 16657 packets 1338888 bytes > connmand[4026]: eth0 {TX} 0 packets 185445 bytes > connmand[4026]: eth0 {update} flags 102467 <UP,RUNNING,LOWER_UP> > connmand[4026]: eth0 {newlink} index 4 address 00:90:9A:9 wlan0 is correctly added. What is in your opinion the cause of the problem? How can I debug the issue? Thanks in advance for your help Regards, Fabio Emiliani -- *Fabio Emiliani* */Software Engineer/* /Ph. +39 075 8298 532/ /fabioemiliani(a)artgroup-spa.com/ <mailto:fabioemiliani@artgroup-spa.com> DISCLAIMER This email and any attachment may contain confidential information. If you are not the intended recipient you are not authorised to copy or disclose all or any part of it without the prior written consent of ART SpA. /ART SpA – Step Forward With US - //www.artgroup-spa.com/logo_ART_firma-1// /Ph. +39 075 8298 501 – Fax +39 075 8298 525 / P*Please consider our environment before printing this e-mail***

4 years

3
12
0 / 0

Specify rules and routing tables for individual service

by Liang, Jian [TYCO GBS - Cork]

Hi, I have some questions here about connman regards to dealing with multiple services (network interfaces). My requirement is about source routing different type of packets from applications over different network interfaces through different routes. I understand that connman, by default, is maintaining one service in online state and using its gateway as the default gateway in the default routing table. The questions are a. Can I use connman APIs generate multiple routing tables and rules for source routing purpose? b. If not, can I obtain gateway addresses of services in ready state through connman APIs? c. If not, what would be the suggestion to achieve sourcing routing by using connman? Kind regards, Jian ________________________________ This e-mail contains privileged and confidential information intended for the use of the addressees named above. If you are not the intended recipient of this e-mail, you are hereby notified that you must not disseminate, copy or take any action in respect of any information contained in it. If you have received this e-mail in error, please notify the sender immediately by e-mail and immediately destroy this e-mail and its attachments.

4 years

1
0
0 / 0

[PATCH] main: Make -d option repeatable

by Slava Monich

Concatenating the patterns makes more sense than using the last supplied value and leaking the previous allocated patterns. --- src/main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index fdb4f72..f3f2a22 100644 --- a/src/main.c +++ b/src/main.c @@ -476,10 +476,19 @@ static gboolean option_version = FALSE; static bool parse_debug(const char *key, const char *value, gpointer user_data, GError **error) { - if (value) - option_debug = g_strdup(value); - else + if (value) { + if (option_debug) { + char *prev = option_debug; + + option_debug = g_strconcat(prev, ",", value, NULL); + g_free(prev); + } else { + option_debug = g_strdup(value); + } + } else { + g_free(option_debug); option_debug = g_strdup("*"); + } return true; } -- 1.9.1

4 years

2
2
0 / 0

[PATCH] tethering: Add verification to bridge creation and configuration

by Jose Blanquicet

In case there is an error while setting up the bridge for WiFi tethering, ConnMan will anyway indicate success and the removed interface will remain removed and could not be use anymore. This patch aims to avoid such a situation by adding a verification after setting up the bridge set-up and in case there is an error stop the process and do not remove the interface. Integration of this verification to others tethering technologies has to be evaluated and implemented in case it is advantageous. --- include/technology.h | 2 +- plugins/bluetooth.c | 5 +++++ plugins/ethernet.c | 5 +++++ plugins/gadget.c | 5 +++++ plugins/wifi.c | 23 ++++++++++++++++++----- src/connman.h | 2 +- src/technology.c | 19 ++++++++++++------- src/tethering.c | 16 +++++++++------- 8 files changed, 56 insertions(+), 21 deletions(-) diff --git a/include/technology.h b/include/technology.h index d7fcdde..97db660 100644 --- a/include/technology.h +++ b/include/technology.h @@ -36,7 +36,7 @@ extern "C" { struct connman_technology; -void connman_technology_tethering_notify(struct connman_technology *technology, +int connman_technology_tethering_notify(struct connman_technology *technology, bool enabled); int connman_technology_set_regdom(const char *alpha2); void connman_technology_regdom_notify(struct connman_technology *technology, diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c index 401bb30..46ac7e6 100644 --- a/plugins/bluetooth.c +++ b/plugins/bluetooth.c @@ -692,6 +692,11 @@ static void tethering_create_cb(DBusMessage *message, void *user_data) DBG("bridge %s %s", tethering->bridge, tethering->enable ? "enabled": "disabled"); + /* + * TODO: In case of enabling, use return value to check + * if bridge was created and DHCP Server was + * configured/started successfully before continuing. + */ if (tethering->technology) connman_technology_tethering_notify(tethering->technology, tethering->enable); diff --git a/plugins/ethernet.c b/plugins/ethernet.c index 9a4d741..942b003 100644 --- a/plugins/ethernet.c +++ b/plugins/ethernet.c @@ -371,6 +371,11 @@ static void eth_tech_enable_tethering(struct connman_technology *technology, remove_network(device, ethernet); } + /* + * TODO: Use return value to check if bridge was created + * and DHCP Server was configured/started successfully + * before continuing. + */ connman_technology_tethering_notify(technology, true); connman_inet_ifup(index); diff --git a/plugins/gadget.c b/plugins/gadget.c index 94f6648..fbe784f 100644 --- a/plugins/gadget.c +++ b/plugins/gadget.c @@ -265,6 +265,11 @@ static void gadget_tech_enable_tethering(struct connman_technology *technology, remove_network(device, gadget); } + /* + * TODO: Use return value to check if bridge was created + * and DHCP Server was configured/started successfully + * before continuing. + */ connman_technology_tethering_notify(technology, true); connman_inet_ifup(index); diff --git a/plugins/wifi.c b/plugins/wifi.c index 8bde9c0..1b25739 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -3138,13 +3138,14 @@ static void sta_remove_callback(int result, DBG("ifname %s result %d ", info->ifname, result); if ((result < 0) || (info->wifi->ap_supported != WIFI_AP_SUPPORTED)) { - info->wifi->tethering = true; + info->wifi->tethering = false; + connman_technology_tethering_notify(info->technology, false); g_free(info->ifname); g_free(info->ssid); g_free(info); - if (info->wifi->ap_supported == WIFI_AP_SUPPORTED){ + if (info->wifi->ap_supported == WIFI_AP_SUPPORTED) { g_free(info->wifi->tethering_param->ssid); g_free(info->wifi->tethering_param); info->wifi->tethering_param = NULL; @@ -3154,8 +3155,6 @@ static void sta_remove_callback(int result, info->wifi->interface = NULL; - connman_technology_tethering_notify(info->technology, true); - g_supplicant_interface_create(info->ifname, driver, info->wifi->bridge, ap_create_callback, info); @@ -3171,7 +3170,7 @@ static int enable_wifi_tethering(struct connman_technology *technology, struct wifi_tethering_info *info; const char *ifname; unsigned int mode; - int err; + int err, bridge_result = 0; for (list = iface_list; list; list = list->next) { wifi = list->data; @@ -3230,6 +3229,11 @@ static int enable_wifi_tethering(struct connman_technology *technology, info->wifi->tethering = true; info->wifi->ap_supported = WIFI_AP_SUPPORTED; + bridge_result = + connman_technology_tethering_notify(technology, true); + if (bridge_result < 0) + goto failed; + err = g_supplicant_interface_remove(interface, sta_remove_callback, info); @@ -3244,6 +3248,15 @@ static int enable_wifi_tethering(struct connman_technology *technology, g_free(info); g_free(wifi->tethering_param); wifi->tethering_param = NULL; + + if (bridge_result < 0) { + /* + * If it was an error while setting up the bridge then + * do not try again on another interface, bridge set-up + * does not depend on it. + */ + break; + } } return -EOPNOTSUPP; diff --git a/src/connman.h b/src/connman.h index 401e3d7..ce3ef8d 100644 --- a/src/connman.h +++ b/src/connman.h @@ -620,7 +620,7 @@ int __connman_tethering_init(void); void __connman_tethering_cleanup(void); const char *__connman_tethering_get_bridge(void); -void __connman_tethering_set_enabled(void); +int __connman_tethering_set_enabled(void); void __connman_tethering_set_disabled(void); int __connman_private_network_request(DBusMessage *msg, const char *owner); diff --git a/src/technology.c b/src/technology.c index 660af52..6f91af7 100644 --- a/src/technology.c +++ b/src/technology.c @@ -211,22 +211,27 @@ static void tethering_changed(struct connman_technology *technology) technology_save(technology); } -void connman_technology_tethering_notify(struct connman_technology *technology, +int connman_technology_tethering_notify(struct connman_technology *technology, bool enabled) { + int err; + DBG("technology %p enabled %u", technology, enabled); if (technology->tethering == enabled) - return; + return -EALREADY; - technology->tethering = enabled; + if (enabled) { + err = __connman_tethering_set_enabled(); + if (err < 0) + return err; + } else + __connman_tethering_set_disabled(); + technology->tethering = enabled; tethering_changed(technology); - if (enabled) - __connman_tethering_set_enabled(); - else - __connman_tethering_set_disabled(); + return 0; } static int set_tethering(struct connman_technology *technology, diff --git a/src/tethering.c b/src/tethering.c index 3153349..9d72bce 100644 --- a/src/tethering.c +++ b/src/tethering.c @@ -181,7 +181,7 @@ static void tethering_restart(struct connman_ippool *pool, void *user_data) __connman_tethering_set_enabled(); } -void __connman_tethering_set_enabled(void) +int __connman_tethering_set_enabled(void) { int index; int err; @@ -197,12 +197,12 @@ void __connman_tethering_set_enabled(void) DBG("enabled %d", tethering_enabled + 1); if (__sync_fetch_and_add(&tethering_enabled, 1) != 0) - return; + return -EACCES; err = __connman_bridge_create(BRIDGE_NAME); if (err < 0) { __sync_fetch_and_sub(&tethering_enabled, 1); - return; + return -EOPNOTSUPP; } index = connman_inet_ifindex(BRIDGE_NAME); @@ -212,7 +212,7 @@ void __connman_tethering_set_enabled(void) connman_error("Fail to create IP pool"); __connman_bridge_remove(BRIDGE_NAME); __sync_fetch_and_sub(&tethering_enabled, 1); - return; + return -EADDRNOTAVAIL; } gateway = __connman_ippool_get_gateway(dhcp_ippool); @@ -228,7 +228,7 @@ void __connman_tethering_set_enabled(void) __connman_ippool_unref(dhcp_ippool); __connman_bridge_remove(BRIDGE_NAME); __sync_fetch_and_sub(&tethering_enabled, 1); - return; + return -EADDRNOTAVAIL; } ns = connman_setting_get_string_list("FallbackNameservers"); @@ -264,7 +264,7 @@ void __connman_tethering_set_enabled(void) __connman_ippool_unref(dhcp_ippool); __connman_bridge_remove(BRIDGE_NAME); __sync_fetch_and_sub(&tethering_enabled, 1); - return; + return -EOPNOTSUPP; } prefixlen = connman_ipaddress_calc_netmask_len(subnet_mask); @@ -276,7 +276,7 @@ void __connman_tethering_set_enabled(void) __connman_ippool_unref(dhcp_ippool); __connman_bridge_remove(BRIDGE_NAME); __sync_fetch_and_sub(&tethering_enabled, 1); - return; + return -EOPNOTSUPP; } err = __connman_ipv6pd_setup(BRIDGE_NAME); @@ -285,6 +285,8 @@ void __connman_tethering_set_enabled(void) strerror(-err)); DBG("tethering started"); + + return 0; } void __connman_tethering_set_disabled(void) -- 1.9.1

4 years

2
1
0 / 0

[PATCH v2] service: Add AlwaysConnectedTechnologies option

by Ioan-Adrian Ratiu

Add a new list option that enables auto-connecting all technologies which also contain AutoConnect=true regradless of the setting for PreferredTechnologies. The default AlwaysConnectedTechnologies value is empty which keeps the current behaviour intact, i.e. if a higher preffered technology is already connected, others will not autoconnect. This setting has no effect if SingleConnectedTechnologies is enabled. Based on work originally by Collin Richards <collin.richards(a)ni.com>. Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu(a)ni.com> --- src/main.c | 18 ++++++++++++++++++ src/main.conf | 7 +++++++ src/service.c | 22 ++++++++++++++++++++-- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index fdb4f72..462ac15 100644 --- a/src/main.c +++ b/src/main.c @@ -67,6 +67,7 @@ static struct { char **pref_timeservers; unsigned int *auto_connect; unsigned int *preferred_techs; + unsigned int *always_connected_techs; char **fallback_nameservers; unsigned int timeout_inputreq; unsigned int timeout_browserlaunch; @@ -81,6 +82,7 @@ static struct { .pref_timeservers = NULL, .auto_connect = NULL, .preferred_techs = NULL, + .always_connected_techs = NULL, .fallback_nameservers = NULL, .timeout_inputreq = DEFAULT_INPUT_REQUEST_TIMEOUT, .timeout_browserlaunch = DEFAULT_BROWSER_LAUNCH_TIMEOUT, @@ -95,6 +97,7 @@ static struct { #define CONF_BG_SCAN "BackgroundScanning" #define CONF_PREF_TIMESERVERS "FallbackTimeservers" #define CONF_AUTO_CONNECT "DefaultAutoConnectTechnologies" +#define CONF_ALWAYS_CONNECTED_TECHS "AlwaysConnectedTechnologies" #define CONF_PREFERRED_TECHS "PreferredTechnologies" #define CONF_FALLBACK_NAMESERVERS "FallbackNameservers" #define CONF_TIMEOUT_INPUTREQ "InputRequestTimeout" @@ -110,6 +113,7 @@ static const char *supported_options[] = { CONF_BG_SCAN, CONF_PREF_TIMESERVERS, CONF_AUTO_CONNECT, + CONF_ALWAYS_CONNECTED_TECHS, CONF_PREFERRED_TECHS, CONF_FALLBACK_NAMESERVERS, CONF_TIMEOUT_INPUTREQ, @@ -295,6 +299,17 @@ static void parse_config(GKeyFile *config) g_clear_error(&error); str_list = __connman_config_get_string_list(config, "General", + CONF_ALWAYS_CONNECTED_TECHS, &len, &error); + + if (!error) + connman_settings.always_connected_techs = + parse_service_types(str_list, len); + + g_strfreev(str_list); + + g_clear_error(&error); + + str_list = __connman_config_get_string_list(config, "General", CONF_FALLBACK_NAMESERVERS, &len, &error); if (!error) @@ -572,6 +587,9 @@ unsigned int *connman_setting_get_uint_list(const char *key) if (g_str_equal(key, CONF_PREFERRED_TECHS)) return connman_settings.preferred_techs; + if (g_str_equal(key, CONF_ALWAYS_CONNECTED_TECHS)) + return connman_settings.always_connected_techs; + return NULL; } diff --git a/src/main.conf b/src/main.conf index acceda3..d619413 100644 --- a/src/main.conf +++ b/src/main.conf @@ -101,3 +101,10 @@ # quality. See RFC6343. Default value is false (as recommended by RFC6343 # section 4.1). # Enable6to4 = false + +# List of technologies with AutoConnect = true which are always connected +# regardless of PreferredTechnologies setting. Default value is empty and +# will connect a technology only if it is at a higher preference than any +# other which is already connected. +# This setting has no effect if SingleConnectedTechnologies is enabled. +# AlwaysConnectedTechnologies = diff --git a/src/service.c b/src/service.c index 37af5fc..98acd14 100644 --- a/src/service.c +++ b/src/service.c @@ -3750,6 +3750,19 @@ static GList *preferred_tech_list_get(void) return tech_data.preferred_list; } +bool __connman_service_always_connect(enum connman_service_type type) +{ + unsigned int *always_connected_techs = + connman_setting_get_uint_list("AlwaysConnectedTechnologies"); + int i; + + for (i = 0; always_connected_techs && always_connected_techs[i]; i++) + if (always_connected_techs[i] == type) + return true; + + return false; +} + static bool auto_connect_service(GList *services, enum connman_service_connect_reason reason, bool preferred) @@ -3757,6 +3770,7 @@ static bool auto_connect_service(GList *services, struct connman_service *service = NULL; bool ignore[MAX_CONNMAN_SERVICE_TYPES] = { }; bool autoconnecting = false; + GList *list; DBG("preferred %d sessions %d reason %s", preferred, active_count, @@ -3776,8 +3790,12 @@ static bool auto_connect_service(GList *services, if (service->pending || is_connecting(service) || is_connected(service)) { - if (!active_count) - return true; + if (!active_count) { + if (__connman_service_always_connect(service->type)) + continue; + else + return true; + } ignore[service->type] = true; autoconnecting = true; -- 2.9.3

4 years

2
1
0 / 0

[PATCH] openvpn: Use proper logging function

by Daniel Wagner

From: Daniel Wagner <daniel.wagner(a)bmw-carit.de> We should use the connman_{debug|error} functions instead of a plain printf for logging. --- vpn/plugins/openvpn.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vpn/plugins/openvpn.c b/vpn/plugins/openvpn.c index 28adf3047d84..d48dca97c79d 100644 --- a/vpn/plugins/openvpn.c +++ b/vpn/plugins/openvpn.c @@ -312,6 +312,7 @@ static int task_append_config_data(struct vpn_provider *provider, static gboolean can_read_data(GIOChannel *chan, GIOCondition cond, gpointer data) { + void (*cbf)(const char *format, ...) = data; gchar *str; gsize size; @@ -321,7 +322,7 @@ static gboolean can_read_data(GIOChannel *chan, } g_io_channel_read_line(chan, &str, &size, NULL, NULL); - printf(str); + cbf(str); g_free(str); return TRUE; @@ -334,7 +335,7 @@ static int setup_log_read(int stdout_fd, int stderr_fd) chan = g_io_channel_unix_new(stdout_fd); g_io_channel_set_close_on_unref(chan, TRUE); - watch = g_io_add_watch(chan, G_IO_IN, can_read_data, NULL); + watch = g_io_add_watch(chan, G_IO_IN, can_read_data, connman_debug); g_io_channel_unref(chan); if (watch == 0) @@ -342,7 +343,7 @@ static int setup_log_read(int stdout_fd, int stderr_fd) chan = g_io_channel_unix_new(stderr_fd); g_io_channel_set_close_on_unref(chan, TRUE); - watch = g_io_add_watch(chan, G_IO_IN, can_read_data, NULL); + watch = g_io_add_watch(chan, G_IO_IN, can_read_data, connman_error); g_io_channel_unref(chan); return watch == 0? -EIO : 0; -- 2.7.4

4 years

2
1
0 / 0

2020

2019

2018

2017

2016

2015

connman October 2016