From 6518e361171f64bcaaa4bf868139362ed95cc2e0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 20 Oct 2018 01:30:31 +0200 Subject: New upstream version 1.14.2 --- src/nm-ip6-config.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/nm-ip6-config.h') diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h index b8e80410..862f237d 100644 --- a/src/nm-ip6-config.h +++ b/src/nm-ip6-config.h @@ -130,12 +130,13 @@ void nm_ip6_config_subtract (NMIP6Config *dst, guint32 default_route_metric_penalty); void nm_ip6_config_intersect (NMIP6Config *dst, const NMIP6Config *src, + gboolean intersect_routes, guint32 default_route_metric_penalty); NMIP6Config *nm_ip6_config_intersect_alloc (const NMIP6Config *a, const NMIP6Config *b, + gboolean intersect_routes, guint32 default_route_metric_penalty); gboolean nm_ip6_config_replace (NMIP6Config *dst, const NMIP6Config *src, gboolean *relevant_changes); -void nm_ip6_config_dump (const NMIP6Config *self, const char *detail); const NMPObject *nm_ip6_config_best_default_route_get (const NMIP6Config *self); const NMPObject *_nm_ip6_config_best_default_route_find (const NMIP6Config *self); @@ -194,8 +195,8 @@ void nm_ip6_config_del_dns_option (NMIP6Config *self, guint i); guint nm_ip6_config_get_num_dns_options (const NMIP6Config *self); const char * nm_ip6_config_get_dns_option (const NMIP6Config *self, guint i); -void nm_ip6_config_set_dns_priority (NMIP6Config *self, gint priority); -gint nm_ip6_config_get_dns_priority (const NMIP6Config *self); +void nm_ip6_config_set_dns_priority (NMIP6Config *self, int priority); +int nm_ip6_config_get_dns_priority (const NMIP6Config *self); const NMPObject *nm_ip6_config_nmpobj_lookup (const NMIP6Config *self, const NMPObject *needle); -- cgit 1.3.0-6-gf8a5