Install and fix up libnm-util IPv6 config stuff

1 files changed, 47 insertions, 54 deletions

diff --git a/libnm-util/nm-setting-ip6-config.h b/libnm-util/nm-setting-ip6-config.h
index 879d82e0cb..4e39940231 100644
--- a/libnm-util/nm-setting-ip6-config.h
+++ b/libnm-util/nm-setting-ip6-config.h
@@ -54,21 +54,20 @@ GType nm_setting_ip6_config_error_get_type (void);
 #define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
 GQuark nm_setting_ip6_config_error_quark (void);
 
-#define NM_SETTING_IP6_CONFIG_METHOD            "method"
-#define NM_SETTING_IP6_CONFIG_DNS               "dns"
-#define NM_SETTING_IP6_CONFIG_DNS_SEARCH        "dns-search"
-#define NM_SETTING_IP6_CONFIG_ADDRESSES         "addresses"
-#define NM_SETTING_IP6_CONFIG_ROUTES            "routes"
-#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS   "ignore-auto-dns"
-#define NM_SETTING_IP6_CONFIG_IGNORE_ROUTER_ADV "ignore-router-adv"
-#define NM_SETTING_IP6_CONFIG_DHCP_MODE         "dhcp-mode"
-
-#define NM_SETTING_IP6_CONFIG_METHOD_AUTO   "auto"
-#define NM_SETTING_IP6_CONFIG_METHOD_MANUAL "manual"
-#define NM_SETTING_IP6_CONFIG_METHOD_SHARED "shared"
-
-#define NM_SETTING_IP6_CONFIG_DHCPV6_MODE_INFO    "info"
-#define NM_SETTING_IP6_CONFIG_DHCPV6_MODE_REQUEST "request"
+#define NM_SETTING_IP6_CONFIG_METHOD             "method"
+#define NM_SETTING_IP6_CONFIG_DNS                "dns"
+#define NM_SETTING_IP6_CONFIG_DNS_SEARCH         "dns-search"
+#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
+#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
+#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
+#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
+
+#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
+#define NM_SETTING_IP6_CONFIG_METHOD_AUTO       "auto"
+#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
+#define NM_SETTING_IP6_CONFIG_METHOD_MANUAL     "manual"
+#define NM_SETTING_IP6_CONFIG_METHOD_SHARED     "shared"
 
 
 typedef struct NMIP6Address NMIP6Address;
@@ -82,16 +81,12 @@ gboolean               nm_ip6_address_compare     (NMIP6Address *address, NMIP6A
 
 const struct in6_addr *nm_ip6_address_get_address (NMIP6Address *address);
 void                   nm_ip6_address_set_address (NMIP6Address *address,
-                                                   const struct in6_addr *addr);  /* network byte order */
+                                                   const struct in6_addr *addr);
 
 guint32                nm_ip6_address_get_prefix  (NMIP6Address *address);
 void                   nm_ip6_address_set_prefix  (NMIP6Address *address,
                                                    guint32 prefix);
 
-const struct in6_addr *nm_ip6_address_get_gateway (NMIP6Address *address);
-void                   nm_ip6_address_set_gateway (NMIP6Address *address,
-                                                   const struct in6_addr *addr);  /* network byte order */
-
 typedef struct NMIP6Route NMIP6Route;
 
 NMIP6Route *           nm_ip6_route_new          (void);
@@ -103,7 +98,7 @@ gboolean               nm_ip6_route_compare      (NMIP6Route *route, NMIP6Route
 
 const struct in6_addr *nm_ip6_route_get_dest     (NMIP6Route *route);
 void                   nm_ip6_route_set_dest     (NMIP6Route *route,
-                                                  const struct in6_addr *dest);  /* network byte order */
+                                                  const struct in6_addr *dest);
 
 guint32                nm_ip6_route_get_prefix   (NMIP6Route *route);
 void                   nm_ip6_route_set_prefix   (NMIP6Route *route,
@@ -111,7 +106,7 @@ void                   nm_ip6_route_set_prefix   (NMIP6Route *route,
 
 const struct in6_addr *nm_ip6_route_get_next_hop (NMIP6Route *route);
 void                   nm_ip6_route_set_next_hop (NMIP6Route *route,
-                                                  const struct in6_addr *next_hop);  /* network byte order */
+                                                  const struct in6_addr *next_hop);
 
 guint32                nm_ip6_route_get_metric   (NMIP6Route *route);
 void                   nm_ip6_route_set_metric   (NMIP6Route *route,
@@ -125,40 +120,38 @@ typedef struct {
 	NMSettingClass parent;
 } NMSettingIP6ConfigClass;
 
-/* IPv6 support is currently incomplete.  Do not use. */
-
 GType nm_setting_ip6_config_get_type (void);
 
-NMSetting *            nm_setting_ip6_config_new                   (void);
-const char *           nm_setting_ip6_config_get_method            (NMSettingIP6Config *setting);
-
-guint32                nm_setting_ip6_config_get_num_dns           (NMSettingIP6Config *setting);
-const struct in6_addr *nm_setting_ip6_config_get_dns               (NMSettingIP6Config *setting, guint32 i);
-gboolean               nm_setting_ip6_config_add_dns               (NMSettingIP6Config *setting, const struct in6_addr *dns);
-void                   nm_setting_ip6_config_remove_dns            (NMSettingIP6Config *setting, guint32 i);
-void                   nm_setting_ip6_config_clear_dns             (NMSettingIP6Config *setting);
-
-guint32                nm_setting_ip6_config_get_num_dns_searches  (NMSettingIP6Config *setting);
-const char *           nm_setting_ip6_config_get_dns_search        (NMSettingIP6Config *setting, guint32 i);
-gboolean               nm_setting_ip6_config_add_dns_search        (NMSettingIP6Config *setting, const char *dns_search);
-void                   nm_setting_ip6_config_remove_dns_search     (NMSettingIP6Config *setting, guint32 i);
-void                   nm_setting_ip6_config_clear_dns_searches    (NMSettingIP6Config *setting);
-
-guint32                nm_setting_ip6_config_get_num_addresses     (NMSettingIP6Config *setting);
-NMIP6Address *         nm_setting_ip6_config_get_address           (NMSettingIP6Config *setting, guint32 i);
-gboolean               nm_setting_ip6_config_add_address           (NMSettingIP6Config *setting, NMIP6Address *address);
-void                   nm_setting_ip6_config_remove_address        (NMSettingIP6Config *setting, guint32 i);
-void                   nm_setting_ip6_config_clear_addresses       (NMSettingIP6Config *setting);
-
-guint32                nm_setting_ip6_config_get_num_routes        (NMSettingIP6Config *setting);
-NMIP6Route *           nm_setting_ip6_config_get_route             (NMSettingIP6Config *setting, guint32 i);
-gboolean               nm_setting_ip6_config_add_route             (NMSettingIP6Config *setting, NMIP6Route *route);
-void                   nm_setting_ip6_config_remove_route          (NMSettingIP6Config *setting, guint32 i);
-void                   nm_setting_ip6_config_clear_routes          (NMSettingIP6Config *setting);
-
-gboolean               nm_setting_ip6_config_get_ignore_auto_dns   (NMSettingIP6Config *setting);
-gboolean               nm_setting_ip6_config_get_ignore_router_adv (NMSettingIP6Config *setting);
-const char *           nm_setting_ip6_config_get_dhcp_mode         (NMSettingIP6Config *setting);
+NMSetting *            nm_setting_ip6_config_new                    (void);
+const char *           nm_setting_ip6_config_get_method             (NMSettingIP6Config *setting);
+
+guint32                nm_setting_ip6_config_get_num_dns            (NMSettingIP6Config *setting);
+const struct in6_addr *nm_setting_ip6_config_get_dns                (NMSettingIP6Config *setting, guint32 i);
+gboolean               nm_setting_ip6_config_add_dns                (NMSettingIP6Config *setting, const struct in6_addr *dns);
+void                   nm_setting_ip6_config_remove_dns             (NMSettingIP6Config *setting, guint32 i);
+void                   nm_setting_ip6_config_clear_dns              (NMSettingIP6Config *setting);
+
+guint32                nm_setting_ip6_config_get_num_dns_searches   (NMSettingIP6Config *setting);
+const char *           nm_setting_ip6_config_get_dns_search         (NMSettingIP6Config *setting, guint32 i);
+gboolean               nm_setting_ip6_config_add_dns_search         (NMSettingIP6Config *setting, const char *dns_search);
+void                   nm_setting_ip6_config_remove_dns_search      (NMSettingIP6Config *setting, guint32 i);
+void                   nm_setting_ip6_config_clear_dns_searches     (NMSettingIP6Config *setting);
+
+guint32                nm_setting_ip6_config_get_num_addresses      (NMSettingIP6Config *setting);
+NMIP6Address *         nm_setting_ip6_config_get_address            (NMSettingIP6Config *setting, guint32 i);
+gboolean               nm_setting_ip6_config_add_address            (NMSettingIP6Config *setting, NMIP6Address *address);
+void                   nm_setting_ip6_config_remove_address         (NMSettingIP6Config *setting, guint32 i);
+void                   nm_setting_ip6_config_clear_addresses        (NMSettingIP6Config *setting);
+
+guint32                nm_setting_ip6_config_get_num_routes         (NMSettingIP6Config *setting);
+NMIP6Route *           nm_setting_ip6_config_get_route              (NMSettingIP6Config *setting, guint32 i);
+gboolean               nm_setting_ip6_config_add_route              (NMSettingIP6Config *setting, NMIP6Route *route);
+void                   nm_setting_ip6_config_remove_route           (NMSettingIP6Config *setting, guint32 i);
+void                   nm_setting_ip6_config_clear_routes           (NMSettingIP6Config *setting);
+gboolean               nm_setting_ip6_config_get_ignore_auto_routes (NMSettingIP6Config *setting);
+
+gboolean               nm_setting_ip6_config_get_ignore_auto_dns    (NMSettingIP6Config *setting);
+gboolean               nm_setting_ip6_config_get_never_default      (NMSettingIP6Config *setting);
 
 G_END_DECLS