projects
/
framework
/
connectivity
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main.conf: Add NetworkInterfaceBlacklist
[framework/connectivity/connman.git]
/
src
/
wpad.c
diff --git
a/src/wpad.c
b/src/wpad.c
index
1102dad
..
4e5834e
100644
(file)
--- a/
src/wpad.c
+++ b/
src/wpad.c
@@
-2,7
+2,7
@@
*
* Connection Manager
*
*
* Connection Manager
*
- * Copyright (C) 2007-201
0
Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-201
2
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
*
* 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
@@
-23,6
+23,7
@@
#include <config.h>
#endif
#include <config.h>
#endif
+#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-84,6
+85,9
@@
static void wpad_result(GResolvResultStatus status,
g_free(url);
g_free(url);
+ __connman_wispr_start(wpad->service,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
+
return;
}
return;
}
@@
-112,46
+116,57
@@
static void wpad_result(GResolvResultStatus status,
failed:
connman_service_set_proxy_method(wpad->service,
CONNMAN_SERVICE_PROXY_METHOD_DIRECT);
failed:
connman_service_set_proxy_method(wpad->service,
CONNMAN_SERVICE_PROXY_METHOD_DIRECT);
+
+ __connman_wispr_start(wpad->service,
+ CONNMAN_IPCONFIG_TYPE_IPV4);
}
}
-
void
__connman_wpad_start(struct connman_service *service)
+
int
__connman_wpad_start(struct connman_service *service)
{
struct connman_wpad *wpad;
{
struct connman_wpad *wpad;
- const char *domainname, *nameserver;
+ const char *domainname;
+ char **nameservers;
int index;
int index;
+ int i;
DBG("service %p", service);
if (wpad_list == NULL)
DBG("service %p", service);
if (wpad_list == NULL)
- return;
+ return
-EINVAL
;
index = __connman_service_get_index(service);
if (index < 0)
index = __connman_service_get_index(service);
if (index < 0)
- return;
+ return
-EINVAL
;
domainname = connman_service_get_domainname(service);
if (domainname == NULL)
domainname = connman_service_get_domainname(service);
if (domainname == NULL)
- return;
+ return
-EINVAL
;
- nameserver
= connman_service_get_nameserver
(service);
- if (nameserver == NULL)
- return;
+ nameserver
s = connman_service_get_nameservers
(service);
+ if (nameserver
s
== NULL)
+ return
-EINVAL
;
wpad = g_try_new0(struct connman_wpad, 1);
wpad = g_try_new0(struct connman_wpad, 1);
- if (wpad == NULL)
- return;
+ if (wpad == NULL) {
+ g_strfreev(nameservers);
+ return -ENOMEM;
+ }
wpad->service = service;
wpad->resolv = g_resolv_new(index);
if (wpad->resolv == NULL) {
wpad->service = service;
wpad->resolv = g_resolv_new(index);
if (wpad->resolv == NULL) {
+ g_strfreev(nameservers);
g_free(wpad);
g_free(wpad);
- return;
+ return
-ENOMEM
;
}
if (getenv("CONNMAN_RESOLV_DEBUG"))
g_resolv_set_debug(wpad->resolv, resolv_debug, "RESOLV");
}
if (getenv("CONNMAN_RESOLV_DEBUG"))
g_resolv_set_debug(wpad->resolv, resolv_debug, "RESOLV");
- g_resolv_add_nameserver(wpad->resolv, nameserver, 53, 0);
+ 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);
wpad->hostname = g_strdup_printf("wpad.%s", domainname);
@@
-160,7
+175,10
@@
void __connman_wpad_start(struct connman_service *service)
g_resolv_lookup_hostname(wpad->resolv, wpad->hostname,
wpad_result, wpad);
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);
g_hash_table_replace(wpad_list, GINT_TO_POINTER(index), wpad);
+
+ return 0;
}
void __connman_wpad_stop(struct connman_service *service)
}
void __connman_wpad_stop(struct connman_service *service)
@@
-176,7
+194,8
@@
void __connman_wpad_stop(struct connman_service *service)
if (index < 0)
return;
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)
}
int __connman_wpad_init(void)