New upstream version 1.35.91 upstream/1.35.91

1 files changed, 18 insertions, 17 deletions

diff --git a/src/core/dhcp/nm-dhcp-utils.h b/src/core/dhcp/nm-dhcp-utils.h
index 69715f90..bef50c52 100644
--- a/src/core/dhcp/nm-dhcp-utils.h
+++ b/src/core/dhcp/nm-dhcp-utils.h
@@ -8,21 +8,18 @@
 
 #include <stdlib.h>
 
-#include "nm-ip4-config.h"
-#include "nm-ip6-config.h"
-
-NMIP4Config *nm_dhcp_utils_ip4_config_from_options(struct _NMDedupMultiIndex *multi_idx,
-                                                   int                        ifindex,
-                                                   const char *               iface,
-                                                   GHashTable *               options,
-                                                   guint32                    route_table,
-                                                   guint32                    route_metric);
-
-NMIP6Config *nm_dhcp_utils_ip6_config_from_options(struct _NMDedupMultiIndex *multi_idx,
-                                                   int                        ifindex,
-                                                   const char *               iface,
-                                                   GHashTable *               options,
-                                                   gboolean                   info_only);
+#include "nm-l3-config-data.h"
+
+NML3ConfigData *nm_dhcp_utils_ip4_config_from_options(struct _NMDedupMultiIndex *multi_idx,
+                                                      int                        ifindex,
+                                                      const char                *iface,
+                                                      GHashTable                *options);
+
+NML3ConfigData *nm_dhcp_utils_ip6_config_from_options(struct _NMDedupMultiIndex *multi_idx,
+                                                      int                        ifindex,
+                                                      const char                *iface,
+                                                      GHashTable                *options,
+                                                      gboolean                   info_only);
 
 NMPlatformIP6Address nm_dhcp_utils_ip6_prefix_from_options(GHashTable *options);
 
@@ -34,10 +31,14 @@ gboolean nm_dhcp_utils_get_leasefile_path(int         addr_family,
                                           const char *plugin_name,
                                           const char *iface,
                                           const char *uuid,
-                                          char **     out_leasefile_path);
+                                          char      **out_leasefile_path);
 
 char *nm_dhcp_utils_get_dhcp6_event_id(GHashTable *lease);
 
+gboolean nm_dhcp_utils_merge_new_dhcp6_lease(const NML3ConfigData  *l3cd_old,
+                                             const NML3ConfigData  *l3cd_new,
+                                             const NML3ConfigData **out_l3cd_merged);
+
 /*****************************************************************************/
 
 static inline gboolean
@@ -65,6 +66,6 @@ gboolean nm_dhcp_lease_data_parse_mtu(const guint8 *data, gsize n_data, guint16
 gboolean nm_dhcp_lease_data_parse_cstr(const guint8 *data, gsize n_data, gsize *out_new_len);
 gboolean nm_dhcp_lease_data_parse_domain(const guint8 *data, gsize n_data, char **out_val);
 gboolean nm_dhcp_lease_data_parse_in_addr(const guint8 *data, gsize n_data, in_addr_t *out_val);
-char **  nm_dhcp_lease_data_parse_search_list(const guint8 *data, gsize n_data);
+char   **nm_dhcp_lease_data_parse_search_list(const guint8 *data, gsize n_data);
 
 #endif /* __NETWORKMANAGER_DHCP_UTILS_H__ */