Merge branch 'jb51168' into 'master'

[connman] Expose Ipv4StatusUrl as manager property. Contributes to JB#51168

See merge request mer-core/connman!299

connman/doc/manager-api.txt

@@ -305,3 +305,21 @@ Properties	string State [readonly]
 			and does not affect ConnMan in any way.
 
 			The default value is false.
+
+		string Ipv4StatusUrl [readonly]
+
+			The IPv4 network status check URL which has been
+			configured for the device. This URL may be used by
+			applications who wish to check whether the device
+			currently has open Internet access (as opposed to
+			begin connected to a wireless network requiring a
+			Captive Portal login, or otherwise restricted network).
+
+		string Ipv6StatusUrl [readonly]
+
+			The IPv6 network status check URL which has been
+			configured for the device. This URL may be used by
+			applications who wish to check whether the device
+			currently has open Internet access (as opposed to
+			begin connected to a wireless network requiring a
+			Captive Portal login, or otherwise restricted network).

connman/src/manager.c

@@ -63,6 +63,8 @@ static DBusMessage *get_properties(DBusConnection *conn,
 	dbus_bool_t offlinemode;
 	dbus_uint32_t uint32_value;
 	const char *str;
+	const char *ipv4_status_url;
+	const char *ipv6_status_url;
 
 	DBG("conn %p", conn);
 
@@ -91,6 +93,14 @@ static DBusMessage *get_properties(DBusConnection *conn,
 					DBUS_TYPE_UINT32,
 					&uint32_value);
 
+	ipv4_status_url = connman_option_get_string(CONF_STATUS_URL_IPV4);
+	connman_dbus_dict_append_basic(&dict, "Ipv4StatusUrl",
+						DBUS_TYPE_STRING, &ipv4_status_url);
+
+	ipv6_status_url = connman_option_get_string(CONF_STATUS_URL_IPV6);
+	connman_dbus_dict_append_basic(&dict, "Ipv6StatusUrl",
+						DBUS_TYPE_STRING, &ipv6_status_url);
+
 	connman_dbus_dict_close(&array, &dict);
 
 	return reply;