Register with system bus in container environment
[platform/upstream/connman.git] / src / main.c
index f94010b..278b502 100755 (executable)
 #include <string.h>
 #include <signal.h>
 #include <sys/signalfd.h>
-#include <sys/types.h>
-#include <sys/resource.h>
 #include <getopt.h>
 #include <sys/stat.h>
 #include <net/if.h>
 #include <netdb.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 
 #include <gdbus.h>
 
 #include "connman.h"
 
+#define CONF_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]) - 1)
+
 #define DEFAULT_INPUT_REQUEST_TIMEOUT (120 * 1000)
 #define DEFAULT_BROWSER_LAUNCH_TIMEOUT (300 * 1000)
 
+#if defined TIZEN_EXT
+#define DEFAULT_WIFI_INTERFACE "wlan0"
+#define CONTAINER_FILE "/run/systemd/container"
+#endif
+
 #define MAINFILE "main.conf"
 #define CONFIGMAINFILE CONFIGDIR "/" MAINFILE
 
@@ -54,11 +61,18 @@ static char *default_auto_connect[] = {
        NULL
 };
 
+static char *default_favorite_techs[] = {
+       "ethernet",
+       NULL
+};
+
 static char *default_blacklist[] = {
        "vmnet",
        "vboxnet",
        "virbr",
        "ifb",
+       "ve-",
+       "vb-",
        NULL
 };
 
@@ -66,75 +80,253 @@ static struct {
        bool bg_scan;
        char **pref_timeservers;
        unsigned int *auto_connect;
+       unsigned int *favorite_techs;
        unsigned int *preferred_techs;
+       unsigned int *always_connected_techs;
        char **fallback_nameservers;
        unsigned int timeout_inputreq;
        unsigned int timeout_browserlaunch;
        char **blacklisted_interfaces;
        bool allow_hostname_updates;
+       bool allow_domainname_updates;
        bool single_tech;
        char **tethering_technologies;
        bool persistent_tethering_mode;
        bool enable_6to4;
+       char *vendor_class_id;
+       bool enable_online_check;
+       bool auto_connect_roaming_services;
+       bool acd;
+       bool use_gateways_as_timeservers;
 #if defined TIZEN_EXT
        char **cellular_interfaces;
+       bool tizen_tv_extension;
+       bool auto_ip;
+       char *global_nameserver;
+       bool supplicant_debug;
+       char *def_wifi_ifname;
+       bool file_log;
+       bool dlog_log;
+       bool simple_log;
 #endif
 } connman_settings  = {
        .bg_scan = true,
        .pref_timeservers = NULL,
        .auto_connect = NULL,
+       .favorite_techs = NULL,
        .preferred_techs = NULL,
+       .always_connected_techs = NULL,
        .fallback_nameservers = NULL,
        .timeout_inputreq = DEFAULT_INPUT_REQUEST_TIMEOUT,
        .timeout_browserlaunch = DEFAULT_BROWSER_LAUNCH_TIMEOUT,
        .blacklisted_interfaces = NULL,
        .allow_hostname_updates = true,
+       .allow_domainname_updates = true,
        .single_tech = false,
        .tethering_technologies = NULL,
        .persistent_tethering_mode = false,
        .enable_6to4 = false,
+       .vendor_class_id = NULL,
+       .enable_online_check = true,
+       .auto_connect_roaming_services = false,
+       .acd = false,
+       .use_gateways_as_timeservers = false,
 #if defined TIZEN_EXT
        .cellular_interfaces = NULL,
+       .tizen_tv_extension = false,
+       .auto_ip = true,
+       .global_nameserver = NULL,
+       .supplicant_debug = false,
+       .def_wifi_ifname = DEFAULT_WIFI_INTERFACE,
+       .file_log = true,
+       .dlog_log = true,
+       .simple_log = true,
 #endif
 };
 
+#if defined TIZEN_EXT
+static struct {
+       /* BSSID */
+       char *ins_preferred_freq_bssid;
+       bool ins_last_connected_bssid;
+       bool ins_assoc_reject;
+       bool ins_signal_bssid;
+       unsigned int ins_preferred_freq_bssid_score;
+       unsigned int ins_last_connected_bssid_score;
+       unsigned int ins_assoc_reject_score;
+       /* SSID */
+       bool ins_last_user_selection;
+       unsigned int ins_last_user_selection_time;
+       bool ins_last_connected;
+       char *ins_preferred_freq;
+       char **ins_security_priority;
+       unsigned int ins_security_priority_count;
+       bool ins_signal;
+       bool ins_internet;
+       unsigned int ins_last_user_selection_score;
+       unsigned int ins_last_connected_score;
+       unsigned int ins_preferred_freq_score;
+       unsigned int ins_security_priority_score;
+       unsigned int ins_internet_score;
+       /* Common */
+       int ins_signal_level3_5ghz;
+       int ins_signal_level3_24ghz;
+} connman_ins_settings = {
+       /* BSSID */
+       .ins_preferred_freq_bssid = NULL,
+       .ins_last_connected_bssid = true,
+       .ins_assoc_reject = true,
+       .ins_signal_bssid = true,
+       .ins_preferred_freq_bssid_score = 20,
+       .ins_last_connected_bssid_score = 20,
+       .ins_assoc_reject_score = 10,
+       /* SSID */
+       .ins_last_user_selection = true,
+       .ins_last_user_selection_time = 480,
+       .ins_last_connected = true,
+       .ins_preferred_freq = NULL,
+       .ins_security_priority = NULL,
+       .ins_security_priority_count = 0,
+       .ins_signal = true,
+       .ins_internet = true,
+       .ins_last_user_selection_score = 30,
+       .ins_last_connected_score = 30,
+       .ins_preferred_freq_score = 60,
+       .ins_security_priority_score = 5,
+       .ins_internet_score = 30,
+       /* Common */
+       .ins_signal_level3_5ghz = -76,
+       .ins_signal_level3_24ghz = -74,
+};
+#endif
+
 #define CONF_BG_SCAN                    "BackgroundScanning"
 #define CONF_PREF_TIMESERVERS           "FallbackTimeservers"
-#define CONF_AUTO_CONNECT               "DefaultAutoConnectTechnologies"
+#define CONF_AUTO_CONNECT_TECHS         "DefaultAutoConnectTechnologies"
+#define CONF_FAVORITE_TECHS             "DefaultFavoriteTechnologies"
+#define CONF_ALWAYS_CONNECTED_TECHS     "AlwaysConnectedTechnologies"
 #define CONF_PREFERRED_TECHS            "PreferredTechnologies"
 #define CONF_FALLBACK_NAMESERVERS       "FallbackNameservers"
 #define CONF_TIMEOUT_INPUTREQ           "InputRequestTimeout"
 #define CONF_TIMEOUT_BROWSERLAUNCH      "BrowserLaunchTimeout"
 #define CONF_BLACKLISTED_INTERFACES     "NetworkInterfaceBlacklist"
 #define CONF_ALLOW_HOSTNAME_UPDATES     "AllowHostnameUpdates"
+#define CONF_ALLOW_DOMAINNAME_UPDATES   "AllowDomainnameUpdates"
 #define CONF_SINGLE_TECH                "SingleConnectedTechnology"
 #define CONF_TETHERING_TECHNOLOGIES      "TetheringTechnologies"
 #define CONF_PERSISTENT_TETHERING_MODE  "PersistentTetheringMode"
 #define CONF_ENABLE_6TO4                "Enable6to4"
+#define CONF_VENDOR_CLASS_ID            "VendorClassID"
+#define CONF_ENABLE_ONLINE_CHECK        "EnableOnlineCheck"
+#define CONF_AUTO_CONNECT_ROAMING_SERVICES "AutoConnectRoamingServices"
+#define CONF_ACD                        "AddressConflictDetection"
+#define CONF_USE_GATEWAYS_AS_TIMESERVERS "UseGatewaysAsTimeservers"
 #if defined TIZEN_EXT
 #define CONF_CELLULAR_INTERFACE         "NetworkCellularInterfaceList"
+#define CONF_TIZEN_TV_EXT                      "TizenTVExtension"
+#define CONF_ENABLE_AUTO_IP                    "EnableAutoIp"
+#define CONF_GLOBAL_NAMESERVER          "GlobalNameserver"
+#define CONF_CONNMAN_SUPPLICANT_DEBUG   "ConnmanSupplicantDebug"
+#define CONF_CONNMAN_WIFI_DEF_IFNAME    "DefaultWifiInterface"
+#define CONF_CONNMAN_FILE_LOG           "FileLogging"
+#define CONF_CONNMAN_DLOG_LOG           "DlogLogging"
+#define CONF_CONNMAN_SIMPLIFIED_LOG     "SimplifiedLog"
+#endif
+
+#if defined TIZEN_EXT
+/* BSSID */
+#define CONF_INS_PREFERRED_FREQ_BSSID        "INSPreferredFreqBSSID"
+#define CONF_INS_PREFERRED_FREQ_BSSID_SCORE  "INSPreferredFreqBSSIDScore"
+#define CONF_INS_LAST_CONNECTED_BSSID        "INSLastConnectedBSSID"
+#define CONF_INS_LAST_CONNECTED_BSSID_SCORE  "INSLastConnectedBSSIDScore"
+#define CONF_INS_ASSOC_REJECT                "INSAssocReject"
+#define CONF_INS_ASSOC_REJECT_SCORE          "INSAssocRejectScore"
+#define CONF_INS_SIGNAL_BSSID                "INSSignalBSSID"
+/* SSID */
+#define CONF_INS_LAST_USER_SELECTION         "INSLastUserSelection"
+#define CONF_INS_LAST_USER_SELECTION_TIME    "INSLastUserSelectionTime"
+#define CONF_INS_LAST_USER_SELECTION_SCORE   "INSLastUserSelectionScore"
+#define CONF_INS_LAST_CONNECTED              "INSLastConnected"
+#define CONF_INS_LAST_CONNECTED_SCORE        "INSLastConnectedScore"
+#define CONF_INS_PREFERRED_FREQ              "INSPreferredFreq"
+#define CONF_INS_PREFERRED_FREQ_SCORE        "INSPreferredFreqScore"
+#define CONF_INS_SECURITY_PRIORITY           "INSSecurityPriority"
+#define CONF_INS_SECURITY_PRIORITY_COUNT     "INSSecurityPriorityCount"
+#define CONF_INS_SECURITY_PRIORITY_SCORE     "INSSecurityPriorityScore"
+#define CONF_INS_SIGNAL                      "INSSignal"
+#define CONF_INS_INTERNET                    "INSInternet"
+#define CONF_INS_INTERNET_SCORE              "INSInternetScore"
+/* Common */
+#define CONF_INS_SIGNAL_LEVEL3_5GHZ          "INSSignalLevel3_5GHz"
+#define CONF_INS_SIGNAL_LEVEL3_24GHZ         "INSSignalLevel3_24GHz"
 #endif
 
 static const char *supported_options[] = {
        CONF_BG_SCAN,
        CONF_PREF_TIMESERVERS,
-       CONF_AUTO_CONNECT,
+       CONF_AUTO_CONNECT_TECHS,
+       CONF_ALWAYS_CONNECTED_TECHS,
        CONF_PREFERRED_TECHS,
        CONF_FALLBACK_NAMESERVERS,
        CONF_TIMEOUT_INPUTREQ,
        CONF_TIMEOUT_BROWSERLAUNCH,
        CONF_BLACKLISTED_INTERFACES,
        CONF_ALLOW_HOSTNAME_UPDATES,
+       CONF_ALLOW_DOMAINNAME_UPDATES,
        CONF_SINGLE_TECH,
        CONF_TETHERING_TECHNOLOGIES,
        CONF_PERSISTENT_TETHERING_MODE,
        CONF_ENABLE_6TO4,
+       CONF_VENDOR_CLASS_ID,
+       CONF_ENABLE_ONLINE_CHECK,
+       CONF_AUTO_CONNECT_ROAMING_SERVICES,
+       CONF_ACD,
+       CONF_USE_GATEWAYS_AS_TIMESERVERS,
 #if defined TIZEN_EXT
        CONF_CELLULAR_INTERFACE,
+       CONF_TIZEN_TV_EXT,
+       CONF_ENABLE_AUTO_IP,
+       CONF_GLOBAL_NAMESERVER,
+       CONF_CONNMAN_SUPPLICANT_DEBUG,
+       CONF_CONNMAN_WIFI_DEF_IFNAME,
+       CONF_CONNMAN_FILE_LOG,
+       CONF_CONNMAN_DLOG_LOG,
+       CONF_CONNMAN_SIMPLIFIED_LOG,
 #endif
        NULL
 };
 
+#if defined TIZEN_EXT
+static const char *supported_ins_options[] = {
+       /* BSSID */
+       CONF_INS_PREFERRED_FREQ_BSSID,
+       CONF_INS_PREFERRED_FREQ_BSSID_SCORE,
+       CONF_INS_LAST_CONNECTED_BSSID,
+       CONF_INS_LAST_CONNECTED_BSSID_SCORE,
+       CONF_INS_ASSOC_REJECT,
+       CONF_INS_ASSOC_REJECT_SCORE,
+       CONF_INS_SIGNAL_BSSID,
+       /* SSID */
+       CONF_INS_LAST_USER_SELECTION,
+       CONF_INS_LAST_USER_SELECTION_TIME,
+       CONF_INS_LAST_USER_SELECTION_SCORE,
+       CONF_INS_LAST_CONNECTED,
+       CONF_INS_LAST_CONNECTED_SCORE,
+       CONF_INS_PREFERRED_FREQ,
+       CONF_INS_PREFERRED_FREQ_SCORE,
+       CONF_INS_SECURITY_PRIORITY,
+       CONF_INS_SECURITY_PRIORITY_COUNT,
+       CONF_INS_SECURITY_PRIORITY_SCORE,
+       CONF_INS_SIGNAL,
+       CONF_INS_INTERNET,
+       CONF_INS_INTERNET_SCORE,
+       /* Common */
+       CONF_INS_SIGNAL_LEVEL3_5GHZ,
+       CONF_INS_SIGNAL_LEVEL3_24GHZ,
+       NULL
+};
+#endif
+
 static GKeyFile *load_config(const char *file)
 {
        GError *err = NULL;
@@ -218,7 +410,12 @@ static void check_config(GKeyFile *config)
        keys = g_key_file_get_groups(config, NULL);
 
        for (j = 0; keys && keys[j]; j++) {
+#if defined TIZEN_EXT
+               if (g_strcmp0(keys[j], "General") != 0 &&
+                       g_strcmp0(keys[j], "INS") != 0)
+#else
                if (g_strcmp0(keys[j], "General") != 0)
+#endif
                        connman_warn("Unknown group %s in %s",
                                                keys[j], MAINFILE);
        }
@@ -244,13 +441,199 @@ static void check_config(GKeyFile *config)
        }
 
        g_strfreev(keys);
+
+#if defined TIZEN_EXT
+       keys = g_key_file_get_keys(config, "INS", NULL, NULL);
+
+       for (j = 0; keys && keys[j]; j++) {
+               bool found;
+               int i;
+
+               found = false;
+               for (i = 0; supported_ins_options[i]; i++) {
+                       if (g_strcmp0(keys[j], supported_ins_options[i]) == 0) {
+                               found = true;
+                               break;
+                       }
+               }
+               if (!found && !supported_ins_options[i])
+                       connman_warn("Unknown option %s in %s",
+                                               keys[j], MAINFILE);
+       }
+
+       g_strfreev(keys);
+#endif
 }
 
 #if defined TIZEN_EXT
+static void check_Tizen_INS_configuration(GKeyFile *config)
+{
+       GError *error = NULL;
+       char *ins_preferred_freq_bssid;
+       char *ins_preferred_freq;
+       char **ins_security_priority;
+       bool boolean;
+       int integer;
+       gsize len;
+
+       ins_preferred_freq_bssid = __connman_config_get_string(config, "INS",
+                                       CONF_INS_PREFERRED_FREQ_BSSID, &error);
+       if (!error)
+               connman_ins_settings.ins_preferred_freq_bssid = ins_preferred_freq_bssid;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_PREFERRED_FREQ_BSSID_SCORE, &error);
+       if (!error && integer >= 0)
+               connman_ins_settings.ins_preferred_freq_bssid_score = integer;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "INS",
+                       CONF_INS_LAST_CONNECTED_BSSID, &error);
+       if (!error)
+               connman_ins_settings.ins_last_connected_bssid = boolean;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_LAST_CONNECTED_BSSID_SCORE, &error);
+       if (!error && integer >= 0)
+               connman_ins_settings.ins_last_connected_bssid_score = integer;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "INS",
+                       CONF_INS_ASSOC_REJECT, &error);
+       if (!error)
+               connman_ins_settings.ins_assoc_reject = boolean;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_ASSOC_REJECT_SCORE, &error);
+       if (!error && integer >= 0)
+               connman_ins_settings.ins_assoc_reject_score = integer;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "INS",
+                       CONF_INS_SIGNAL_BSSID, &error);
+       if (!error)
+               connman_ins_settings.ins_signal_bssid = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "INS",
+                       CONF_INS_LAST_USER_SELECTION, &error);
+       if (!error)
+               connman_ins_settings.ins_last_user_selection = boolean;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_LAST_USER_SELECTION_TIME, &error);
+       if (!error && integer >= 0)
+               connman_ins_settings.ins_last_user_selection_time = integer;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_LAST_USER_SELECTION_SCORE, &error);
+       if (!error && integer >= 0)
+               connman_ins_settings.ins_last_user_selection_score = integer;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "INS",
+                       CONF_INS_LAST_CONNECTED, &error);
+       if (!error)
+               connman_ins_settings.ins_last_connected = boolean;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_LAST_CONNECTED_SCORE, &error);
+       if (!error && integer >= 0)
+               connman_ins_settings.ins_last_connected_score = integer;
+
+       g_clear_error(&error);
+
+       ins_preferred_freq = __connman_config_get_string(config, "INS",
+                                       CONF_INS_PREFERRED_FREQ, &error);
+       if (!error)
+               connman_ins_settings.ins_preferred_freq = ins_preferred_freq;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_PREFERRED_FREQ_SCORE, &error);
+       if (!error && integer >= 0)
+               connman_ins_settings.ins_preferred_freq_score = integer;
+
+       g_clear_error(&error);
+
+       ins_security_priority = g_key_file_get_string_list(config, "INS",
+                       CONF_INS_SECURITY_PRIORITY, &len, &error);
+
+       if (error == NULL) {
+               connman_ins_settings.ins_security_priority = ins_security_priority;
+               connman_ins_settings.ins_security_priority_count = len;
+       }
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_SECURITY_PRIORITY_SCORE, &error);
+       if (!error && integer >= 0)
+               connman_ins_settings.ins_security_priority_score = integer;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "INS",
+                       CONF_INS_SIGNAL, &error);
+       if (!error)
+               connman_ins_settings.ins_signal = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "INS",
+                       CONF_INS_INTERNET, &error);
+       if (!error)
+               connman_ins_settings.ins_internet = boolean;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_INTERNET_SCORE, &error);
+       if (!error && integer >= 0)
+               connman_ins_settings.ins_internet_score = integer;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_SIGNAL_LEVEL3_5GHZ, &error);
+       if (!error)
+               connman_ins_settings.ins_signal_level3_5ghz = integer;
+
+       g_clear_error(&error);
+
+       integer = g_key_file_get_integer(config, "INS",
+                       CONF_INS_SIGNAL_LEVEL3_24GHZ, &error);
+       if (!error)
+               connman_ins_settings.ins_signal_level3_24ghz = integer;
+
+       g_clear_error(&error);
+}
+
 static void check_Tizen_configuration(GKeyFile *config)
 {
        GError *error = NULL;
        char **cellular_interfaces;
+       char *global_nameserver;
+       char *default_wifi_ifname;
+       bool boolean;
        gsize len;
 
        cellular_interfaces = g_key_file_get_string_list(config, "General",
@@ -260,6 +643,64 @@ static void check_Tizen_configuration(GKeyFile *config)
                connman_settings.cellular_interfaces = cellular_interfaces;
 
        g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_TIZEN_TV_EXT, &error);
+       if (!error)
+               connman_settings.tizen_tv_extension = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_ENABLE_AUTO_IP, &error);
+       if (!error)
+               connman_settings.auto_ip = boolean;
+
+       g_clear_error(&error);
+
+       global_nameserver = __connman_config_get_string(config, "General",
+                                       CONF_GLOBAL_NAMESERVER, &error);
+       if (!error)
+               connman_settings.global_nameserver = global_nameserver;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_CONNMAN_SUPPLICANT_DEBUG, &error);
+       if (!error)
+               connman_settings.supplicant_debug = boolean;
+
+       g_clear_error(&error);
+
+       default_wifi_ifname = __connman_config_get_string(config, "General",
+                       CONF_CONNMAN_WIFI_DEF_IFNAME, &error);
+       if (!error)
+               connman_settings.def_wifi_ifname = default_wifi_ifname;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_CONNMAN_FILE_LOG, &error);
+       if (!error)
+               connman_settings.file_log = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_CONNMAN_DLOG_LOG, &error);
+       if (!error)
+               connman_settings.dlog_log = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                       CONF_CONNMAN_SIMPLIFIED_LOG, &error);
+       if (!error)
+               connman_settings.simple_log = boolean;
+
+       g_clear_error(&error);
+
+       check_Tizen_INS_configuration(config);
 }
 
 static void set_nofile_inc(void)
@@ -286,12 +727,15 @@ static void parse_config(GKeyFile *config)
        char **interfaces;
        char **str_list;
        char **tethering;
+        char *vendor_class_id;
        gsize len;
        int timeout;
 
        if (!config) {
                connman_settings.auto_connect =
-                       parse_service_types(default_auto_connect, 3);
+                       parse_service_types(default_auto_connect, CONF_ARRAY_SIZE(default_auto_connect));
+               connman_settings.favorite_techs =
+                       parse_service_types(default_favorite_techs, CONF_ARRAY_SIZE(default_favorite_techs));
                connman_settings.blacklisted_interfaces =
                        g_strdupv(default_blacklist);
                return;
@@ -314,14 +758,28 @@ static void parse_config(GKeyFile *config)
        g_clear_error(&error);
 
        str_list = __connman_config_get_string_list(config, "General",
-                       CONF_AUTO_CONNECT, &len, &error);
+                       CONF_AUTO_CONNECT_TECHS, &len, &error);
 
        if (!error)
                connman_settings.auto_connect =
                        parse_service_types(str_list, len);
        else
                connman_settings.auto_connect =
-                       parse_service_types(default_auto_connect, 3);
+                       parse_service_types(default_auto_connect, CONF_ARRAY_SIZE(default_auto_connect));
+
+       g_strfreev(str_list);
+
+       g_clear_error(&error);
+
+       str_list = __connman_config_get_string_list(config, "General",
+                       CONF_FAVORITE_TECHS, &len, &error);
+
+       if (!error)
+               connman_settings.favorite_techs =
+                       parse_service_types(str_list, len);
+       else
+               connman_settings.favorite_techs =
+                       parse_service_types(default_favorite_techs, CONF_ARRAY_SIZE(default_favorite_techs));
 
        g_strfreev(str_list);
 
@@ -339,6 +797,17 @@ static void parse_config(GKeyFile *config)
        g_clear_error(&error);
 
        str_list = __connman_config_get_string_list(config, "General",
+                       CONF_ALWAYS_CONNECTED_TECHS, &len, &error);
+
+       if (!error)
+               connman_settings.always_connected_techs =
+                       parse_service_types(str_list, len);
+
+       g_strfreev(str_list);
+
+       g_clear_error(&error);
+
+       str_list = __connman_config_get_string_list(config, "General",
                        CONF_FALLBACK_NAMESERVERS, &len, &error);
 
        if (!error)
@@ -383,6 +852,14 @@ static void parse_config(GKeyFile *config)
        g_clear_error(&error);
 
        boolean = __connman_config_get_bool(config, "General",
+                                       CONF_ALLOW_DOMAINNAME_UPDATES,
+                                       &error);
+       if (!error)
+               connman_settings.allow_domainname_updates = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
                        CONF_SINGLE_TECH, &error);
        if (!error)
                connman_settings.single_tech = boolean;
@@ -412,6 +889,43 @@ static void parse_config(GKeyFile *config)
 
        g_clear_error(&error);
 
+       vendor_class_id = __connman_config_get_string(config, "General",
+                                       CONF_VENDOR_CLASS_ID, &error);
+       if (!error)
+               connman_settings.vendor_class_id = vendor_class_id;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                                       CONF_ENABLE_ONLINE_CHECK, &error);
+       if (!error) {
+               connman_settings.enable_online_check = boolean;
+               if (!boolean)
+                       connman_info("Online check disabled by main config.");
+       }
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                               CONF_AUTO_CONNECT_ROAMING_SERVICES, &error);
+       if (!error)
+               connman_settings.auto_connect_roaming_services = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General", CONF_ACD, &error);
+       if (!error)
+               connman_settings.acd = boolean;
+
+       g_clear_error(&error);
+
+       boolean = __connman_config_get_bool(config, "General",
+                               CONF_USE_GATEWAYS_AS_TIMESERVERS, &error);
+       if (!error)
+               connman_settings.use_gateways_as_timeservers = boolean;
+
+       g_clear_error(&error);
+
 #if defined TIZEN_EXT
        check_Tizen_configuration(config);
 #endif
@@ -430,6 +944,11 @@ static int config_init(const char *file)
        if (config)
                g_key_file_free(config);
 
+#if defined TIZEN_EXT
+       set_simple_log_option(connman_settings.simple_log);
+       set_dlog_logging_option(connman_settings.dlog_log);
+       set_file_logging_option(connman_settings.file_log);
+#endif
        return 0;
 }
 
@@ -527,10 +1046,34 @@ static gboolean option_version = FALSE;
 static bool parse_debug(const char *key, const char *value,
                                        gpointer user_data, GError **error)
 {
-       if (value)
-               option_debug = g_strdup(value);
-       else
+       if (value) {
+               if (option_debug) {
+                       char *prev = option_debug;
+
+                       option_debug = g_strconcat(prev, ",", value, NULL);
+                       g_free(prev);
+               } else {
+                       option_debug = g_strdup(value);
+               }
+       } else {
+               g_free(option_debug);
                option_debug = g_strdup("*");
+       }
+
+       return true;
+}
+
+static bool parse_noplugin(const char *key, const char *value,
+                                       gpointer user_data, GError **error)
+{
+       if (option_noplugin) {
+               char *prev = option_noplugin;
+
+               option_noplugin = g_strconcat(prev, ",", value, NULL);
+               g_free(prev);
+       } else {
+               option_noplugin = g_strdup(value);
+       }
 
        return true;
 }
@@ -543,12 +1086,12 @@ static GOptionEntry options[] = {
                                G_OPTION_ARG_CALLBACK, parse_debug,
                                "Specify debug options to enable", "DEBUG" },
        { "device", 'i', 0, G_OPTION_ARG_STRING, &option_device,
-                       "Specify networking device or interface", "DEV" },
+                       "Specify networking devices or interfaces", "DEV,..." },
        { "nodevice", 'I', 0, G_OPTION_ARG_STRING, &option_nodevice,
-                       "Specify networking interface to ignore", "DEV" },
+                       "Specify networking interfaces to ignore", "DEV,..." },
        { "plugin", 'p', 0, G_OPTION_ARG_STRING, &option_plugin,
                                "Specify plugins to load", "NAME,..." },
-       { "noplugin", 'P', 0, G_OPTION_ARG_STRING, &option_noplugin,
+       { "noplugin", 'P', 0, G_OPTION_ARG_CALLBACK, &parse_noplugin,
                                "Specify plugins not to load", "NAME,..." },
        { "wifi", 'W', 0, G_OPTION_ARG_STRING, &option_wifi,
                                "Specify driver for WiFi/Supplicant", "NAME" },
@@ -557,7 +1100,7 @@ static GOptionEntry options[] = {
                                "Don't fork daemon to background" },
        { "nodnsproxy", 'r', G_OPTION_FLAG_REVERSE,
                                G_OPTION_ARG_NONE, &option_dnsproxy,
-                               "Don't enable DNS Proxy" },
+                               "Don't support DNS resolving" },
        { "nobacktrace", 0, G_OPTION_FLAG_REVERSE,
                                G_OPTION_ARG_NONE, &option_backtrace,
                                "Don't print out backtrace information" },
@@ -568,6 +1111,9 @@ static GOptionEntry options[] = {
 
 const char *connman_option_get_string(const char *key)
 {
+       if (g_str_equal(key, CONF_VENDOR_CLASS_ID))
+               return connman_settings.vendor_class_id;
+
        if (g_strcmp0(key, "wifi") == 0) {
                if (!option_wifi)
                        return "nl80211,wext";
@@ -575,6 +1121,19 @@ const char *connman_option_get_string(const char *key)
                        return option_wifi;
        }
 
+#if defined TIZEN_EXT
+       if (g_str_equal(key, CONF_GLOBAL_NAMESERVER))
+               return connman_settings.global_nameserver;
+
+       if (g_str_equal(key, CONF_INS_PREFERRED_FREQ_BSSID))
+               return connman_ins_settings.ins_preferred_freq_bssid;
+
+       if (g_str_equal(key, CONF_INS_PREFERRED_FREQ))
+               return connman_ins_settings.ins_preferred_freq;
+
+       if (g_str_equal(key, CONF_CONNMAN_WIFI_DEF_IFNAME))
+               return connman_settings.def_wifi_ifname;
+#endif
        return NULL;
 }
 
@@ -586,6 +1145,9 @@ bool connman_setting_get_bool(const char *key)
        if (g_str_equal(key, CONF_ALLOW_HOSTNAME_UPDATES))
                return connman_settings.allow_hostname_updates;
 
+       if (g_str_equal(key, CONF_ALLOW_DOMAINNAME_UPDATES))
+               return connman_settings.allow_domainname_updates;
+
        if (g_str_equal(key, CONF_SINGLE_TECH))
                return connman_settings.single_tech;
 
@@ -595,9 +1157,109 @@ bool connman_setting_get_bool(const char *key)
        if (g_str_equal(key, CONF_ENABLE_6TO4))
                return connman_settings.enable_6to4;
 
+       if (g_str_equal(key, CONF_ENABLE_ONLINE_CHECK))
+               return connman_settings.enable_online_check;
+
+       if (g_str_equal(key, CONF_AUTO_CONNECT_ROAMING_SERVICES))
+               return connman_settings.auto_connect_roaming_services;
+
+       if (g_str_equal(key, CONF_ACD))
+               return connman_settings.acd;
+
+       if (g_str_equal(key, CONF_USE_GATEWAYS_AS_TIMESERVERS))
+               return connman_settings.use_gateways_as_timeservers;
+
+#if defined TIZEN_EXT
+       if (g_str_equal(key, CONF_ENABLE_AUTO_IP))
+               return connman_settings.auto_ip;
+
+       if (g_str_equal(key, CONF_CONNMAN_SUPPLICANT_DEBUG))
+               return connman_settings.supplicant_debug;
+
+       if (g_str_equal(key, CONF_CONNMAN_FILE_LOG))
+               return connman_settings.file_log;
+
+       if (g_str_equal(key, CONF_CONNMAN_DLOG_LOG))
+               return connman_settings.dlog_log;
+
+       if (g_str_equal(key, CONF_CONNMAN_SIMPLIFIED_LOG))
+               return connman_settings.simple_log;
+#endif
+
+#if defined TIZEN_EXT
+       if (g_str_equal(key, CONF_INS_LAST_CONNECTED_BSSID))
+               return connman_ins_settings.ins_last_connected_bssid;
+
+       if (g_str_equal(key, CONF_INS_ASSOC_REJECT))
+               return connman_ins_settings.ins_assoc_reject;
+
+       if (g_str_equal(key, CONF_INS_SIGNAL_BSSID))
+               return connman_ins_settings.ins_signal_bssid;
+
+       if (g_str_equal(key, CONF_INS_LAST_USER_SELECTION))
+               return connman_ins_settings.ins_last_user_selection;
+
+       if (g_str_equal(key, CONF_INS_LAST_CONNECTED))
+               return connman_ins_settings.ins_last_connected;
+
+       if (g_str_equal(key, CONF_INS_SIGNAL))
+               return connman_ins_settings.ins_signal;
+
+       if (g_str_equal(key, CONF_INS_INTERNET))
+               return connman_ins_settings.ins_internet;
+#endif
+
        return false;
 }
 
+#if defined TIZEN_EXT
+unsigned int connman_setting_get_uint(const char *key)
+{
+       if (g_str_equal(key, CONF_INS_PREFERRED_FREQ_BSSID_SCORE))
+               return connman_ins_settings.ins_preferred_freq_bssid_score;
+
+       if (g_str_equal(key, CONF_INS_LAST_CONNECTED_BSSID_SCORE))
+               return connman_ins_settings.ins_last_connected_bssid_score;
+
+       if (g_str_equal(key, CONF_INS_ASSOC_REJECT_SCORE))
+               return connman_ins_settings.ins_assoc_reject_score;
+
+       if (g_str_equal(key, CONF_INS_LAST_USER_SELECTION_TIME))
+               return connman_ins_settings.ins_last_user_selection_time;
+
+       if (g_str_equal(key, CONF_INS_SECURITY_PRIORITY_COUNT))
+               return connman_ins_settings.ins_security_priority_count;
+
+       if (g_str_equal(key, CONF_INS_LAST_USER_SELECTION_SCORE))
+               return connman_ins_settings.ins_last_user_selection_score;
+
+       if (g_str_equal(key, CONF_INS_LAST_CONNECTED_SCORE))
+               return connman_ins_settings.ins_last_connected_score;
+
+       if (g_str_equal(key, CONF_INS_PREFERRED_FREQ_SCORE))
+               return connman_ins_settings.ins_preferred_freq_score;
+
+       if (g_str_equal(key, CONF_INS_SECURITY_PRIORITY_SCORE))
+               return connman_ins_settings.ins_security_priority_score;
+
+       if (g_str_equal(key, CONF_INS_INTERNET_SCORE))
+               return connman_ins_settings.ins_internet_score;
+
+       return 0;
+}
+
+int connman_setting_get_int(const char *key)
+{
+       if (g_str_equal(key, CONF_INS_SIGNAL_LEVEL3_5GHZ))
+               return connman_ins_settings.ins_signal_level3_5ghz;
+
+       if (g_str_equal(key, CONF_INS_SIGNAL_LEVEL3_24GHZ))
+               return connman_ins_settings.ins_signal_level3_24ghz;
+
+       return 0;
+}
+#endif
+
 char **connman_setting_get_string_list(const char *key)
 {
        if (g_str_equal(key, CONF_PREF_TIMESERVERS))
@@ -617,17 +1279,28 @@ char **connman_setting_get_string_list(const char *key)
                return connman_settings.cellular_interfaces;
 #endif
 
+#if defined TIZEN_EXT
+       if (g_str_equal(key, CONF_INS_SECURITY_PRIORITY))
+               return connman_ins_settings.ins_security_priority;
+#endif
+
        return NULL;
 }
 
 unsigned int *connman_setting_get_uint_list(const char *key)
 {
-       if (g_str_equal(key, CONF_AUTO_CONNECT))
+       if (g_str_equal(key, CONF_AUTO_CONNECT_TECHS))
                return connman_settings.auto_connect;
 
+       if (g_str_equal(key, CONF_FAVORITE_TECHS))
+               return connman_settings.favorite_techs;
+
        if (g_str_equal(key, CONF_PREFERRED_TECHS))
                return connman_settings.preferred_techs;
 
+       if (g_str_equal(key, CONF_ALWAYS_CONNECTED_TECHS))
+               return connman_settings.always_connected_techs;
+
        return NULL;
 }
 
@@ -706,6 +1379,21 @@ int main(int argc, char *argv[])
 
        __connman_dbus_init(conn);
 
+#if defined TIZEN_EXT
+       if (access(CONTAINER_FILE, F_OK) == 0) {
+               g_main_loop_run(main_loop);
+
+               g_source_remove(signal);
+               dbus_connection_unref(conn);
+               g_main_loop_unref(main_loop);
+
+               __connman_dbus_cleanup();
+               __connman_log_cleanup(option_backtrace);
+
+               return 0;
+       }
+#endif
+
        if (!option_config)
                config_init(CONFIGMAINFILE);
        else
@@ -719,13 +1407,15 @@ int main(int argc, char *argv[])
        __connman_service_init();
        __connman_peer_service_init();
        __connman_peer_init();
+#if defined TIZEN_EXT_WIFI_MESH
+       __connman_mesh_init();
+#endif /* TIZEN_EXT_WIFI_MESH */
        __connman_provider_init();
        __connman_network_init();
        __connman_config_init();
        __connman_device_init(option_device, option_nodevice);
 
        __connman_ippool_init();
-       __connman_iptables_init();
        __connman_firewall_init();
        __connman_nat_init();
        __connman_tethering_init();
@@ -734,17 +1424,22 @@ int main(int argc, char *argv[])
        __connman_stats_init();
        __connman_clock_init();
 
-       __connman_resolver_init(option_dnsproxy);
        __connman_ipconfig_init();
+#if defined TIZEN_EXT
+       __connman_rtnl_init(GIO_SOCKET_RETRY_COUNT);
+#else /* TIZEN_EXT */
        __connman_rtnl_init();
+#endif /* TIZEN_EXT */
        __connman_task_init();
        __connman_proxy_init();
        __connman_detect_init();
        __connman_session_init();
+       __connman_timeserver_init();
        __connman_connection_init();
 
        __connman_plugin_init(option_plugin, option_noplugin);
 
+       __connman_resolver_init(option_dnsproxy);
        __connman_rtnl_start();
        __connman_dhcp_init();
        __connman_dhcpv6_init();
@@ -752,8 +1447,8 @@ int main(int argc, char *argv[])
        __connman_wispr_init();
 #if !defined TIZEN_EXT
        __connman_rfkill_init();
-#endif
        __connman_machine_init();
+#endif
 
        g_free(option_config);
        g_free(option_device);
@@ -765,8 +1460,8 @@ int main(int argc, char *argv[])
 
        g_source_remove(signal);
 
-       __connman_machine_cleanup();
 #if !defined TIZEN_EXT
+       __connman_machine_cleanup();
        __connman_rfkill_cleanup();
 #endif
        __connman_wispr_cleanup();
@@ -776,6 +1471,7 @@ int main(int argc, char *argv[])
        __connman_plugin_cleanup();
        __connman_provider_cleanup();
        __connman_connection_cleanup();
+       __connman_timeserver_cleanup();
        __connman_detect_cleanup();
        __connman_proxy_cleanup();
        __connman_task_cleanup();
@@ -790,9 +1486,11 @@ int main(int argc, char *argv[])
        __connman_tethering_cleanup();
        __connman_nat_cleanup();
        __connman_firewall_cleanup();
-       __connman_iptables_cleanup();
        __connman_peer_service_cleanup();
        __connman_peer_cleanup();
+#if defined TIZEN_EXT_WIFI_MESH
+       __connman_mesh_cleanup();
+#endif /* TIZEN_EXT_WIFI_MESH */
        __connman_ippool_cleanup();
        __connman_device_cleanup();
        __connman_network_cleanup();
@@ -817,11 +1515,19 @@ int main(int argc, char *argv[])
                g_strfreev(connman_settings.pref_timeservers);
 
        g_free(connman_settings.auto_connect);
+       g_free(connman_settings.favorite_techs);
        g_free(connman_settings.preferred_techs);
        g_strfreev(connman_settings.fallback_nameservers);
        g_strfreev(connman_settings.blacklisted_interfaces);
        g_strfreev(connman_settings.tethering_technologies);
 
+#if defined TIZEN_EXT
+       g_free(connman_ins_settings.ins_preferred_freq_bssid);
+       g_free(connman_ins_settings.ins_preferred_freq);
+       if (connman_ins_settings.ins_security_priority)
+               g_strfreev(connman_ins_settings.ins_security_priority);
+#endif
+
        g_free(option_debug);
        g_free(option_wifi);