Update upstream source from tag 'upstream/1.18.0'

Update to upstream version '1.18.0'
with Debian dir c79ce54aa2bd35bd9bd13eb01cf8687eaae2c0c1

1 files changed, 11 insertions, 9 deletions

diff --git a/src/nm-types.h b/src/nm-types.h
index b6b49028..03ee9929 100644
--- a/src/nm-types.h
+++ b/src/nm-types.h
@@ -119,15 +119,16 @@ NM_IS_IP_CONFIG_SOURCE_RTPROT (NMIPConfigSource source)
 }
 
 /* platform */
-typedef struct _NMPlatform           NMPlatform;
-typedef struct _NMPlatformObject     NMPlatformObject;
-typedef struct _NMPlatformIP4Address NMPlatformIP4Address;
-typedef struct _NMPlatformIP4Route   NMPlatformIP4Route;
-typedef struct _NMPlatformIP6Address NMPlatformIP6Address;
-typedef struct _NMPlatformIP6Route   NMPlatformIP6Route;
-typedef struct _NMPlatformLink       NMPlatformLink;
-typedef struct _NMPNetns             NMPNetns;
-typedef struct _NMPObject            NMPObject;
+typedef struct _NMPlatform               NMPlatform;
+typedef struct _NMPlatformObject         NMPlatformObject;
+typedef struct _NMPlatformObjWithIfindex NMPlatformObjWithIfindex;
+typedef struct _NMPlatformIP4Address     NMPlatformIP4Address;
+typedef struct _NMPlatformIP4Route       NMPlatformIP4Route;
+typedef struct _NMPlatformIP6Address     NMPlatformIP6Address;
+typedef struct _NMPlatformIP6Route       NMPlatformIP6Route;
+typedef struct _NMPlatformLink           NMPlatformLink;
+typedef struct _NMPNetns                 NMPNetns;
+typedef struct _NMPObject                NMPObject;
 
 typedef enum {
 	/* Please don't interpret type numbers outside nm-platform and use functions
@@ -192,6 +193,7 @@ typedef enum {
 	NMP_OBJECT_TYPE_IP6_ADDRESS,
 	NMP_OBJECT_TYPE_IP4_ROUTE,
 	NMP_OBJECT_TYPE_IP6_ROUTE,
+	NMP_OBJECT_TYPE_ROUTING_RULE,
 
 	NMP_OBJECT_TYPE_QDISC,