inet: Fix usage of getaddrinfo() return value

[framework/connectivity/connman.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 7a284b1..a39adb3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -50,6 +50,7 @@ static struct {
        char **fallback_nameservers;
        unsigned int timeout_inputreq;
        unsigned int timeout_browserlaunch;
+       char **blacklisted_interfaces;
 } connman_settings  = {
        .bg_scan = TRUE,
        .pref_timeservers = NULL,
@@ -58,6 +59,7 @@ static struct {
        .fallback_nameservers = NULL,
        .timeout_inputreq = DEFAULT_INPUT_REQUEST_TIMEOUT,
        .timeout_browserlaunch = DEFAULT_BROWSER_LAUNCH_TIMEOUT,
+       .blacklisted_interfaces = NULL,
 };
 
 static GKeyFile *load_config(const char *file)
@@ -113,8 +115,6 @@ static char **parse_fallback_nameservers(char **nameservers, gsize len)
 {
        char **servers;
        int i, j;
-       struct addrinfo hints;
-       struct addrinfo *addr;
 
        servers = g_try_new0(char *, len + 1);
        if (servers == NULL)
@@ -123,15 +123,10 @@ static char **parse_fallback_nameservers(char **nameservers, gsize len)
        i = 0;
        j = 0;
        while (nameservers[i] != NULL) {
-               memset(&hints, 0, sizeof(struct addrinfo));
-               hints.ai_flags = AI_NUMERICHOST;
-               addr = NULL;
-               if (getaddrinfo(nameservers[i], NULL, &hints, &addr) == 0) {
+               if (connman_inet_check_ipaddress(nameservers[i]) > 0) {
                        servers[j] = g_strdup(nameservers[i]);
                        j += 1;
                }
-
-               freeaddrinfo(addr);
                i += 1;
        }
 
@@ -143,19 +138,27 @@ static void parse_config(GKeyFile *config)
        GError *error = NULL;
        gboolean boolean;
        char **timeservers;
+       char **interfaces;
        char **str_list;
        gsize len;
-       char *default_auto_connect[] = {
+       static char *default_auto_connect[] = {
                "wifi",
                "ethernet",
                "cellular",
                NULL
        };
+       static char *default_blacklist[] = {
+               "vmnet",
+               "vboxnet",
+               "virbr",
+               NULL
+       };
        int timeout;
 
        if (config == NULL) {
                connman_settings.auto_connect =
                        parse_service_types(default_auto_connect, 3);
+               connman_settings.blacklisted_interfaces = default_blacklist;
                return;
        }
 
@@ -224,6 +227,16 @@ static void parse_config(GKeyFile *config)
                connman_settings.timeout_browserlaunch = timeout * 1000;
 
        g_clear_error(&error);
+
+       interfaces = g_key_file_get_string_list(config, "General",
+                       "NetworkInterfaceBlacklist", &len, &error);
+
+       if (error == NULL)
+               connman_settings.blacklisted_interfaces = interfaces;
+       else
+               connman_settings.blacklisted_interfaces = default_blacklist;
+
+       g_clear_error(&error);
 }
 
 static GMainLoop *main_loop = NULL;
@@ -382,6 +395,9 @@ char **connman_setting_get_string_list(const char *key)
        if (g_str_equal(key, "FallbackNameservers") == TRUE)
                return connman_settings.fallback_nameservers;
 
+       if (g_str_equal(key, "NetworkInterfaceBlacklist") == TRUE)
+               return connman_settings.blacklisted_interfaces;
+
        return NULL;
 }