Imported Upstream version 1.0.0 upstream/1.0.0

1 files changed, 17 insertions, 9 deletions

diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h
index b7b9d83e..f1d2dc8d 100644
--- a/src/nm-ip6-config.h
+++ b/src/nm-ip6-config.h
@@ -18,12 +18,13 @@
  * Copyright (C) 2008–2013 Red Hat, Inc.
  */
 
-#ifndef NM_IP6_CONFIG_H
-#define NM_IP6_CONFIG_H
+#ifndef __NETWORKMANAGER_IP6_CONFIG_H__
+#define __NETWORKMANAGER_IP6_CONFIG_H__
 
 #include <glib-object.h>
+#include <netinet/in.h>
 
-#include "nm-platform.h"
+#include "nm-types.h"
 #include "nm-setting-ip6-config.h"
 
 #define NM_TYPE_IP6_CONFIG (nm_ip6_config_get_type ())
@@ -33,21 +34,25 @@
 #define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP6_CONFIG))
 #define NM_IP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass))
 
-typedef struct {
+struct _NMIP6Config {
 	GObject parent;
-} NMIP6Config;
+};
 
 typedef struct {
 	GObjectClass parent;
 } NMIP6ConfigClass;
 
+#define NM_IP6_CONFIG_ADDRESS_DATA "address-data"
+#define NM_IP6_CONFIG_ROUTE_DATA "route-data"
 #define NM_IP6_CONFIG_GATEWAY "gateway"
-#define NM_IP6_CONFIG_ADDRESSES "addresses"
-#define NM_IP6_CONFIG_ROUTES "routes"
 #define NM_IP6_CONFIG_NAMESERVERS "nameservers"
 #define NM_IP6_CONFIG_DOMAINS "domains"
 #define NM_IP6_CONFIG_SEARCHES "searches"
 
+/* deprecated */
+#define NM_IP6_CONFIG_ADDRESSES "addresses"
+#define NM_IP6_CONFIG_ROUTES "routes"
+
 GType nm_ip6_config_get_type (void);
 
 
@@ -60,7 +65,7 @@ const char * nm_ip6_config_get_dbus_path (const NMIP6Config *config);
 /* Integration with nm-platform and nm-setting */
 NMIP6Config *nm_ip6_config_capture (int ifindex, gboolean capture_resolv_conf, NMSettingIP6ConfigPrivacy use_temporary);
 gboolean nm_ip6_config_commit (const NMIP6Config *config, int ifindex);
-void nm_ip6_config_merge_setting (NMIP6Config *config, NMSettingIP6Config *setting, int default_route_metric);
+void nm_ip6_config_merge_setting (NMIP6Config *config, NMSettingIPConfig *setting, guint32 default_route_metric);
 NMSetting *nm_ip6_config_create_setting (const NMIP6Config *config);
 
 /* Utility functions */
@@ -93,6 +98,9 @@ void nm_ip6_config_del_route (NMIP6Config *config, guint i);
 guint32 nm_ip6_config_get_num_routes (const NMIP6Config *config);
 const NMPlatformIP6Route *nm_ip6_config_get_route (const NMIP6Config *config, guint32 i);
 
+const NMPlatformIP6Route *nm_ip6_config_get_direct_route_for_host (const NMIP6Config *config, const struct in6_addr *host);
+const NMPlatformIP6Address *nm_ip6_config_get_subnet_for_host (const NMIP6Config *config, const struct in6_addr *host);
+
 /* Nameservers */
 void nm_ip6_config_reset_nameservers (NMIP6Config *config);
 void nm_ip6_config_add_nameserver (NMIP6Config *config, const struct in6_addr *nameserver);
@@ -127,4 +135,4 @@ gboolean nm_ip6_config_equal (const NMIP6Config *a, const NMIP6Config *b);
 gboolean nm_ip6_config_capture_resolv_conf (GArray *nameservers,
                                             const char *rc_contents);
 
-#endif /* NM_IP6_CONFIG_H */
+#endif /* __NETWORKMANAGER_IP6_CONFIG_H__ */