Imported Upstream version 1.35upstream/1.35

Change-Id: I174854914d9fd06a813270b57d1f7bc2bac63c6a
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

1 files changed, 24 insertions, 2 deletions

diff --git a/src/main.conf b/src/main.conf
index 93c7a501..68870b28 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -57,8 +57,8 @@
 # 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
+# vmnet,vboxnet,virbr,ifb,ve-,vb-.
+# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,ve-,vb-
 
 # Allow connman to change the system hostname. This can
 # happen for example if we receive DHCP hostname option.
@@ -95,3 +95,25 @@
 # 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 =