diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2011-01-12 23:37:42 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-01-13 00:37:16 +0100 |
| commit | bbfb775f74d23aa4870dfd32cba6cb272cf45cee (patch) | |
| tree | ef5fdf028cad662169bffac2558325b4f2f24d5b | |
| parent | 3243f3966e4f05801a443e3893ac8551a47ec4b1 (diff) | |
| download | connman-bbfb775f74d23aa4870dfd32cba6cb272cf45cee.tar.gz connman-bbfb775f74d23aa4870dfd32cba6cb272cf45cee.tar.bz2 connman-bbfb775f74d23aa4870dfd32cba6cb272cf45cee.zip | |
service: Return service proxy is configured PAC URL is not set
If the proxy configured method is AUTO but the PAC URL is not set yet,
returning service->proxy will give the correct method when WPAD failed.
| -rw-r--r-- | src/service.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/service.c b/src/service.c index 425a3ff2..caee9736 100644 --- a/src/service.c +++ b/src/service.c @@ -1569,8 +1569,13 @@ enum connman_service_proxy_method connman_service_get_proxy_method( if (service == NULL) return CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN; - if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN) + if (service->proxy_config != CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN) { + if (service->proxy_config == CONNMAN_SERVICE_PROXY_METHOD_AUTO && + service->pac == NULL) + return service->proxy; + return service->proxy_config; + } return service->proxy; } |