From 33eba0393d259b6dc97e991be6c1dc4585e15f5d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 27 Feb 2014 13:01:38 -0600 Subject: [PATCH] api: update documentation about IPv6 bearer methods Even if the IPv6 bearer method is DHCP, the client should use SLAAC (eg, IPv6 Router Solicitations, Router Adverisements, and possibly DHCPv6) to determine the correct prefix and DNS information. In some cases, even with the DHCP method, and IPv6 "address" will be given which should be assigned to the data port before beginning an IP addressing as the mobile network may expect this address to be used. --- include/ModemManager-enums.h | 8 ++++++-- .../org.freedesktop.ModemManager1.Bearer.xml | 11 ++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/include/ModemManager-enums.h b/include/ModemManager-enums.h index ee09ddc0..5ff799f0 100644 --- a/include/ModemManager-enums.h +++ b/include/ModemManager-enums.h @@ -849,8 +849,12 @@ typedef enum { /*< underscore_name=mm_modem_contacts_storage >*/ * MMBearerIpMethod: * @MM_BEARER_IP_METHOD_UNKNOWN: Unknown method. * @MM_BEARER_IP_METHOD_PPP: Use PPP to get the address. - * @MM_BEARER_IP_METHOD_STATIC: Use the provided static IP configuration given by the modem to configure the IP data interface. - * @MM_BEARER_IP_METHOD_DHCP: Begin DHCP on the data interface to obtain necessary IP configuration details. + * @MM_BEARER_IP_METHOD_STATIC: Use the provided static IP configuration given + * by the modem to configure the IP data interface. + * @MM_BEARER_IP_METHOD_DHCP: Begin DHCP or IPv6 SLAAC on the data interface to + * obtain necessary IP configuration details. For IPv4 bearers DHCP should + * be used. For IPv6 bearers SLAAC should be used to determine the prefix and + * any additional details. * * Type of IP method configuration to be used in a given Bearer. */ diff --git a/introspection/org.freedesktop.ModemManager1.Bearer.xml b/introspection/org.freedesktop.ModemManager1.Bearer.xml index 1d2f287b..e1463a56 100644 --- a/introspection/org.freedesktop.ModemManager1.Bearer.xml +++ b/introspection/org.freedesktop.ModemManager1.Bearer.xml @@ -186,10 +186,15 @@ - If the bearer specifies configuration via PPP or DHCP, only the - "method" item will be present. + If the bearer specifies configuration via PPP or DHCP, often only the + "method" item will be present. IPv6 SLAAC should + be used to retrieve correct addressing and DNS information via Router + Advertisements and DHCPv6. In some cases an IPv6 Link-Local + "address" item will be present, which should be + assigned to the data port before performing SLAAC, as the mobile network + may expect SLAAC setup to use this address. - Additional items which are only applicable when using the + Additional items which are usually only applicable when using the MM_BEARER_IP_METHOD_STATIC method are: