Merge tag 'upstream/1.8.0' into experimental

Upstream version 1.8.0

1 files changed, 6 insertions, 3 deletions

diff --git a/src/nm-route-manager.h b/src/nm-route-manager.h
index d12f0256..bdf79a09 100644
--- a/src/nm-route-manager.h
+++ b/src/nm-route-manager.h
@@ -28,7 +28,10 @@
 #define NM_IS_ROUTE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ROUTE_MANAGER))
 #define NM_ROUTE_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ROUTE_MANAGER, NMRouteManagerClass))
 
-#define NM_ROUTE_MANAGER_PLATFORM "platform"
+#define NM_ROUTE_MANAGER_LOG_WITH_PTR "log-with-ptr"
+#define NM_ROUTE_MANAGER_PLATFORM     "platform"
+
+#define NM_ROUTE_MANAGER_IP4_ROUTES_CHANGED "ip4-routes-changed"
 
 typedef struct _NMRouteManagerClass NMRouteManagerClass;
 
@@ -38,9 +41,9 @@ gboolean nm_route_manager_ip4_route_sync (NMRouteManager *self, int ifindex, con
 gboolean nm_route_manager_ip6_route_sync (NMRouteManager *self, int ifindex, const GArray *known_routes, gboolean ignore_kernel_routes, gboolean full_sync);
 gboolean nm_route_manager_route_flush (NMRouteManager *self, int ifindex);
 
+gboolean nm_route_manager_ip4_routes_shadowed (NMRouteManager *self, int ifindex);
 void nm_route_manager_ip4_route_register_device_route_purge_list (NMRouteManager *self, GArray *device_route_purge_list);
 
-NMRouteManager *nm_route_manager_get (void);
-NMRouteManager *nm_route_manager_new (NMPlatform *platform);
+NMRouteManager *nm_route_manager_new (gboolean log_with_ptr, NMPlatform *platform);
 
 #endif /* __NM_ROUTE_MANAGER_H__ */