From bbfb775f74d23aa4870dfd32cba6cb272cf45cee Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Wed, 12 Jan 2011 23:37:42 +0100 Subject: 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. --- src/service.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') 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; } -- cgit v1.2.3