mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 20:45:32 +00:00
clang-format: use "IndentPPDirectives:None" instead of "BeforeHash"
Subjectively, I think this looks better.
This commit is contained in:
parent
dedd228667
commit
4e109bacab
|
@ -44,7 +44,7 @@ BreakStringLiterals: true
|
||||||
IncludeBlocks: Preserve
|
IncludeBlocks: Preserve
|
||||||
IndentCaseLabels: false
|
IndentCaseLabels: false
|
||||||
IndentGotoLabels: false
|
IndentGotoLabels: false
|
||||||
IndentPPDirectives: BeforeHash
|
IndentPPDirectives: None
|
||||||
IndentWrappedFunctionNames: false
|
IndentWrappedFunctionNames: false
|
||||||
KeepEmptyLinesAtTheStartOfBlocks: false
|
KeepEmptyLinesAtTheStartOfBlocks: false
|
||||||
MaxEmptyLinesToKeep: 1
|
MaxEmptyLinesToKeep: 1
|
||||||
|
|
|
@ -15,23 +15,23 @@ const char **_nm_setting_vpn_get_data_keys(NMSettingVpn *setting, guint *out_len
|
||||||
const char **_nm_setting_vpn_get_secret_keys(NMSettingVpn *setting, guint *out_length);
|
const char **_nm_setting_vpn_get_secret_keys(NMSettingVpn *setting, guint *out_length);
|
||||||
|
|
||||||
#if NM_CHECK_VERSION(1, 11, 0)
|
#if NM_CHECK_VERSION(1, 11, 0)
|
||||||
#define nm_setting_vpn_get_data_keys(setting, out_length) \
|
#define nm_setting_vpn_get_data_keys(setting, out_length) \
|
||||||
({ \
|
({ \
|
||||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
||||||
nm_setting_vpn_get_data_keys(setting, out_length); \
|
nm_setting_vpn_get_data_keys(setting, out_length); \
|
||||||
G_GNUC_END_IGNORE_DEPRECATIONS \
|
G_GNUC_END_IGNORE_DEPRECATIONS \
|
||||||
})
|
})
|
||||||
#define nm_setting_vpn_get_secret_keys(setting, out_length) \
|
#define nm_setting_vpn_get_secret_keys(setting, out_length) \
|
||||||
({ \
|
({ \
|
||||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
|
||||||
nm_setting_vpn_get_secret_keys(setting, out_length); \
|
nm_setting_vpn_get_secret_keys(setting, out_length); \
|
||||||
G_GNUC_END_IGNORE_DEPRECATIONS \
|
G_GNUC_END_IGNORE_DEPRECATIONS \
|
||||||
})
|
})
|
||||||
#else
|
#else
|
||||||
#define nm_setting_vpn_get_data_keys(setting, out_length) \
|
#define nm_setting_vpn_get_data_keys(setting, out_length) \
|
||||||
_nm_setting_vpn_get_data_keys(setting, out_length)
|
_nm_setting_vpn_get_data_keys(setting, out_length)
|
||||||
#define nm_setting_vpn_get_secret_keys(setting, out_length) \
|
#define nm_setting_vpn_get_secret_keys(setting, out_length) \
|
||||||
_nm_setting_vpn_get_secret_keys(setting, out_length)
|
_nm_setting_vpn_get_secret_keys(setting, out_length)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -39,15 +39,15 @@ const char **_nm_setting_vpn_get_secret_keys(NMSettingVpn *setting, guint *out_l
|
||||||
/* possibly missing defines from newer libnm API. */
|
/* possibly missing defines from newer libnm API. */
|
||||||
|
|
||||||
#ifndef NM_VPN_PLUGIN_CONFIG_PROXY_PAC
|
#ifndef NM_VPN_PLUGIN_CONFIG_PROXY_PAC
|
||||||
#define NM_VPN_PLUGIN_CONFIG_PROXY_PAC "pac"
|
#define NM_VPN_PLUGIN_CONFIG_PROXY_PAC "pac"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES
|
#ifndef NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES
|
||||||
#define NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES "preserve-routes"
|
#define NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES "preserve-routes"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES
|
#ifndef NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES
|
||||||
#define NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES "preserve-routes"
|
#define NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES "preserve-routes"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -31,9 +31,9 @@
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#if WITH_BLUEZ5_DUN
|
#if WITH_BLUEZ5_DUN
|
||||||
#define _NM_BT_CAPABILITY_SUPPORTED_DUN NM_BT_CAPABILITY_DUN
|
#define _NM_BT_CAPABILITY_SUPPORTED_DUN NM_BT_CAPABILITY_DUN
|
||||||
#else
|
#else
|
||||||
#define _NM_BT_CAPABILITY_SUPPORTED_DUN NM_BT_CAPABILITY_NONE
|
#define _NM_BT_CAPABILITY_SUPPORTED_DUN NM_BT_CAPABILITY_NONE
|
||||||
#endif
|
#endif
|
||||||
#define _NM_BT_CAPABILITY_SUPPORTED (NM_BT_CAPABILITY_NAP | _NM_BT_CAPABILITY_SUPPORTED_DUN)
|
#define _NM_BT_CAPABILITY_SUPPORTED (NM_BT_CAPABILITY_NAP | _NM_BT_CAPABILITY_SUPPORTED_DUN)
|
||||||
|
|
||||||
|
|
|
@ -9,15 +9,13 @@
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
||||||
#if !_NM_CC_SUPPORT_GENERIC
|
#if !_NM_CC_SUPPORT_GENERIC
|
||||||
#define _NM_DEVICE_CAST(self) ((NMDevice *) (self))
|
#define _NM_DEVICE_CAST(self) ((NMDevice *) (self))
|
||||||
#elif !defined(_NMLOG_DEVICE_TYPE)
|
#elif !defined(_NMLOG_DEVICE_TYPE)
|
||||||
#define _NM_DEVICE_CAST(self) \
|
#define _NM_DEVICE_CAST(self) \
|
||||||
_Generic((self), NMDevice * \
|
_Generic((self), NMDevice * : ((NMDevice *) (self)), NMDevice *const : ((NMDevice *) (self)))
|
||||||
: ((NMDevice *) (self)), NMDevice *const \
|
|
||||||
: ((NMDevice *) (self)))
|
|
||||||
#else
|
#else
|
||||||
#define _NM_DEVICE_CAST(self) \
|
#define _NM_DEVICE_CAST(self) \
|
||||||
_Generic((self), \
|
_Generic((self), \
|
||||||
_NMLOG_DEVICE_TYPE * : ((NMDevice *) (self)), \
|
_NMLOG_DEVICE_TYPE * : ((NMDevice *) (self)), \
|
||||||
_NMLOG_DEVICE_TYPE * const: ((NMDevice *) (self)), \
|
_NMLOG_DEVICE_TYPE * const: ((NMDevice *) (self)), \
|
||||||
NMDevice * : ((NMDevice *) (self)), \
|
NMDevice * : ((NMDevice *) (self)), \
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#if JANSSON_VERSION_HEX < 0x020400
|
#if JANSSON_VERSION_HEX < 0x020400
|
||||||
#warning "requires at least libjansson 2.4"
|
#warning "requires at least libjansson 2.4"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include "nm-dbus-manager.h"
|
#include "nm-dbus-manager.h"
|
||||||
|
|
||||||
#if WITH_IWD
|
#if WITH_IWD
|
||||||
#include "nm-device-iwd.h"
|
#include "nm-device-iwd.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
#include <libmm-glib.h>
|
#include <libmm-glib.h>
|
||||||
|
|
||||||
#if HAVE_LIBSYSTEMD
|
#if HAVE_LIBSYSTEMD
|
||||||
#include <systemd/sd-daemon.h>
|
#include <systemd/sd-daemon.h>
|
||||||
#else
|
#else
|
||||||
#define sd_booted() FALSE
|
#define sd_booted() FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libnm-std-aux/nm-dbus-compat.h"
|
#include "libnm-std-aux/nm-dbus-compat.h"
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
#include "nm-modem-broadband.h"
|
#include "nm-modem-broadband.h"
|
||||||
|
|
||||||
#if WITH_OFONO
|
#if WITH_OFONO
|
||||||
#include "nm-modem-ofono.h"
|
#include "nm-modem-ofono.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define MODEM_POKE_INTERVAL 120
|
#define MODEM_POKE_INTERVAL 120
|
||||||
|
|
|
@ -14,21 +14,21 @@
|
||||||
|
|
||||||
#if WITH_DHCLIENT
|
#if WITH_DHCLIENT
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||||
|
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
#include "nm-dhcp-dhclient-utils.h"
|
#include "nm-dhcp-dhclient-utils.h"
|
||||||
#include "nm-dhcp-manager.h"
|
#include "nm-dhcp-manager.h"
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-dhcp-listener.h"
|
#include "nm-dhcp-listener.h"
|
||||||
#include "nm-dhcp-client-logging.h"
|
#include "nm-dhcp-client-logging.h"
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
@ -41,16 +41,15 @@ _addr_family_to_path_part(int addr_family)
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define NM_TYPE_DHCP_DHCLIENT (nm_dhcp_dhclient_get_type())
|
#define NM_TYPE_DHCP_DHCLIENT (nm_dhcp_dhclient_get_type())
|
||||||
#define NM_DHCP_DHCLIENT(obj) \
|
#define NM_DHCP_DHCLIENT(obj) \
|
||||||
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclient))
|
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclient))
|
||||||
#define NM_DHCP_DHCLIENT_CLASS(klass) \
|
#define NM_DHCP_DHCLIENT_CLASS(klass) \
|
||||||
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
|
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
|
||||||
#define NM_IS_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCLIENT))
|
#define NM_IS_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCLIENT))
|
||||||
#define NM_IS_DHCP_DHCLIENT_CLASS(klass) \
|
#define NM_IS_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCLIENT))
|
||||||
(G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCLIENT))
|
#define NM_DHCP_DHCLIENT_GET_CLASS(obj) \
|
||||||
#define NM_DHCP_DHCLIENT_GET_CLASS(obj) \
|
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
|
||||||
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
|
|
||||||
|
|
||||||
typedef struct _NMDhcpDhclient NMDhcpDhclient;
|
typedef struct _NMDhcpDhclient NMDhcpDhclient;
|
||||||
typedef struct _NMDhcpDhclientClass NMDhcpDhclientClass;
|
typedef struct _NMDhcpDhclientClass NMDhcpDhclientClass;
|
||||||
|
@ -78,8 +77,8 @@ struct _NMDhcpDhclientClass {
|
||||||
|
|
||||||
G_DEFINE_TYPE(NMDhcpDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT)
|
G_DEFINE_TYPE(NMDhcpDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT)
|
||||||
|
|
||||||
#define NM_DHCP_DHCLIENT_GET_PRIVATE(self) \
|
#define NM_DHCP_DHCLIENT_GET_PRIVATE(self) \
|
||||||
_NM_GET_PRIVATE(self, NMDhcpDhclient, NM_IS_DHCP_DHCLIENT)
|
_NM_GET_PRIVATE(self, NMDhcpDhclient, NM_IS_DHCP_DHCLIENT)
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -7,25 +7,24 @@
|
||||||
|
|
||||||
#if WITH_DHCPCANON
|
#if WITH_DHCPCANON
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
#include "nm-dhcp-manager.h"
|
#include "nm-dhcp-manager.h"
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-dhcp-listener.h"
|
#include "nm-dhcp-listener.h"
|
||||||
#include "nm-dhcp-client-logging.h"
|
#include "nm-dhcp-client-logging.h"
|
||||||
|
|
||||||
#define NM_TYPE_DHCP_DHCPCANON (nm_dhcp_dhcpcanon_get_type())
|
#define NM_TYPE_DHCP_DHCPCANON (nm_dhcp_dhcpcanon_get_type())
|
||||||
#define NM_DHCP_DHCPCANON(obj) \
|
#define NM_DHCP_DHCPCANON(obj) \
|
||||||
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanon))
|
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanon))
|
||||||
#define NM_DHCP_DHCPCANON_CLASS(klass) \
|
#define NM_DHCP_DHCPCANON_CLASS(klass) \
|
||||||
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
|
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
|
||||||
#define NM_IS_DHCP_DHCPCANON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCANON))
|
#define NM_IS_DHCP_DHCPCANON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCANON))
|
||||||
#define NM_IS_DHCP_DHCPCANON_CLASS(klass) \
|
#define NM_IS_DHCP_DHCPCANON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCANON))
|
||||||
(G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCANON))
|
#define NM_DHCP_DHCPCANON_GET_CLASS(obj) \
|
||||||
#define NM_DHCP_DHCPCANON_GET_CLASS(obj) \
|
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
|
||||||
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCANON, NMDhcpDhcpcanonClass))
|
|
||||||
|
|
||||||
typedef struct _NMDhcpDhcpcanon NMDhcpDhcpcanon;
|
typedef struct _NMDhcpDhcpcanon NMDhcpDhcpcanon;
|
||||||
typedef struct _NMDhcpDhcpcanonClass NMDhcpDhcpcanonClass;
|
typedef struct _NMDhcpDhcpcanonClass NMDhcpDhcpcanonClass;
|
||||||
|
@ -53,8 +52,8 @@ struct _NMDhcpDhcpcanonClass {
|
||||||
|
|
||||||
G_DEFINE_TYPE(NMDhcpDhcpcanon, nm_dhcp_dhcpcanon, NM_TYPE_DHCP_CLIENT)
|
G_DEFINE_TYPE(NMDhcpDhcpcanon, nm_dhcp_dhcpcanon, NM_TYPE_DHCP_CLIENT)
|
||||||
|
|
||||||
#define NM_DHCP_DHCPCANON_GET_PRIVATE(self) \
|
#define NM_DHCP_DHCPCANON_GET_PRIVATE(self) \
|
||||||
_NM_GET_PRIVATE(self, NMDhcpDhcpcanon, NM_IS_DHCP_DHCPCANON)
|
_NM_GET_PRIVATE(self, NMDhcpDhcpcanon, NM_IS_DHCP_DHCPCANON)
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -8,29 +8,28 @@
|
||||||
|
|
||||||
#if WITH_DHCPCD
|
#if WITH_DHCPCD
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include "nm-dhcp-manager.h"
|
#include "nm-dhcp-manager.h"
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-dhcp-listener.h"
|
#include "nm-dhcp-listener.h"
|
||||||
#include "nm-dhcp-client-logging.h"
|
#include "nm-dhcp-client-logging.h"
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define NM_TYPE_DHCP_DHCPCD (nm_dhcp_dhcpcd_get_type())
|
#define NM_TYPE_DHCP_DHCPCD (nm_dhcp_dhcpcd_get_type())
|
||||||
#define NM_DHCP_DHCPCD(obj) \
|
#define NM_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd))
|
||||||
(G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd))
|
#define NM_DHCP_DHCPCD_CLASS(klass) \
|
||||||
#define NM_DHCP_DHCPCD_CLASS(klass) \
|
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
|
||||||
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
|
#define NM_IS_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCD))
|
||||||
#define NM_IS_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCPCD))
|
#define NM_IS_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCD))
|
||||||
#define NM_IS_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCPCD))
|
#define NM_DHCP_DHCPCD_GET_CLASS(obj) \
|
||||||
#define NM_DHCP_DHCPCD_GET_CLASS(obj) \
|
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
|
||||||
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
|
|
||||||
|
|
||||||
typedef struct _NMDhcpDhcpcd NMDhcpDhcpcd;
|
typedef struct _NMDhcpDhcpcd NMDhcpDhcpcd;
|
||||||
typedef struct _NMDhcpDhcpcdClass NMDhcpDhcpcdClass;
|
typedef struct _NMDhcpDhcpcdClass NMDhcpDhcpcdClass;
|
||||||
|
@ -54,7 +53,7 @@ struct _NMDhcpDhcpcdClass {
|
||||||
|
|
||||||
G_DEFINE_TYPE(NMDhcpDhcpcd, nm_dhcp_dhcpcd, NM_TYPE_DHCP_CLIENT)
|
G_DEFINE_TYPE(NMDhcpDhcpcd, nm_dhcp_dhcpcd, NM_TYPE_DHCP_CLIENT)
|
||||||
|
|
||||||
#define NM_DHCP_DHCPCD_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDhcpDhcpcd, NM_IS_DHCP_DHCPCD)
|
#define NM_DHCP_DHCPCD_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDhcpDhcpcd, NM_IS_DHCP_DHCPCD)
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#if NM_MORE_LOGGING
|
#if NM_MORE_LOGGING
|
||||||
#define _NMLOG_ENABLED(level) TRUE
|
#define _NMLOG_ENABLED(level) TRUE
|
||||||
#else
|
#else
|
||||||
#define _NMLOG_ENABLED(level) ((level) <= LOG_ERR)
|
#define _NMLOG_ENABLED(level) ((level) <= LOG_ERR)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define _NMLOG(always_enabled, level, ...) \
|
#define _NMLOG(always_enabled, level, ...) \
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
|
|
||||||
#if WITH_LIBPSL
|
#if WITH_LIBPSL
|
||||||
#include <libpsl.h>
|
#include <libpsl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libnm-glib-aux/nm-str-buf.h"
|
#include "libnm-glib-aux/nm-str-buf.h"
|
||||||
|
@ -42,17 +42,17 @@
|
||||||
#define HASH_LEN NM_UTILS_CHECKSUM_LENGTH_SHA1
|
#define HASH_LEN NM_UTILS_CHECKSUM_LENGTH_SHA1
|
||||||
|
|
||||||
#ifndef RESOLVCONF_PATH
|
#ifndef RESOLVCONF_PATH
|
||||||
#define RESOLVCONF_PATH "/sbin/resolvconf"
|
#define RESOLVCONF_PATH "/sbin/resolvconf"
|
||||||
#define HAS_RESOLVCONF 0
|
#define HAS_RESOLVCONF 0
|
||||||
#else
|
#else
|
||||||
#define HAS_RESOLVCONF 1
|
#define HAS_RESOLVCONF 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef NETCONFIG_PATH
|
#ifndef NETCONFIG_PATH
|
||||||
#define NETCONFIG_PATH "/sbin/netconfig"
|
#define NETCONFIG_PATH "/sbin/netconfig"
|
||||||
#define HAS_NETCONFIG 0
|
#define HAS_NETCONFIG 0
|
||||||
#else
|
#else
|
||||||
#define HAS_NETCONFIG 1
|
#define HAS_NETCONFIG 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
#include "nm-netns.h"
|
#include "nm-netns.h"
|
||||||
|
|
||||||
#if !defined(NM_DIST_VERSION)
|
#if !defined(NM_DIST_VERSION)
|
||||||
#define NM_DIST_VERSION VERSION
|
#define NM_DIST_VERSION VERSION
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NM_DEFAULT_PID_FILE NMRUNDIR "/NetworkManager.pid"
|
#define NM_DEFAULT_PID_FILE NMRUNDIR "/NetworkManager.pid"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include "nm-audit-manager.h"
|
#include "nm-audit-manager.h"
|
||||||
|
|
||||||
#if HAVE_LIBAUDIT
|
#if HAVE_LIBAUDIT
|
||||||
#include <libaudit.h>
|
#include <libaudit.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NM_VALUE_TYPE_DEFINE_FUNCTIONS
|
#define NM_VALUE_TYPE_DEFINE_FUNCTIONS
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "nm-connectivity.h"
|
#include "nm-connectivity.h"
|
||||||
|
|
||||||
#if WITH_CONCHECK
|
#if WITH_CONCHECK
|
||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
#endif
|
#endif
|
||||||
#include <linux/rtnetlink.h>
|
#include <linux/rtnetlink.h>
|
||||||
|
|
||||||
|
|
|
@ -39,8 +39,8 @@
|
||||||
#include "nm-setting-wireless-security.h"
|
#include "nm-setting-wireless-security.h"
|
||||||
|
|
||||||
#ifdef __NM_SD_UTILS_H__
|
#ifdef __NM_SD_UTILS_H__
|
||||||
#error \
|
#error \
|
||||||
"nm-core-utils.c should stay independent of systemd utils. Are you looking for NetworkMangerUtils.c? "
|
"nm-core-utils.c should stay independent of systemd utils. Are you looking for NetworkMangerUtils.c? "
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
G_STATIC_ASSERT(sizeof(NMUtilsTestFlags) <= sizeof(int));
|
G_STATIC_ASSERT(sizeof(NMUtilsTestFlags) <= sizeof(int));
|
||||||
|
|
|
@ -40,7 +40,7 @@ void _nm_singleton_instance_register_destruction(GObject *instance);
|
||||||
/* By default, the getter will assert that the singleton will be created only once. You can
|
/* By default, the getter will assert that the singleton will be created only once. You can
|
||||||
* change this by redefining NM_DEFINE_SINGLETON_ALLOW_MULTIPLE. */
|
* change this by redefining NM_DEFINE_SINGLETON_ALLOW_MULTIPLE. */
|
||||||
#ifndef NM_DEFINE_SINGLETON_ALLOW_MULTIPLE
|
#ifndef NM_DEFINE_SINGLETON_ALLOW_MULTIPLE
|
||||||
#define NM_DEFINE_SINGLETON_ALLOW_MULTIPLE FALSE
|
#define NM_DEFINE_SINGLETON_ALLOW_MULTIPLE FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NM_DEFINE_SINGLETON_GETTER(TYPE, GETTER, GTYPE, ...) \
|
#define NM_DEFINE_SINGLETON_GETTER(TYPE, GETTER, GTYPE, ...) \
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#if HAVE_SELINUX
|
#if HAVE_SELINUX
|
||||||
#include <selinux/selinux.h>
|
#include <selinux/selinux.h>
|
||||||
#include <selinux/label.h>
|
#include <selinux/label.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||||
|
@ -37,17 +37,17 @@
|
||||||
#if (defined(HOSTNAME_PERSIST_SUSE) + defined(HOSTNAME_PERSIST_SLACKWARE) \
|
#if (defined(HOSTNAME_PERSIST_SUSE) + defined(HOSTNAME_PERSIST_SLACKWARE) \
|
||||||
+ defined(HOSTNAME_PERSIST_GENTOO)) \
|
+ defined(HOSTNAME_PERSIST_GENTOO)) \
|
||||||
> 1
|
> 1
|
||||||
#error "Can only define one of HOSTNAME_PERSIST_*"
|
#error "Can only define one of HOSTNAME_PERSIST_*"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(HOSTNAME_PERSIST_SUSE)
|
#if defined(HOSTNAME_PERSIST_SUSE)
|
||||||
#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME
|
#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME
|
||||||
#elif defined(HOSTNAME_PERSIST_SLACKWARE)
|
#elif defined(HOSTNAME_PERSIST_SLACKWARE)
|
||||||
#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME
|
#define HOSTNAME_FILE HOSTNAME_FILE_UCASE_HOSTNAME
|
||||||
#elif defined(HOSTNAME_PERSIST_GENTOO)
|
#elif defined(HOSTNAME_PERSIST_GENTOO)
|
||||||
#define HOSTNAME_FILE HOSTNAME_FILE_GENTOO
|
#define HOSTNAME_FILE HOSTNAME_FILE_GENTOO
|
||||||
#else
|
#else
|
||||||
#define HOSTNAME_FILE HOSTNAME_FILE_DEFAULT
|
#define HOSTNAME_FILE HOSTNAME_FILE_DEFAULT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include "libnm-systemd-core/nm-sd.h"
|
#include "libnm-systemd-core/nm-sd.h"
|
||||||
|
|
||||||
#if !defined(NM_DIST_VERSION)
|
#if !defined(NM_DIST_VERSION)
|
||||||
#define NM_DIST_VERSION VERSION
|
#define NM_DIST_VERSION VERSION
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NMIH_PID_FILE_FMT NMRUNDIR "/nm-iface-helper-%d.pid"
|
#define NMIH_PID_FILE_FMT NMRUNDIR "/nm-iface-helper-%d.pid"
|
||||||
|
|
|
@ -275,7 +275,7 @@ NM_IS_IP_CONFIG_ADDR_FAMILY(gconstpointer config, int addr_family)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if _NM_CC_SUPPORT_GENERIC
|
#if _NM_CC_SUPPORT_GENERIC
|
||||||
/* _NM_IS_IP_CONFIG() is a bit unusual. If _Generic() is supported,
|
/* _NM_IS_IP_CONFIG() is a bit unusual. If _Generic() is supported,
|
||||||
* it checks whether @config is either NM_IS_IP4_CONFIG() or NM_IS_IP6_CONFIG(),
|
* it checks whether @config is either NM_IS_IP4_CONFIG() or NM_IS_IP6_CONFIG(),
|
||||||
* depending on the pointer type of @config.
|
* depending on the pointer type of @config.
|
||||||
*
|
*
|
||||||
|
@ -286,10 +286,10 @@ NM_IS_IP_CONFIG_ADDR_FAMILY(gconstpointer config, int addr_family)
|
||||||
* NMIP4Config *ptr = nm_ip4_config_new(...);
|
* NMIP4Config *ptr = nm_ip4_config_new(...);
|
||||||
* g_assert (_NM_IS_IP_CONFIG (ptr, ptr));
|
* g_assert (_NM_IS_IP_CONFIG (ptr, ptr));
|
||||||
*/
|
*/
|
||||||
#define _NM_IS_IP_CONFIG(typeexpr, config) \
|
#define _NM_IS_IP_CONFIG(typeexpr, config) \
|
||||||
({ \
|
({ \
|
||||||
const void *const _config = (config); \
|
const void *const _config = (config); \
|
||||||
_Generic ((typeexpr), \
|
_Generic ((typeexpr), \
|
||||||
const void *const: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
|
const void *const: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
|
||||||
const void * : (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
|
const void * : (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
|
||||||
void *const: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
|
void *const: (NM_IS_IP4_CONFIG (_config) || NM_IS_IP6_CONFIG (_config)), \
|
||||||
|
@ -306,9 +306,9 @@ NM_IS_IP_CONFIG_ADDR_FAMILY(gconstpointer config, int addr_family)
|
||||||
const NMIP6Config * : (NM_IS_IP6_CONFIG (_config)), \
|
const NMIP6Config * : (NM_IS_IP6_CONFIG (_config)), \
|
||||||
NMIP6Config *const: (NM_IS_IP6_CONFIG (_config)), \
|
NMIP6Config *const: (NM_IS_IP6_CONFIG (_config)), \
|
||||||
NMIP6Config * : (NM_IS_IP6_CONFIG (_config))); \
|
NMIP6Config * : (NM_IS_IP6_CONFIG (_config))); \
|
||||||
})
|
})
|
||||||
#else
|
#else
|
||||||
#define _NM_IS_IP_CONFIG(typeexpr, config) NM_IS_IP_CONFIG(config)
|
#define _NM_IS_IP_CONFIG(typeexpr, config) NM_IS_IP_CONFIG(config)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NM_IP_CONFIG_CAST(config) \
|
#define NM_IP_CONFIG_CAST(config) \
|
||||||
|
|
|
@ -14,17 +14,17 @@
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#if SESSION_TRACKING_SYSTEMD && SESSION_TRACKING_ELOGIND
|
#if SESSION_TRACKING_SYSTEMD && SESSION_TRACKING_ELOGIND
|
||||||
#error Cannot build both systemd-logind and elogind support
|
#error Cannot build both systemd-logind and elogind support
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if SESSION_TRACKING_SYSTEMD
|
#if SESSION_TRACKING_SYSTEMD
|
||||||
#include <systemd/sd-login.h>
|
#include <systemd/sd-login.h>
|
||||||
#define LOGIND_NAME "systemd-logind"
|
#define LOGIND_NAME "systemd-logind"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if SESSION_TRACKING_ELOGIND
|
#if SESSION_TRACKING_ELOGIND
|
||||||
#include <elogind/sd-login.h>
|
#include <elogind/sd-login.h>
|
||||||
#define LOGIND_NAME "elogind"
|
#define LOGIND_NAME "elogind"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
|
|
|
@ -16,23 +16,23 @@
|
||||||
|
|
||||||
#if defined(SUSPEND_RESUME_UPOWER)
|
#if defined(SUSPEND_RESUME_UPOWER)
|
||||||
|
|
||||||
#define SUSPEND_DBUS_NAME "org.freedesktop.UPower"
|
#define SUSPEND_DBUS_NAME "org.freedesktop.UPower"
|
||||||
#define SUSPEND_DBUS_PATH "/org/freedesktop/UPower"
|
#define SUSPEND_DBUS_PATH "/org/freedesktop/UPower"
|
||||||
#define SUSPEND_DBUS_INTERFACE "org.freedesktop.UPower"
|
#define SUSPEND_DBUS_INTERFACE "org.freedesktop.UPower"
|
||||||
#define USE_UPOWER 1
|
#define USE_UPOWER 1
|
||||||
#define _NMLOG_PREFIX_NAME "sleep-monitor-up"
|
#define _NMLOG_PREFIX_NAME "sleep-monitor-up"
|
||||||
|
|
||||||
#elif defined(SUSPEND_RESUME_SYSTEMD) || defined(SUSPEND_RESUME_ELOGIND)
|
#elif defined(SUSPEND_RESUME_SYSTEMD) || defined(SUSPEND_RESUME_ELOGIND)
|
||||||
|
|
||||||
#define SUSPEND_DBUS_NAME "org.freedesktop.login1"
|
#define SUSPEND_DBUS_NAME "org.freedesktop.login1"
|
||||||
#define SUSPEND_DBUS_PATH "/org/freedesktop/login1"
|
#define SUSPEND_DBUS_PATH "/org/freedesktop/login1"
|
||||||
#define SUSPEND_DBUS_INTERFACE "org.freedesktop.login1.Manager"
|
#define SUSPEND_DBUS_INTERFACE "org.freedesktop.login1.Manager"
|
||||||
#define USE_UPOWER 0
|
#define USE_UPOWER 0
|
||||||
#if defined(SUSPEND_RESUME_SYSTEMD)
|
#if defined(SUSPEND_RESUME_SYSTEMD)
|
||||||
#define _NMLOG_PREFIX_NAME "sleep-monitor-sd"
|
#define _NMLOG_PREFIX_NAME "sleep-monitor-sd"
|
||||||
#else
|
#else
|
||||||
#define _NMLOG_PREFIX_NAME "sleep-monitor-el"
|
#define _NMLOG_PREFIX_NAME "sleep-monitor-el"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif defined(SUSPEND_RESUME_CONSOLEKIT)
|
#elif defined(SUSPEND_RESUME_CONSOLEKIT)
|
||||||
|
|
||||||
|
@ -40,15 +40,15 @@
|
||||||
* uses. http://consolekit2.github.io/ConsoleKit2/#Manager.Inhibit
|
* uses. http://consolekit2.github.io/ConsoleKit2/#Manager.Inhibit
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define SUSPEND_DBUS_NAME "org.freedesktop.ConsoleKit"
|
#define SUSPEND_DBUS_NAME "org.freedesktop.ConsoleKit"
|
||||||
#define SUSPEND_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager"
|
#define SUSPEND_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager"
|
||||||
#define SUSPEND_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager"
|
#define SUSPEND_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager"
|
||||||
#define USE_UPOWER 0
|
#define USE_UPOWER 0
|
||||||
#define _NMLOG_PREFIX_NAME "sleep-monitor-ck"
|
#define _NMLOG_PREFIX_NAME "sleep-monitor-ck"
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#error define one of SUSPEND_RESUME_SYSTEMD, SUSPEND_RESUME_ELOGIND, SUSPEND_RESUME_CONSOLEKIT, or SUSPEND_RESUME_UPOWER
|
#error define one of SUSPEND_RESUME_SYSTEMD, SUSPEND_RESUME_ELOGIND, SUSPEND_RESUME_CONSOLEKIT, or SUSPEND_RESUME_UPOWER
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -222,7 +222,7 @@ nmtst_platform_ip4_routes_equal(const NMPlatformIP4Route *a,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __NMP_OBJECT_H__
|
#ifdef __NMP_OBJECT_H__
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
nmtst_platform_ip4_routes_equal_aptr(const NMPObject *const * a,
|
nmtst_platform_ip4_routes_equal_aptr(const NMPObject *const * a,
|
||||||
|
@ -242,7 +242,7 @@ nmtst_platform_ip4_routes_equal_aptr(const NMPObject *const * a,
|
||||||
nmtst_platform_ip4_routes_equal(c_a, b, len, ignore_order);
|
nmtst_platform_ip4_routes_equal(c_a, b, len, ignore_order);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
_nmtst_platform_ip6_routes_equal_sort(gconstpointer a, gconstpointer b, gpointer user_data)
|
_nmtst_platform_ip6_routes_equal_sort(gconstpointer a, gconstpointer b, gpointer user_data)
|
||||||
|
@ -291,7 +291,7 @@ nmtst_platform_ip6_routes_equal(const NMPlatformIP6Route *a,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __NMP_OBJECT_H__
|
#ifdef __NMP_OBJECT_H__
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
nmtst_platform_ip6_routes_equal_aptr(const NMPObject *const * a,
|
nmtst_platform_ip6_routes_equal_aptr(const NMPObject *const * a,
|
||||||
|
@ -311,13 +311,13 @@ nmtst_platform_ip6_routes_equal_aptr(const NMPObject *const * a,
|
||||||
nmtst_platform_ip6_routes_equal(c_a, b, len, ignore_order);
|
nmtst_platform_ip6_routes_equal(c_a, b, len, ignore_order);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __NETWORKMANAGER_IP4_CONFIG_H__
|
#ifdef __NETWORKMANAGER_IP4_CONFIG_H__
|
||||||
|
|
||||||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||||
|
|
||||||
static inline NMIP4Config *
|
static inline NMIP4Config *
|
||||||
nmtst_ip4_config_new(int ifindex)
|
nmtst_ip4_config_new(int ifindex)
|
||||||
|
@ -331,7 +331,7 @@ nmtst_ip4_config_new(int ifindex)
|
||||||
|
|
||||||
#ifdef __NETWORKMANAGER_IP6_CONFIG_H__
|
#ifdef __NETWORKMANAGER_IP6_CONFIG_H__
|
||||||
|
|
||||||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||||
|
|
||||||
static inline NMIP6Config *
|
static inline NMIP6Config *
|
||||||
nmtst_ip6_config_new(int ifindex)
|
nmtst_ip6_config_new(int ifindex)
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NETWORKMANAGER_TYPES_H__
|
#define __NETWORKMANAGER_TYPES_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_DAEMON)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_DAEMON)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* core */
|
/* core */
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <linux/ppp_defs.h>
|
#include <linux/ppp_defs.h>
|
||||||
#ifndef aligned_u64
|
#ifndef aligned_u64
|
||||||
#define aligned_u64 unsigned long long __attribute__((aligned(8)))
|
#define aligned_u64 unsigned long long __attribute__((aligned(8)))
|
||||||
#endif
|
#endif
|
||||||
#include <linux/if.h>
|
#include <linux/if.h>
|
||||||
#include <linux/if_ppp.h>
|
#include <linux/if_ppp.h>
|
||||||
|
@ -761,7 +761,7 @@ create_pppd_cmd_line(NMPPPManager * self,
|
||||||
g_return_val_if_fail(setting != NULL, NULL);
|
g_return_val_if_fail(setting != NULL, NULL);
|
||||||
|
|
||||||
#ifndef PPPD_PATH
|
#ifndef PPPD_PATH
|
||||||
#define PPPD_PATH NULL
|
#define PPPD_PATH NULL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
pppd_binary = nm_utils_find_helper("pppd", PPPD_PATH, err);
|
pppd_binary = nm_utils_find_helper("pppd", PPPD_PATH, err);
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
|
|
||||||
#if HAVE_SELINUX
|
#if HAVE_SELINUX
|
||||||
#include <selinux/selinux.h>
|
#include <selinux/selinux.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
#define NM_WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1"
|
#define NM_WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1"
|
||||||
|
|
||||||
#if HAVE_WEXT
|
#if HAVE_WEXT
|
||||||
#define NM_WPAS_DEFAULT_WIFI_DRIVER "nl80211,wext"
|
#define NM_WPAS_DEFAULT_WIFI_DRIVER "nl80211,wext"
|
||||||
#else
|
#else
|
||||||
#define NM_WPAS_DEFAULT_WIFI_DRIVER "nl80211"
|
#define NM_WPAS_DEFAULT_WIFI_DRIVER "nl80211"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NM_WPAS_DBUS_IFACE_INTERFACE NM_WPAS_DBUS_INTERFACE ".Interface"
|
#define NM_WPAS_DBUS_IFACE_INTERFACE NM_WPAS_DBUS_INTERFACE ".Interface"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DBUS_HELPERS_PRIVATE_H__
|
#define __NM_DBUS_HELPERS_PRIVATE_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libnm-std-aux/nm-dbus-compat.h"
|
#include "libnm-std-aux/nm-dbus-compat.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DHCP4_CONFIG_H__
|
#define __NM_DHCP4_CONFIG_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-dhcp-config.h"
|
#include "nm-dhcp-config.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DHCP6_CONFIG_H__
|
#define __NM_DHCP6_CONFIG_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-dhcp-config.h"
|
#include "nm-dhcp-config.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DNS_MANAGER_H__
|
#define __NM_DNS_MANAGER_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-client.h"
|
#include "nm-client.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_IP4_CONFIG_H__
|
#define __NM_IP4_CONFIG_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-ip-config.h"
|
#include "nm-ip-config.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_IP6_CONFIG_H__
|
#define __NM_IP6_CONFIG_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-ip-config.h"
|
#include "nm-ip-config.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_OBJECT_PRIVATE_H__
|
#define __NM_OBJECT_PRIVATE_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_REMOTE_CONNECTION_PRIVATE_H__
|
#define __NM_REMOTE_CONNECTION_PRIVATE_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NM_REMOTE_CONNECTION_INIT_RESULT "init-result"
|
#define NM_REMOTE_CONNECTION_INIT_RESULT "init-result"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "libnm-client-impl/nm-default-libnm.h"
|
#include "libnm-client-impl/nm-default-libnm.h"
|
||||||
|
|
||||||
#if defined(HAVE_DECL_MEMFD_CREATE) && HAVE_DECL_MEMFD_CREATE
|
#if defined(HAVE_DECL_MEMFD_CREATE) && HAVE_DECL_MEMFD_CREATE
|
||||||
#include <linux/memfd.h>
|
#include <linux/memfd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
|
|
@ -118,13 +118,13 @@
|
||||||
|
|
||||||
#if !defined(NETWORKMANAGER_COMPILATION) \
|
#if !defined(NETWORKMANAGER_COMPILATION) \
|
||||||
&& (!defined(NM_NO_INCLUDE_EXTRA_HEADERS) || !NM_NO_INCLUDE_EXTRA_HEADERS)
|
&& (!defined(NM_NO_INCLUDE_EXTRA_HEADERS) || !NM_NO_INCLUDE_EXTRA_HEADERS)
|
||||||
/* historically, NetworkManager.h drags in the following system headers.
|
/* historically, NetworkManager.h drags in the following system headers.
|
||||||
* These are not strictly necessary and the user may wish to opt out from
|
* These are not strictly necessary and the user may wish to opt out from
|
||||||
* including them. */
|
* including them. */
|
||||||
#include <linux/if_ether.h>
|
#include <linux/if_ether.h>
|
||||||
#include <linux/if_infiniband.h>
|
#include <linux/if_infiniband.h>
|
||||||
#include <linux/if_vlan.h>
|
#include <linux/if_vlan.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef __NETWORKMANAGER_H_INSIDE__
|
#undef __NETWORKMANAGER_H_INSIDE__
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_ACCESS_POINT_H__
|
#define __NM_ACCESS_POINT_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_ACTIVE_CONNECTION_H__
|
#define __NM_ACTIVE_CONNECTION_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_CHECKPOINT_H__
|
#define __NM_CHECKPOINT_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_CLIENT_H__
|
#define __NM_CLIENT_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-types.h"
|
#include "nm-types.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_6LOWPAN_H__
|
#define __NM_DEVICE_6LOWPAN_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_ADSL_H__
|
#define __NM_DEVICE_ADSL_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_BOND_H__
|
#define __NM_DEVICE_BOND_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_BRIDGE_H__
|
#define __NM_DEVICE_BRIDGE_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_DEVICE_BT_H__
|
#define __NM_DEVICE_BT_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_DUMMY_H__
|
#define __NM_DEVICE_DUMMY_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_DEVICE_ETHERNET_H__
|
#define __NM_DEVICE_ETHERNET_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_GENERIC_H__
|
#define __NM_DEVICE_GENERIC_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_INFINIBAND_H__
|
#define __NM_DEVICE_INFINIBAND_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_IP_TUNNEL_H__
|
#define __NM_DEVICE_IP_TUNNEL_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_MACSEC_H__
|
#define __NM_DEVICE_MACSEC_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_MACVLAN_H__
|
#define __NM_DEVICE_MACVLAN_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_DEVICE_MODEM_H__
|
#define __NM_DEVICE_MODEM_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_OLPC_MESH_H__
|
#define __NM_DEVICE_OLPC_MESH_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_OVS_BRIDGE_H__
|
#define __NM_DEVICE_OVS_BRIDGE_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_OVS_INTERFACE_H__
|
#define __NM_DEVICE_OVS_INTERFACE_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_OVS_PORT_H__
|
#define __NM_DEVICE_OVS_PORT_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_PPP_H__
|
#define __NM_DEVICE_PPP_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_TEAM_H__
|
#define __NM_DEVICE_TEAM_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_TUN_H__
|
#define __NM_DEVICE_TUN_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_VETH_H__
|
#define __NM_DEVICE_VETH_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_VLAN_H__
|
#define __NM_DEVICE_VLAN_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#define __NM_DEVICE_VRF_H__
|
#define __NM_DEVICE_VRF_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_VXLAN_H__
|
#define __NM_DEVICE_VXLAN_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_WIFI_P2P_H__
|
#define __NM_DEVICE_WIFI_P2P_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_DEVICE_WIFI_H__
|
#define __NM_DEVICE_WIFI_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_DEVICE_WIMAX_H__
|
#define __NM_DEVICE_WIMAX_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_WIREGUARD_H__
|
#define __NM_DEVICE_WIREGUARD_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_DEVICE_WPAN_H__
|
#define __NM_DEVICE_WPAN_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_DEVICE_H__
|
#define __NM_DEVICE_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_DHCP_CONFIG_H__
|
#define __NM_DHCP_CONFIG_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_IP_CONFIG_H__
|
#define __NM_IP_CONFIG_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_OBJECT_H__
|
#define __NM_OBJECT_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-types.h"
|
#include "nm-types.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_REMOTE_CONNECTION_H__
|
#define __NM_REMOTE_CONNECTION_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_VPN_CONNECTION_H__
|
#define __NM_VPN_CONNECTION_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-active-connection.h"
|
#include "nm-active-connection.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_VPN_EDITOR_H__
|
#define __NM_VPN_EDITOR_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_VPN_SERVICE_PLUGIN_H__
|
#define __NM_VPN_SERVICE_PLUGIN_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <gio/gio.h>
|
#include <gio/gio.h>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_WIFI_P2P_PEER_H__
|
#define __NM_WIFI_P2P_PEER_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_WIMAX_NSP_H__
|
#define __NM_WIMAX_NSP_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-object.h"
|
#include "nm-object.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_CONNECTION_PRIVATE_H__
|
#define __NM_CONNECTION_PRIVATE_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-setting.h"
|
#include "nm-setting.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include "nm-meta-setting-base.h"
|
#include "nm-meta-setting-base.h"
|
||||||
|
|
||||||
#if _NM_META_SETTING_BASE_IMPL_LIBNM
|
#if _NM_META_SETTING_BASE_IMPL_LIBNM
|
||||||
#include "libnm-core-impl/nm-default-libnm-core.h"
|
#include "libnm-core-impl/nm-default-libnm-core.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-setting-6lowpan.h"
|
#include "nm-setting-6lowpan.h"
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
#include "nm-setting-wpan.h"
|
#include "nm-setting-wpan.h"
|
||||||
|
|
||||||
#if _NM_META_SETTING_BASE_IMPL_LIBNM
|
#if _NM_META_SETTING_BASE_IMPL_LIBNM
|
||||||
#include "nm-setting-private.h"
|
#include "nm-setting-private.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_PROPERTY_COMPARE_H__
|
#define __NM_PROPERTY_COMPARE_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int nm_property_compare(GVariant *value1, GVariant *value2);
|
int nm_property_compare(GVariant *value1, GVariant *value2);
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_SETTING_PRIVATE_H__
|
#define __NM_SETTING_PRIVATE_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-setting.h"
|
#include "nm-setting.h"
|
||||||
|
|
|
@ -22,15 +22,15 @@
|
||||||
|
|
||||||
/* Ideally we'll be able to get these from a public header. */
|
/* Ideally we'll be able to get these from a public header. */
|
||||||
#ifndef IEEE802154_ADDR_LEN
|
#ifndef IEEE802154_ADDR_LEN
|
||||||
#define IEEE802154_ADDR_LEN 8
|
#define IEEE802154_ADDR_LEN 8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef IEEE802154_MAX_PAGE
|
#ifndef IEEE802154_MAX_PAGE
|
||||||
#define IEEE802154_MAX_PAGE 31
|
#define IEEE802154_MAX_PAGE 31
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef IEEE802154_MAX_CHANNEL
|
#ifndef IEEE802154_MAX_CHANNEL
|
||||||
#define IEEE802154_MAX_CHANNEL 26
|
#define IEEE802154_MAX_CHANNEL 26
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_TEAM_UITLS_H__
|
#define __NM_TEAM_UITLS_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libnm-glib-aux/nm-value-type.h"
|
#include "libnm-glib-aux/nm-value-type.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_UTILS_PRIVATE_H__
|
#define __NM_UTILS_PRIVATE_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_PRIVATE)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-setting-private.h"
|
#include "nm-setting-private.h"
|
||||||
|
|
|
@ -1211,7 +1211,7 @@ test_nm_json(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if WITH_JANSSON != defined(JANSSON_SONAME)
|
#if WITH_JANSSON != defined(JANSSON_SONAME)
|
||||||
#error "WITH_JANSON and JANSSON_SONAME are defined inconsistently."
|
#error "WITH_JANSON and JANSSON_SONAME are defined inconsistently."
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
* and some test programs.
|
* and some test programs.
|
||||||
**/
|
**/
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "libnm-base/nm-base.h"
|
#include "libnm-base/nm-base.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_KEYFILE_INTERNAL_H__
|
#define __NM_KEYFILE_INTERNAL_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_KEYFILE_UTILS_H__
|
#define __NM_KEYFILE_UTILS_H__
|
||||||
|
|
||||||
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
|
#if !((NETWORKMANAGER_COMPILATION) &NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL)
|
||||||
#error Cannot use this header.
|
#error Cannot use this header.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -159,9 +159,9 @@ typedef enum _nm_packed {
|
||||||
} NMMetaSettingType;
|
} NMMetaSettingType;
|
||||||
|
|
||||||
#if _NM_META_SETTING_BASE_IMPL_LIBNM
|
#if _NM_META_SETTING_BASE_IMPL_LIBNM
|
||||||
#define _NMMetaSettingInfo_Alias _NMMetaSettingInfo
|
#define _NMMetaSettingInfo_Alias _NMMetaSettingInfo
|
||||||
#else
|
#else
|
||||||
#define _NMMetaSettingInfo_Alias _NMMetaSettingInfoCli
|
#define _NMMetaSettingInfo_Alias _NMMetaSettingInfoCli
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct _NMMetaSettingInfo_Alias {
|
struct _NMMetaSettingInfo_Alias {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_CONNECTION_H__
|
#define __NM_CONNECTION_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-core-types.h"
|
#include "nm-core-types.h"
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
/* This header must not include glib or libnm. */
|
/* This header must not include glib or libnm. */
|
||||||
|
|
||||||
#ifndef NM_VERSION_H
|
#ifndef NM_VERSION_H
|
||||||
#define NM_AVAILABLE_IN_1_2
|
#define NM_AVAILABLE_IN_1_2
|
||||||
#define NM_AVAILABLE_IN_1_8
|
#define NM_AVAILABLE_IN_1_8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -860,8 +860,8 @@ typedef enum /*< flags >*/ {
|
||||||
} NMSecretAgentCapabilities;
|
} NMSecretAgentCapabilities;
|
||||||
|
|
||||||
#ifndef NM_VERSION_H
|
#ifndef NM_VERSION_H
|
||||||
#undef NM_AVAILABLE_IN_1_2
|
#undef NM_AVAILABLE_IN_1_2
|
||||||
#undef NM_AVAILABLE_IN_1_8
|
#undef NM_AVAILABLE_IN_1_8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NM_LLDP_ATTR_RAW "raw"
|
#define NM_LLDP_ATTR_RAW "raw"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#define __NM_KEYFILE_H__
|
#define __NM_KEYFILE_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-core-types.h"
|
#include "nm-core-types.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_SETTING_6LOWPAN_H__
|
#define __NM_SETTING_6LOWPAN_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-setting.h"
|
#include "nm-setting.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_SETTING_8021X_H__
|
#define __NM_SETTING_8021X_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-setting.h"
|
#include "nm-setting.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_SETTING_ADSL_H__
|
#define __NM_SETTING_ADSL_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-setting.h"
|
#include "nm-setting.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define __NM_SETTING_BLUETOOTH_H__
|
#define __NM_SETTING_BLUETOOTH_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-setting.h"
|
#include "nm-setting.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#define __NM_SETTING_BOND_H__
|
#define __NM_SETTING_BOND_H__
|
||||||
|
|
||||||
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
|
||||||
#error "Only <NetworkManager.h> can be included directly."
|
#error "Only <NetworkManager.h> can be included directly."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nm-setting.h"
|
#include "nm-setting.h"
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue