summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2013-03-25 09:58:32 (GMT)
committerPatrik Flykt <patrik.flykt@linux.intel.com>2013-03-25 12:08:36 (GMT)
commitbd320a31a4939c43976726fbb201b1ad6c752b13 (patch)
treed55c5c93c3a28003bf13311fc4c2f690791b8a5b /doc
parent555f962dc5f75a9a54fa79257f348a6c46be0f5e (diff)
downloadconnman-bd320a31a4939c43976726fbb201b1ad6c752b13.zip
connman-bd320a31a4939c43976726fbb201b1ad6c752b13.tar.gz
connman-bd320a31a4939c43976726fbb201b1ad6c752b13.tar.bz2
config: Allow user to specify how IP address is used
If IPv4 address is missing then DHCPv4 is used. If IPv6 address is missing, then SLAAC or DHCPv6 is used. This was specified in doc/config-format.txt but implementation was missing. We also allow the IP address to contain "off", "dhcp" or "auto" string, so user can specify how the IP address can be set for the interface. Fixes BMC#25985
Diffstat (limited to 'doc')
-rw-r--r--doc/config-format.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/config-format.txt b/doc/config-format.txt
index 7be6d05..c255177 100644
--- a/doc/config-format.txt
+++ b/doc/config-format.txt
@@ -37,12 +37,16 @@ Allowed fields:
- Type: Service type. We currently only support wifi and ethernet.
- IPv4: The IPv4 address, netmask and gateway. Format of the entry
is network/netmask/gateway. The mask length can be used instead
- of netmask.
+ of netmask. The field can also contain the string "off" or "dhcp".
+ If the setting is "off", then no IPv4 address is set to the interface.
+ If the setting is "dhcp", then DHCPv4 address resolution is activated.
Example: 192.168.1.2/24/192.168.1.1
192.168.200.100/255.255.255.0/192.168.200.1
- IPv6: The IPv6 address, prefix length and gateway. Format of the entry
is network/prefixlen/gateway. For IPv6 addresses only prefix length is
- accepted.
+ accepted. The field can also contain the string "off" or "auto".
+ If the setting is "off", then no IPv6 address is set to the interface.
+ If the setting is "auto", then SLAAC or DHCPv6 is used.
Example: 2001:db8::2/64/2001:db8::1
- IPv6.Privacy: IPv6 privacy option. Value can be either "disabled",
"enabled" or "prefered". See use_tempaddr variable description in Linux