Merge tag 'upstream/1.40' into tizen.submit/tizen/20220224.061208

Change-Id: I4ed89827d776db6eeec11878bc1cd0cd6c5e1e80
Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>
Signed-off-by: Anjali Nijhara <a.nijhara@samsung.com>

3 files changed, 38 insertions, 1 deletions

diff --git a/doc/clock-api.txt b/doc/clock-api.txt
index 6818f5a8..a7fdf555 100755
--- a/doc/clock-api.txt
+++ b/doc/clock-api.txt
@@ -85,3 +85,12 @@ Properties	uint64 Time [readonly or readwrite]  [experimental]
 
 			This list of servers is used when TimeUpdates is set
 			to auto.
+
+		boolean TimeserverSynced [readonly]  [experimental]
+
+			This value indicates if the current system time
+			is synced via NTP servers.
+
+			True when TimeUpdates is set to auto and Time value
+			results from the system time synchronization with a NTP
+			server. Otherwise False.
diff --git a/doc/connman.conf.5.in b/doc/connman.conf.5.in
index a90c2291..2e06b3ef 100644
--- a/doc/connman.conf.5.in
+++ b/doc/connman.conf.5.in
@@ -167,6 +167,27 @@ transitioned to ONLINE state.
 If this setting is false, the default service will remain in READY state.
 Default value is true.
 .TP
+.BI OnlineCheckInitialInterval= secs, OnlineCheckMaxInterval= secs
+Range of intervals between two online check requests.
+When an online check request fails, another one is triggered after a
+longer interval. The intervals follow the power of two series of numbers
+between OnlineCheckInitialInterval and OnlineCheckMaxInterval.
+Default range is [1, 12], corresponding to the following intervals, in
+seconds: 1, 4, 9, 16, 25, 36, 49, 64, 81, 100, 121 and 144.
+.TP
+.BI EnableOnlineToReadyTransition=true\ \fR|\fB\ false
+WARNING: Experimental feature!!!
+In addition to EnableOnlineCheck setting, enable or disable use of HTTP GET
+to detect the loss of end-to-end connectivity.
+If this setting is false, when the default service transitions to ONLINE
+state, the HTTP GET request is no more called until next cycle, initiated
+by a transition of the default service to DISCONNECT state.
+If this setting is true, the HTTP GET request keeps beeing called to guarantee
+that end-to-end connectivity is still successful. If not, the default service
+will transition to READY state, enabling another service to become the
+default one, in replacement.
+Default value is false.
+.TP
 .BI AutoConnectRoamingServices=true\ \fR|\fB\ false
 Automatically connect roaming services. This is not recommended unless you know
 you won't have any billing problem.
diff --git a/doc/vpn-connection-api.txt b/doc/vpn-connection-api.txt
index ec557889..6e6293e4 100755
--- a/doc/vpn-connection-api.txt
+++ b/doc/vpn-connection-api.txt
@@ -130,7 +130,14 @@ Properties	string State [readonly]
 			configured externally via a configuration file.
 
 			The only valid operation are Connect(), Disconnect()
-                        and GetProperties()
+			and GetProperties()
+
+		boolean SplitRouting
+
+			This value reflects the split routing setting on
+			connmand side. By default, this value is omitted and
+			defaults to false. The value needs to be explicitly
+			set to true for VPN to be split routed.
 
 		int Index [readonly]