colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: move ObjectType to nmp-object.h

Browse Source
This commit is contained in:
Thomas Haller
2015-04-14 23:15:27 +02:00
parent 359fe9f8c1
commit d1e7554a90
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/platform/nm-linux-platform.c
View File

@@ -60,6 +60,7 @@
#include "nm-logging.h" #include "nm-logging.h"
#include "wifi/wifi-utils.h" #include "wifi/wifi-utils.h"
#include "wifi/wifi-utils-wext.h" #include "wifi/wifi-utils-wext.h"
#include "nmp-object.h"
/* This is only included for the translation of VLAN flags */ /* This is only included for the translation of VLAN flags */
#include "nm-setting-vlan.h" #include "nm-setting-vlan.h"
@@ -404,19 +405,6 @@ _support_kernel_extended_ifa_flags_get (void)
* NMPlatform types and functions * NMPlatform types and functions
******************************************************************/ ******************************************************************/
typedef enum {
OBJECT_TYPE_UNKNOWN,
OBJECT_TYPE_LINK,
OBJECT_TYPE_IP4_ADDRESS,
OBJECT_TYPE_IP6_ADDRESS,
OBJECT_TYPE_IP4_ROUTE,
OBJECT_TYPE_IP6_ROUTE,
__OBJECT_TYPE_LAST,
OBJECT_TYPE_MAX = __OBJECT_TYPE_LAST - 1,
} ObjectType;
/******************************************************************/
typedef struct { typedef struct {
struct nl_sock *nlh; struct nl_sock *nlh;
struct nl_sock *nlh_event; struct nl_sock *nlh_event;

10
src/platform/nmp-object.h
View File

@@ -25,5 +25,15 @@
#include "nm-platform.h" #include "nm-platform.h"
typedef enum { /*< skip >*/
OBJECT_TYPE_UNKNOWN,
OBJECT_TYPE_LINK,
OBJECT_TYPE_IP4_ADDRESS,
OBJECT_TYPE_IP6_ADDRESS,
OBJECT_TYPE_IP4_ROUTE,
OBJECT_TYPE_IP6_ROUTE,
__OBJECT_TYPE_LAST,
OBJECT_TYPE_MAX = __OBJECT_TYPE_LAST - 1,
} ObjectType;
#endif /* __NMP_OBJECT_H__ */ #endif /* __NMP_OBJECT_H__ */