Imported Upstream version 1.37upstream/1.37

Change-Id: Ib5957e7ee3a9315ee86a331189bc3e9e71751ee8
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

1 files changed, 35 insertions, 9 deletions

diff --git a/src/main.conf b/src/main.conf
index 68870b28..14965e12 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -14,17 +14,26 @@
 # user interface designs.
 # BrowserLaunchTimeout = 300
 
-# Enable background scanning. Default is true.
-# Background scanning will start every 5 minutes unless
-# the scan list is empty. In that case, a simple backoff
-# mechanism starting from 10s up to 5 minutes will run.
+# If wifi is disconnected, the background scanning will follow a simple
+# backoff mechanism from 3s up to 5 minutes. Then, it will stay in 5
+# minutes unless user specifically asks for scanning through a D-Bus
+# call. If so, the mechanism will start again from 3s. This feature
+# activates also the background scanning while being connected, which
+# is required for roaming on wifi.
+# When BackgroundScanning is false, ConnMan will not perform any scan
+# regardless of wifi is connected or not, unless it is requested by
+# the user through a D-Bus call.
 # BackgroundScanning = true
 
+# Assume that service gateways also function as timeservers.
+# UseGatewaysAsTimeservers = false
+
 # List of Fallback timeservers separated by ",".
 # These timeservers are used for NTP sync when there are
-# no timeserver set by the user or by the service.
-# These can contain mixed combination of fully qualified
-# domain names, IPv4 and IPv6 addresses.
+# no timeservers set by the user or by the service, and
+# when UseGatewaysAsTimeservers = false. These can contain
+# mixed combination of fully qualified domain names, IPv4
+# and IPv6 addresses.
 # FallbackTimeservers =
 
 # List of fallback nameservers separated by "," used if no
@@ -55,16 +64,21 @@
 
 # List of blacklisted network interfaces separated by ",".
 # Found interfaces will be compared to the list and will
-# not be handled by connman, if their first characters
+# not be handled by ConnMan, if their first characters
 # match any of the list entries. Default value is
 # vmnet,vboxnet,virbr,ifb,ve-,vb-.
 # NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb-
 
-# Allow connman to change the system hostname. This can
+# Allow ConnMan to change the system hostname. This can
 # happen for example if we receive DHCP hostname option.
 # Default value is true.
 # AllowHostnameUpdates = true
 
+# Allow ConnMan to change the system domainname. This can
+# happen for example if we receive DHCP domainname option.
+# Default value is true.
+# AllowDomainnameUpdates = true
+
 # Keep only a single connected technology at any time. When a new
 # service is connected by the user or a better one is found according
 # to PreferredTechnologies, the new service is kept connected and all
@@ -117,3 +131,15 @@
 # other which is already connected.
 # This setting has no effect if SingleConnectedTechnologies is enabled.
 # AlwaysConnectedTechnologies =
+
+# Enable auto connection of services in roaming.
+# If this setting is false, roaming services are not auto-connected by ConnMan.
+# Default value is false.
+# AutoConnectRoamingServices = false
+
+# Enable address conflict detection
+# If this setting is true, ConnMan will send probe ARP packets to see
+# if an IPv4 address is already in use before assigning the address
+# to an interface (in accordance with RFC 5227).
+# Default value is false.
+# AddressConflictDetection = false