Merge "Added support to get AP hidden status." into tizen

[platform/upstream/connman.git] / src / main.conf

diff --git a/src/main.conf b/src/main.conf
old mode 100644 (file)
new mode 100755 (executable)
index c979553..a2cc1e2
--- a/src/main.conf
+++ b/src/main.conf
@@ -27,7 +27,7 @@ BackgroundScanning = false
 # These can contain mixed combination of fully qualified
 # domain names, IPv4 and IPv6 addresses.
 # FallbackTimeservers =
-FallbackTimeservers = pool.ntp.org
+#FallbackTimeservers = pool.ntp.org
 
 # List of fallback nameservers separated by "," used if no
 # nameservers are otherwise provided by the service. The
@@ -54,15 +54,15 @@ FallbackTimeservers = pool.ntp.org
 # the default route when compared to either a non-preferred
 # type or a preferred type further down in the list.
 # PreferredTechnologies =
-PreferredTechnologies = ethernet,wifi
+PreferredTechnologies = wifi, ethernet
 
 # 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
 # match any of the list entries. Default value is
-# vmnet,vboxnet,virbr,ifb.
-# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb
-NetworkInterfaceBlacklist = vmnet,vboxnet,virbr
+# vmnet,vboxnet,virbr,ifb,ve-,vb-.
+# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb-
+NetworkInterfaceBlacklist = veth, vmnet,vboxnet,virbr,usb,rndis,rmnet,rev_rmnet,dummy,seth_td,seth_w
 
 # Allow connman to change the system hostname. This can
 # happen for example if we receive DHCP hostname option.
@@ -80,6 +80,7 @@ NetworkInterfaceBlacklist = vmnet,vboxnet,virbr
 # setting enabled applications will notice more network breaks than
 # normal. Default value is false.
 # SingleConnectedTechnology = false
+SingleConnectedTechnology = true
 
 # List of technologies for which tethering is allowed separated by ",".
 # The default value is wifi,bluetooth,gadget. Only those technologies
@@ -99,3 +100,27 @@ NetworkInterfaceBlacklist = vmnet,vboxnet,virbr
 # re-enabling a technology, and after restarts and reboots.
 # Default value is false.
 # PersistentTetheringMode = false
+
+# Automatically enable Anycast 6to4 if possible. This is not recommended, as
+# the use of 6to4 will generally lead to a severe degradation of connection
+# quality. See RFC6343. Default value is false (as recommended by RFC6343
+# section 4.1).
+# Enable6to4 = false
+
+# Enable use of http get as on online status check.
+# When a service is in a READY state, and is selected as default,
+# ConnMan will issue an HTTP GET request to verify that end-to-end
+# 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.
+# EnableOnlineCheck = 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 =
+
+NetworkCellularInterfaceList = pdp,rmnet,seth_td,seth_w