4:36 p.m.
Hi,
I have added some options to configure URLs used to do the online check.
I have added to options to set the URLs for IPv4 and IPv6 and another option
to disable the check of X-ConnMan-Status HTTP header.
The goal is to have this feature for boards that do not have access to Internet.
Best Regards,
Christophe Ronco
Christophe Ronco (3):
main: add options to configure Online check
wispr: implement options to configure Online check
main.conf: document options to configure Online check
doc/connman.conf.5.in | 15 +++++++++++++++
include/setting.h | 1 +
src/main.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-
src/main.conf | 15 +++++++++++++++
src/wispr.c | 17 +++++++++++------
5 files changed, 93 insertions(+), 7 deletions(-)
--
2.7.4
4:36 p.m.
New subject: [PATCH 1/3] main: add options to configure Online check
Add options to configure URL of HTTP servers.
Add option to say if we want to check connman specific header or not.
---
include/setting.h | 1 +
src/main.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/include/setting.h b/include/setting.h
index a882021..3c87e77 100644
--- a/include/setting.h
+++ b/include/setting.h
@@ -29,6 +29,7 @@ extern "C" {
#endif
bool connman_setting_get_bool(const char *key);
+char *connman_setting_get_string(const char *key);
char **connman_setting_get_string_list(const char *key);
unsigned int *connman_setting_get_uint_list(const char *key);
diff --git a/src/main.c b/src/main.c
index 7b00eb3..c853d0f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,6 +41,8 @@
#define DEFAULT_INPUT_REQUEST_TIMEOUT (120 * 1000)
#define DEFAULT_BROWSER_LAUNCH_TIMEOUT (300 * 1000)
+#define DEFAULT_CONNMAN_SERVER_URL_IPV4
"http://ipv4.connman.net/online/status.html"
+#define DEFAULT_CONNMAN_SERVER_URL_IPV6
"http://ipv6.connman.net/online/status.html"
#define MAINFILE "main.conf"
#define CONFIGMAINFILE CONFIGDIR "/" MAINFILE
@@ -79,6 +81,9 @@ static struct {
bool enable_6to4;
char *vendor_class_id;
bool enable_online_check;
+ bool online_check_use_connman_headers;
+ char *online_check_server_ipv4_url;
+ char *online_check_server_ipv6_url;
} connman_settings = {
.bg_scan = true,
.pref_timeservers = NULL,
@@ -96,6 +101,9 @@ static struct {
.enable_6to4 = false,
.vendor_class_id = NULL,
.enable_online_check = true,
+ .online_check_use_connman_headers = true,
+ .online_check_server_ipv4_url = DEFAULT_CONNMAN_SERVER_URL_IPV4,
+ .online_check_server_ipv6_url = DEFAULT_CONNMAN_SERVER_URL_IPV6,
};
#define CONF_BG_SCAN "BackgroundScanning"
@@ -114,6 +122,9 @@ static struct {
#define CONF_ENABLE_6TO4 "Enable6to4"
#define CONF_VENDOR_CLASS_ID "VendorClassID"
#define CONF_ENABLE_ONLINE_CHECK "EnableOnlineCheck"
+#define CONF_ONLINE_CHECK_USE_CONNMAN_HEADERS "OnlineCheckUseConnmanHeaders"
+#define CONF_ONLINE_CHECK_SERVER_IPV4_URL "OnlineCheckServerIpV4Url"
+#define CONF_ONLINE_CHECK_SERVER_IPV6_URL "OnlineCheckServerIpV6Url"
static const char *supported_options[] = {
CONF_BG_SCAN,
@@ -132,6 +143,9 @@ static const char *supported_options[] = {
CONF_ENABLE_6TO4,
CONF_VENDOR_CLASS_ID,
CONF_ENABLE_ONLINE_CHECK,
+ CONF_ONLINE_CHECK_USE_CONNMAN_HEADERS,
+ CONF_ONLINE_CHECK_SERVER_IPV4_URL,
+ CONF_ONLINE_CHECK_SERVER_IPV6_URL,
NULL
};
@@ -254,7 +268,8 @@ static void parse_config(GKeyFile *config)
char **interfaces;
char **str_list;
char **tethering;
- char *vendor_class_id;
+ char *vendor_class_id;
+ char *url;
gsize len;
int timeout;
@@ -408,6 +423,27 @@ static void parse_config(GKeyFile *config)
}
g_clear_error(&error);
+
+ boolean = __connman_config_get_bool(config, "General",
+ CONF_ONLINE_CHECK_USE_CONNMAN_HEADERS, &error);
+ if (!error)
+ connman_settings.online_check_use_connman_headers = boolean;
+
+ g_clear_error(&error);
+
+ url = __connman_config_get_string(config, "General",
+ CONF_ONLINE_CHECK_SERVER_IPV4_URL, &error);
+ if (!error)
+ connman_settings.online_check_server_ipv4_url = url;
+
+ g_clear_error(&error);
+
+ url = __connman_config_get_string(config, "General",
+ CONF_ONLINE_CHECK_SERVER_IPV6_URL, &error);
+ if (!error)
+ connman_settings.online_check_server_ipv6_url = url;
+
+ g_clear_error(&error);
}
static int config_init(const char *file)
@@ -615,9 +651,23 @@ bool connman_setting_get_bool(const char *key)
if (g_str_equal(key, CONF_ENABLE_ONLINE_CHECK))
return connman_settings.enable_online_check;
+ if (g_str_equal(key, CONF_ONLINE_CHECK_USE_CONNMAN_HEADERS))
+ return connman_settings.online_check_use_connman_headers;
+
return false;
}
+char *connman_setting_get_string(const char *key)
+{
+ if (g_str_equal(key, CONF_ONLINE_CHECK_SERVER_IPV4_URL))
+ return connman_settings.online_check_server_ipv4_url;
+
+ if (g_str_equal(key, CONF_ONLINE_CHECK_SERVER_IPV6_URL))
+ return connman_settings.online_check_server_ipv6_url;
+
+ return NULL;
+}
+
char **connman_setting_get_string_list(const char *key)
{
if (g_str_equal(key, CONF_PREF_TIMESERVERS))
--
2.7.4
4:36 p.m.
New subject: [PATCH 2/3] wispr: implement options to configure Online check
Use URL of HTTP servers from configuration.
Use OnlineCheckUseConnmanHeaders configuration option to see if connman
specific headers are needed or not to go to Online state.
---
src/wispr.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/wispr.c b/src/wispr.c
index 03b38bb..e280049 100644
--- a/src/wispr.c
+++ b/src/wispr.c
@@ -28,10 +28,9 @@
#include <gweb/gweb.h>
-#include "connman.h"
+#include <connman/setting.h>
-#define STATUS_URL_IPV4 "http://ipv4.connman.net/online/status.html"
-#define STATUS_URL_IPV6 "http://ipv6.connman.net/online/status.html"
+#include "connman.h"
struct connman_wispr_message {
bool has_error;
@@ -688,6 +687,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer
user_data)
const char *str = NULL;
guint16 status;
gsize length;
+ bool checkForConnmanHeader;
DBG("");
@@ -722,7 +722,10 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer
user_data)
if (wp_context->wispr_msg.message_type >= 0)
break;
- if (g_web_result_get_header(result, "X-ConnMan-Status",
+ checkForConnmanHeader = connman_setting_get_bool(
+ "OnlineCheckUseConnmanHeaders");
+ if (!checkForConnmanHeader ||
+ g_web_result_get_header(result, "X-ConnMan-Status",
&str)) {
portal_manage_status(result, wp_context);
return false;
@@ -884,10 +887,12 @@ static int wispr_portal_detect(struct connman_wispr_portal_context
*wp_context)
if (wp_context->type == CONNMAN_IPCONFIG_TYPE_IPV4) {
g_web_set_address_family(wp_context->web, AF_INET);
- wp_context->status_url = STATUS_URL_IPV4;
+ wp_context->status_url = connman_setting_get_string(
+ "OnlineCheckServerIpV4Url");
} else {
g_web_set_address_family(wp_context->web, AF_INET6);
- wp_context->status_url = STATUS_URL_IPV6;
+ wp_context->status_url = connman_setting_get_string(
+ "OnlineCheckServerIpV6Url");
}
for (i = 0; nameservers[i]; i++)
--
2.7.4
4:36 p.m.
New subject: [PATCH 3/3] main.conf: document options to configure Online check
---
doc/connman.conf.5.in | 15 +++++++++++++++
src/main.conf | 15 +++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/doc/connman.conf.5.in b/doc/connman.conf.5.in
index 95b177f..5ef93ec 100644
--- a/doc/connman.conf.5.in
+++ b/doc/connman.conf.5.in
@@ -145,6 +145,21 @@ connectivity is successful. Only then the service will be
transitioned to ONLINE state.
If this setting is false, the default service will remain in READY state.
Default value is true.
+.TP
+.BI OnlineCheckUseConnmanHeaders=true\ \fR|\fB\ false
+When checking if a service is online, force connman to check for specific headers in HTTP
response.
+If this setting is false, a 200 status is enough to say that service is ONLINE.
+Otherwise Connman specific headers are tested.
+Default value is true.
+.TP
+.BI OnlineCheckServerIpV4Url= string
+URL used to check if a service is online for all IPV4 services.
+Default value is http://ipv4.connman.net/online/status.html
+# OnlineCheckServerIpV4Url = http://ipv4.connman.net/online/status.html
+.TP
+.BI OnlineCheckServerIpV6Url= string
+URL used to check if a service is online for all IPV6 services.
+Default value is http://ipv6.connman.net/online/status.html
.SH "EXAMPLE"
The following example configuration disables hostname updates and enables
ethernet tethering.
diff --git a/src/main.conf b/src/main.conf
index 68870b2..7fb1a75 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -111,6 +111,21 @@
# Default value is true.
# EnableOnlineCheck = false
+# When checking if a service is online, force connman to check for
+# specific headers in HTTP response.
+# If this setting is false, a 200 status is enough to say that service
+# is ONLINE. Otherwise Connman specific headers are tested.
+# Default value is true.
+# OnlineCheckUseConnmanHeaders = true
+
+# URL used to check if a service is online for all IPV4 services.
+# Default value is http://ipv4.connman.net/online/status.html
+# OnlineCheckServerIpV4Url = http://ipv4.connman.net/online/status.html
+
+# URL used to check if a service is online for all IPV6 services.
+# Default value is http://ipv6.connman.net/online/status.html
+# OnlineCheckServerIpV6Url = http://ipv6.connman.net/online/status.html
+
# 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
--
2.7.4
9:20 a.m.
Hi Christophe,
First, thanks for taking the time and providing the patches.
On 10/30/2017 05:36 PM, Christophe Ronco wrote:
I have added some options to configure URLs used to do the online
check.
I have added to options to set the URLs for IPv4 and IPv6 and another option
to disable the check of X-ConnMan-Status HTTP header.
This is a topic which pops up in regular basis. Marcel has a strong
opinion on why the URL should not be easily changed via a config file.
See the discussion here [1]. I don't think his opinion has changed since
then.
See https://www.mail-archive.com/connman@connman.net/msg18104.html
The goal is to have this feature for boards that do not have access
to Internet.
Recently, we added the config switches to disable it the online test
completely. see EnableOnlineCheck. When set to false, ConnMan wont try
to do the online test. The service will stay in the READY state. That
means the interface has been setup up and is ready to be used.
Thanks,
Daniel
8:24 a.m.
Hi,
On 11/12/2017 10:20 AM, Daniel Wagner wrote:
Hi Christophe,
First, thanks for taking the time and providing the patches.
On 10/30/2017 05:36 PM, Christophe Ronco wrote:
> I have added some options to configure URLs used to do the online check.
> I have added to options to set the URLs for IPv4 and IPv6 and another
> option
> to disable the check of X-ConnMan-Status HTTP header.
This is a topic which pops up in regular basis. Marcel has a strong
opinion on why the URL should not be easily changed via a config file.
See the discussion here [1]. I don't think his opinion has changed
since then.
See https://www.mail-archive.com/connman@connman.net/msg18104.html
OK, sorry to
have not found that before posting.
I won't bother you explaining my specific case and add my patches.
Best Regards,
Christophe
7:47 p.m.
Hi Christophe,
On 11/13/2017 09:24 AM, Christophe Ronco wrote:
On 11/12/2017 10:20 AM, Daniel Wagner wrote:
> See https://www.mail-archive.com/connman@connman.net/msg18104.html
OK, sorry to have not found that before posting.
I won't bother you explaining my specific case and add my patches.
Maybe I got it wrong. You wrote "The goal is to have this feature for
boards that do not have access to Internet." So I wonder why the
configure --disable-wispr and EnableOnlineCheck=false connman.conf
shouldn't do the trick.
Thanks,
Daniel
1720
days inactive
1747
days old
6 comments
2 participants
participants (2)
-
Christophe Ronco -
Daniel Wagner