[connman] Added Tizen Wi-Fi Mesh

[platform/upstream/connman.git] / src / wpad.c

diff --git a/src/wpad.c b/src/wpad.c
old mode 100644 (file)
new mode 100755 (executable)
index 0069c49..b7f1f1e
--- a/src/wpad.c
+++ b/src/wpad.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -49,11 +49,13 @@ static void free_wpad(gpointer data)
 {
         struct connman_wpad *wpad = data;
 
+       connman_service_unref(wpad->service);
+
        g_resolv_unref(wpad->resolv);
 
        g_strfreev(wpad->addrlist);
        g_free(wpad->hostname);
-        g_free(wpad);
+       g_free(wpad);
 }
 
 static void download_pac(struct connman_wpad *wpad, const char *target)
@@ -72,7 +74,7 @@ static void wpad_result(GResolvResultStatus status,
        if (status == G_RESOLV_RESULT_STATUS_SUCCESS) {
                char *url;
 
-               if (results == NULL || g_strv_length(results) == 0)
+               if (!results || g_strv_length(results) == 0)
                        goto failed;
 
                url = g_strdup_printf("http://%s/wpad.dat", wpad->hostname);
@@ -80,11 +82,14 @@ static void wpad_result(GResolvResultStatus status,
                __connman_service_set_proxy_autoconfig(wpad->service, url);
 
                wpad->addrlist = g_strdupv(results);
-               if (wpad->addrlist != NULL)
+               if (wpad->addrlist)
                        download_pac(wpad, "wpad.dat");
 
                g_free(url);
 
+               __connman_wispr_start(wpad->service,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+
                return;
        }
 
@@ -94,10 +99,10 @@ static void wpad_result(GResolvResultStatus status,
                goto failed;
 
        ptr = strchr(hostname + 5, '.');
-       if (ptr == NULL || strlen(ptr) < 2)
+       if (!ptr || strlen(ptr) < 2)
                goto failed;
 
-       if (strchr(ptr + 1, '.') == NULL)
+       if (!strchr(ptr + 1, '.'))
                goto failed;
 
        wpad->hostname = g_strdup_printf("wpad.%s", ptr + 1);
@@ -113,6 +118,9 @@ static void wpad_result(GResolvResultStatus status,
 failed:
        connman_service_set_proxy_method(wpad->service,
                                CONNMAN_SERVICE_PROXY_METHOD_DIRECT);
+
+       __connman_wispr_start(wpad->service,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
 }
 
 int __connman_wpad_start(struct connman_service *service)
@@ -125,7 +133,7 @@ int __connman_wpad_start(struct connman_service *service)
 
        DBG("service %p", service);
 
-       if (wpad_list == NULL)
+       if (!wpad_list)
                return -EINVAL;
 
        index = __connman_service_get_index(service);
@@ -133,34 +141,42 @@ int __connman_wpad_start(struct connman_service *service)
                return -EINVAL;
 
        domainname = connman_service_get_domainname(service);
-       if (domainname == NULL)
+       if (!domainname)
                return -EINVAL;
 
        nameservers = connman_service_get_nameservers(service);
-       if (nameservers == NULL)
+       if (!nameservers)
                return -EINVAL;
 
        wpad = g_try_new0(struct connman_wpad, 1);
-       if (wpad == NULL)
+       if (!wpad) {
+               g_strfreev(nameservers);
                return -ENOMEM;
+       }
 
-       wpad->service = service;
        wpad->resolv = g_resolv_new(index);
-       if (wpad->resolv == NULL) {
+       if (!wpad->resolv) {
+               g_strfreev(nameservers);
                g_free(wpad);
                return -ENOMEM;
        }
 
+#if !defined TIZEN_EXT
        if (getenv("CONNMAN_RESOLV_DEBUG"))
+#endif
                g_resolv_set_debug(wpad->resolv, resolv_debug, "RESOLV");
 
-       for (i = 0; nameservers[i] != NULL; i++)
+       for (i = 0; nameservers[i]; i++)
                g_resolv_add_nameserver(wpad->resolv, nameservers[i], 53, 0);
 
+       g_strfreev(nameservers);
+
        wpad->hostname = g_strdup_printf("wpad.%s", domainname);
 
        DBG("hostname %s", wpad->hostname);
 
+       wpad->service = connman_service_ref(service);
+
        g_resolv_lookup_hostname(wpad->resolv, wpad->hostname,
                                                        wpad_result, wpad);
 
@@ -175,7 +191,7 @@ void __connman_wpad_stop(struct connman_service *service)
 
        DBG("service %p", service);
 
-       if (wpad_list == NULL)
+       if (!wpad_list)
                return;
 
        index = __connman_service_get_index(service);