dundee: Watch for signals only on DUNDEE_SERVICE

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

diff --git a/src/wpad.c b/src/wpad.c
index 0069c49..4e5834e 100644 (file)
--- 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
@@ -85,6 +85,9 @@ static void wpad_result(GResolvResultStatus status,
 
                g_free(url);
 
+               __connman_wispr_start(wpad->service,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4);
+
                return;
        }
 
@@ -113,6 +116,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)
@@ -141,12 +147,15 @@ int __connman_wpad_start(struct connman_service *service)
                return -EINVAL;
 
        wpad = g_try_new0(struct connman_wpad, 1);
-       if (wpad == NULL)
+       if (wpad == NULL) {
+               g_strfreev(nameservers);
                return -ENOMEM;
+       }
 
        wpad->service = service;
        wpad->resolv = g_resolv_new(index);
        if (wpad->resolv == NULL) {
+               g_strfreev(nameservers);
                g_free(wpad);
                return -ENOMEM;
        }
@@ -157,6 +166,8 @@ int __connman_wpad_start(struct connman_service *service)
        for (i = 0; nameservers[i] != NULL; 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);
@@ -164,6 +175,7 @@ int __connman_wpad_start(struct connman_service *service)
        g_resolv_lookup_hostname(wpad->resolv, wpad->hostname,
                                                        wpad_result, wpad);
 
+       connman_service_ref(service);
        g_hash_table_replace(wpad_list, GINT_TO_POINTER(index), wpad);
 
        return 0;
@@ -182,7 +194,8 @@ void __connman_wpad_stop(struct connman_service *service)
        if (index < 0)
                return;
 
-       g_hash_table_remove(wpad_list, GINT_TO_POINTER(index));
+       if (g_hash_table_remove(wpad_list, GINT_TO_POINTER(index)) == TRUE)
+               connman_service_unref(service);
 }
 
 int __connman_wpad_init(void)