diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2011-01-12 20:09:23 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-01-13 00:37:00 +0100 |
| commit | f0f822ecbab7bac13f429aa510e9ab4a1330296d (patch) | |
| tree | 2466496fa3979a17896c2e1e4b2ede8f920808f4 /src | |
| parent | 7d14b9e3c8f882dd8d014bcaa408d13ce60281f8 (diff) | |
| download | connman-f0f822ecbab7bac13f429aa510e9ab4a1330296d.tar.gz connman-f0f822ecbab7bac13f429aa510e9ab4a1330296d.tar.bz2 connman-f0f822ecbab7bac13f429aa510e9ab4a1330296d.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/service.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/service.c b/src/service.c index 5bb3acfe..6876bf1c 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); |