From f0f822ecbab7bac13f429aa510e9ab4a1330296d Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Wed, 12 Jan 2011 20:09:23 +0100 Subject: [PATCH] service: Start WPAD if proxy is not manually configured WPAD starts also when the proxy method is configured to AUTO but it's missing a PAC URL. --- src/service.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/service.c b/src/service.c index 5bb3acf..6876bf1 100644 --- a/src/service.c +++ b/src/service.c @@ -3100,6 +3100,8 @@ int __connman_service_indicate_state(struct connman_service *service, } if (state == CONNMAN_SERVICE_STATE_READY) { + enum connman_service_proxy_method proxy_config; + set_reconnect_state(service, TRUE); __connman_service_set_favorite(service, TRUE); @@ -3115,7 +3117,12 @@ int __connman_service_indicate_state(struct connman_service *service, dns_changed(service); domain_changed(service); - __connman_wpad_start(service); + proxy_config = service->proxy_config; + + if (proxy_config == CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN || + (proxy_config == CONNMAN_SERVICE_PROXY_METHOD_AUTO && + service->pac == NULL)) + __connman_wpad_start(service); __connman_notifier_connect(service->type); -- 2.7.4