fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 10:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: add generic opaque NMIPConfig type

Browse source 
One day, I hope to merge NMIP4Config and NMIP6Config implementations.
A small step, and a typesafe cast-macro.

(cherry picked from commit 10d38a950d)
This commit is contained in:
Thomas Haller 2017-11-08 14:27:16 +01:00
parent dd4e8ef9dc
commit a80b8a696e
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/nm-ip4-config.h
View file

@ -267,4 +267,37 @@ gboolean nm_ip4_config_nmpobj_remove (NMIP4Config *self,
void nm_ip4_config_hash (const NMIP4Config *self, GChecksum *sum, gboolean dns_only);
gboolean nm_ip4_config_equal (const NMIP4Config *a, const NMIP4Config *b);
/*****************************************************************************/
#include "nm-ip6-config.h"
#if _NM_CC_SUPPORT_GENERIC
#define NM_IP_CONFIG_CAST(config) \
({ \
const void *const _config = (config); \
\
nm_assert (_Generic ((config), \
const void *: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
void *: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
const NMIPConfig *: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
NMIPConfig *: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
const NMIP4Config *: (NM_IS_IP4_CONFIG (_config)), \
NMIP4Config *: (NM_IS_IP4_CONFIG (_config)), \
const NMIP6Config *: (NM_IS_IP6_CONFIG (_config)), \
NMIP6Config *: (NM_IS_IP6_CONFIG (_config)))); \
\
_Generic ((config), \
const void *: ((const NMIPConfig *) _config), \
void *: (( NMIPConfig *) _config), \
const NMIPConfig *: ((const NMIPConfig *) _config), \
NMIPConfig *: (( NMIPConfig *) _config), \
const NMIP4Config *: ((const NMIPConfig *) _config), \
NMIP4Config *: (( NMIPConfig *) _config), \
const NMIP6Config *: ((const NMIPConfig *) _config), \
NMIP6Config *: (( NMIPConfig *) _config)); \
})
#else
#define NM_IP_CONFIG_CAST(config) ((NMIPConfig *) (config))
#endif
#endif /* __NETWORKMANAGER_IP4_CONFIG_H__ */

1
src/nm-types.h
View file

@ -42,6 +42,7 @@ typedef struct _NMDevice NMDevice;
typedef struct _NMDhcp4Config NMDhcp4Config;
typedef struct _NMDhcp6Config NMDhcp6Config;
typedef struct _NMProxyConfig NMProxyConfig;
typedef struct _NMIPConfig NMIPConfig;
typedef struct _NMIP4Config NMIP4Config;
typedef struct _NMIP6Config NMIP6Config;
typedef struct _NMManager NMManager;