---
doc/service-api.txt | 65 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/doc/service-api.txt b/doc/service-api.txt
index c4e1495..87053c2 100644
--- a/doc/service-api.txt
+++ b/doc/service-api.txt
@@ -410,12 +410,65 @@ Properties string State [readonly]
If no automatic configuration is available,
then "direct" is set.
- The values "auto" and "manual" are not yet
- supported.
-
string URL [readonly]
- Automatic proxy configuration URL.
+ Automatic proxy configuration URL. Used when
+ Method is "auto-config" or "auto".
+
+ string Http [readonly]
+
+ Address/hostname for HTTP proxy. Used when
+ Method is "manual"
+
+ uint16 HttpPort [readonly]
+
+ Port number for HTTP proxy. Used if Http has
+ a value.
+
+ string Https [readonly]
+
+ Address/hostname for HTTPS proxy. Used when
+ Method is "manual"
+
+ uint16 HttpsPort [readonly]
+
+ Port number for HTTPS proxy. Used if Https has
+ a value.
+
+ string Ftp [readonly]
+
+ Address/hostname for FTP proxy. Used when
+ Method is "manual"
+
+ uint16 FtpPort [readonly]
+
+ Port number for FTP proxy. Used if Ftp has
+ a value.
+
+ string Socks [readonly]
+
+ Address/hostname for socks proxy. Used when
+ Method is "manual"
+
+ uint16 SocksPort [readonly]
+
+ Port number for socks proxy. Used if Socks has
+ a value.
+
+ string Rtsp [readonly]
+
+ Address/hostname for RTSP proxy. Used when
+ Method is "manual"
+
+ uint16 RtspPort [readonly]
+
+ Port number for RTSP proxy. Used if Rtsp has
+ a value.
+
+ array{string} Ignore [readonly]
+
+ List of networks or hostnames that do not
+ have a proxy.
dict Proxy.Configuration [readwrite]
@@ -423,8 +476,8 @@ Properties string State [readonly]
the actual system configuration while this allows
user configuration.
- Currently only setting Method to either "direct"
- or "auto" is supported.
+ Value "auto-config" cannot be used here since it is
+ up to DHCP to set it or not in Proxy.
dict Provider [readonly]
--
1.7.1
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
