mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 18:54:36 +00:00
platform: move more platform code to src/libnm-platform/
This commit is contained in:
parent
06c03f3e8d
commit
604b1d0331
20
Makefile.am
20
Makefile.am
|
@ -574,13 +574,22 @@ src_libnm_platform_libnm_platform_la_SOURCES = \
|
|||
\
|
||||
src/linux-headers/nl802154.h \
|
||||
\
|
||||
src/libnm-platform/nm-linux-platform.c \
|
||||
src/libnm-platform/nm-linux-platform.h \
|
||||
src/libnm-platform/nm-netlink.c \
|
||||
src/libnm-platform/nm-netlink.h \
|
||||
src/libnm-platform/nm-platform-private.h \
|
||||
src/libnm-platform/nm-platform-utils.c \
|
||||
src/libnm-platform/nm-platform-utils.h \
|
||||
src/libnm-platform/nm-platform.c \
|
||||
src/libnm-platform/nm-platform.h \
|
||||
src/libnm-platform/nmp-base.h \
|
||||
src/libnm-platform/nmp-netns.c \
|
||||
src/libnm-platform/nmp-netns.h \
|
||||
src/libnm-platform/nmp-object.c \
|
||||
src/libnm-platform/nmp-object.h \
|
||||
src/libnm-platform/nmp-rules-manager.c \
|
||||
src/libnm-platform/nmp-rules-manager.h \
|
||||
src/libnm-platform/wifi/nm-wifi-utils-nl80211.c \
|
||||
src/libnm-platform/wifi/nm-wifi-utils-nl80211.h \
|
||||
src/libnm-platform/wifi/nm-wifi-utils-private.h \
|
||||
|
@ -588,6 +597,7 @@ src_libnm_platform_libnm_platform_la_SOURCES = \
|
|||
src/libnm-platform/wifi/nm-wifi-utils.h \
|
||||
src/libnm-platform/wpan/nm-wpan-utils.c \
|
||||
src/libnm-platform/wpan/nm-wpan-utils.h \
|
||||
\
|
||||
$(NULL)
|
||||
|
||||
if WITH_WEXT
|
||||
|
@ -2326,16 +2336,6 @@ src_core_libNetworkManagerBase_la_SOURCES = \
|
|||
src/core/NetworkManagerUtils.c \
|
||||
src/core/NetworkManagerUtils.h \
|
||||
\
|
||||
src/core/platform/nmp-object.c \
|
||||
src/core/platform/nmp-object.h \
|
||||
src/core/platform/nm-platform.c \
|
||||
src/core/platform/nm-platform.h \
|
||||
src/core/platform/nm-platform-private.h \
|
||||
src/core/platform/nm-linux-platform.c \
|
||||
src/core/platform/nm-linux-platform.h \
|
||||
src/core/platform/nmp-rules-manager.c \
|
||||
src/core/platform/nmp-rules-manager.h \
|
||||
\
|
||||
src/core/ndisc/nm-lndp-ndisc.c \
|
||||
src/core/ndisc/nm-lndp-ndisc.h \
|
||||
src/core/ndisc/nm-ndisc.c \
|
||||
|
|
|
@ -20,10 +20,10 @@
|
|||
#include "nm-setting-ip4-config.h"
|
||||
#include "nm-setting-ip6-config.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "platform/nm-linux-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-linux-platform.h"
|
||||
#include "nm-auth-utils.h"
|
||||
#include "libnm-systemd-shared/nm-sd-utils-shared.h"
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||
#include "nm-setting-ip-config.h"
|
||||
#include "nm-setting-ip6-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-setting-adsl.h"
|
||||
#include "nm-device-adsl.h"
|
||||
#include "devices/nm-device-factory.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-udev-aux/nm-udev-utils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include "nm-ip4-config.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "ppp/nm-ppp-manager-call.h"
|
||||
#include "ppp/nm-ppp-status.h"
|
||||
#include "nm-setting-adsl.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "nm-manager.h"
|
||||
#include "nm-bluez5-dun.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-std-aux/nm-dbus-compat.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-bt-error.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
#include "devices/wwan/nm-modem-manager.h"
|
||||
#include "devices/wwan/nm-modem.h"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include <sys/wait.h>
|
||||
#include <linux/if_ether.h>
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-utils.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "n-acd/src/n-acd.h"
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "nm-device-private.h"
|
||||
#include "settings/nm-settings.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-6lowpan.h"
|
||||
#include "nm-utils.h"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-ip4-config.h"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include "nm-act-request.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-dummy.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "ppp/nm-ppp-manager.h"
|
||||
#include "ppp/nm-ppp-manager-call.h"
|
||||
#include "ppp/nm-ppp-status.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "nm-dcb.h"
|
||||
#include "settings/nm-settings-connection.h"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <sys/stat.h>
|
||||
#include <gmodule.h>
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-utils.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-setting-bluetooth.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include "nm-device-generic.h"
|
||||
|
||||
#include "nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "nm-device-private.h"
|
||||
#include "nm-act-request.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-manager.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "settings/nm-settings.h"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
#include "nm-act-request.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-manager.h"
|
||||
#include "nm-setting-macsec.h"
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include "settings/nm-settings.h"
|
||||
#include "nm-act-request.h"
|
||||
#include "nm-manager.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-macvlan.h"
|
||||
#include "nm-setting-wired.h"
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include "nm-device-private.h"
|
||||
#include "nm-manager.h"
|
||||
#include "nm-setting-pppoe.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "ppp/nm-ppp-manager.h"
|
||||
#include "ppp/nm-ppp-manager-call.h"
|
||||
#include "ppp/nm-ppp-status.h"
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "nm-act-request.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-tun.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-device-veth.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-manager.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-veth.h"
|
||||
|
||||
|
|
|
@ -16,11 +16,11 @@
|
|||
#include "settings/nm-settings.h"
|
||||
#include "nm-act-request.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-manager.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceVlan
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include "nm-device-private.h"
|
||||
#include "nm-manager.h"
|
||||
#include "nm-setting-vrf.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "settings/nm-settings.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceVrf
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-manager.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-vxlan.h"
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "platform/nmp-rules-manager.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-rules-manager.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-active-connection.h"
|
||||
#include "nm-act-request.h"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include "nm-act-request.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-wpan.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
|
|
@ -35,10 +35,10 @@
|
|||
#include "nm-l3-config-data.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-manager.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "platform/nmp-rules-manager.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-rules-manager.h"
|
||||
#include "ndisc/nm-ndisc.h"
|
||||
#include "ndisc/nm-lndp-ndisc.h"
|
||||
#include "dhcp/nm-dhcp-manager.h"
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include "libnm-core-public/nm-errors.h"
|
||||
#include "libnm-glib-aux/nm-time-utils.h"
|
||||
#include "libnm-std-aux/unaligned.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-glib-aux/nm-c-list.h"
|
||||
#include "nm-utils.h"
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include "nm-device-ovs-interface.h"
|
||||
#include "nm-device-ovs-port.h"
|
||||
#include "nm-device-ovs-bridge.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "settings/nm-settings.h"
|
||||
#include "devices/nm-device-factory.h"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "libnm-glib-aux/nm-jansson.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-config.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include "nm-manager.h"
|
||||
#include "devices/nm-device-factory.h"
|
||||
#include "nm-device-team.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include "nm-setting-connection.h"
|
||||
#include "nm-setting-olpc-mesh.h"
|
||||
#include "nm-manager.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceOlpcMesh
|
||||
#include "devices/nm-device-logging.h"
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
#include "nm-setting-wifi-p2p.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-wifi-p2p-peer.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "settings/nm-settings.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceWifiP2P
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "nm-setting-ip4-config.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-setting-ip6-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-auth-utils.h"
|
||||
#include "settings/nm-settings-connection.h"
|
||||
#include "settings/nm-settings.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "nm-setting-wireless.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-wifi-utils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "supplicant/nm-supplicant-interface.h"
|
||||
|
||||
#define PROTO_WPA "wpa"
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include "nm-device-olpc-mesh.h"
|
||||
#include "nm-device-iwd.h"
|
||||
#include "settings/nm-settings-connection.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-config.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "nm-setting-wireless.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-wifi-utils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "supplicant/nm-supplicant-types.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-ip6-config.h"
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
#include "nm-modem.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-ip4-config.h"
|
||||
|
||||
#define VARIANT_IS_OF_TYPE_BOOLEAN(v) \
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <linux/rtnetlink.h>
|
||||
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "nm-setting-cdma.h"
|
||||
#include "nm-modem-manager.h"
|
||||
#include "nm-device-modem.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-dhcp-utils.h"
|
||||
#include "nm-dhcp-options.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
#include "nm-dhcp-client-logging.h"
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "nm-dhcp-utils.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-utils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
#define TIMEOUT_TAG "timeout "
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "nm-dhcp-options.h"
|
||||
#include "nm-core-utils.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-dhcp-client-logging.h"
|
||||
#include "n-dhcp4/src/n-dhcp4.h"
|
||||
#include "libnm-systemd-shared/nm-sd-utils-shared.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "nm-dhcp-options.h"
|
||||
#include "nm-core-utils.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-dhcp-client-logging.h"
|
||||
#include "systemd/nm-sd.h"
|
||||
#include "systemd/nm-sd-utils-dhcp.h"
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-config.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-dhcp-client-logging.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include "dhcp/nm-dhcp-utils.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include "dhcp/nm-dhcp-utils.h"
|
||||
#include "dhcp/nm-dhcp-options.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include "libnm-glib-aux/nm-dbus-aux.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-ip6-config.h"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "libnm-glib-aux/nm-c-list.h"
|
||||
#include "libnm-glib-aux/nm-dbus-aux.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-ip6-config.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <arpa/inet.h>
|
||||
|
||||
#include "nm-dnsmasq-utils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-utils.h"
|
||||
|
||||
gboolean
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#ifndef __NETWORKMANAGER_DNSMASQ_UTILS_H__
|
||||
#define __NETWORKMANAGER_DNSMASQ_UTILS_H__
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
gboolean nm_dnsmasq_utils_get_range(const NMPlatformIP4Address *addr,
|
||||
char * out_first,
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include "nm-dbus-interface.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-manager.h"
|
||||
#include "platform/nm-linux-platform.h"
|
||||
#include "libnm-platform/nm-linux-platform.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
#include "devices/nm-device.h"
|
||||
#include "dhcp/nm-dhcp-manager.h"
|
||||
|
|
|
@ -45,10 +45,6 @@ libNetworkManagerBase = static_library(
|
|||
'dhcp/nm-dhcp-options.c',
|
||||
'ndisc/nm-lndp-ndisc.c',
|
||||
'ndisc/nm-ndisc.c',
|
||||
'platform/nm-linux-platform.c',
|
||||
'platform/nm-platform.c',
|
||||
'platform/nmp-object.c',
|
||||
'platform/nmp-rules-manager.c',
|
||||
'main-utils.c',
|
||||
'NetworkManagerUtils.c',
|
||||
'nm-core-utils.c',
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "libnm-systemd-shared/nm-sd-utils-shared.h"
|
||||
#include "nm-ndisc-private.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-netns.h"
|
||||
|
||||
#define _NMLOG_PREFIX_NAME "ndisc-lndp"
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include "nm-ndisc-private.h"
|
||||
#include "nm-utils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-netns.h"
|
||||
#include "nm-l3-config-data.h"
|
||||
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
#include "nm-setting-ip6-config.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
|
||||
#define NM_RA_TIMEOUT_DEFAULT ((guint32) 0)
|
||||
#define NM_RA_TIMEOUT_INFINITY ((guint32) G_MAXINT32)
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include "ndisc/nm-ndisc.h"
|
||||
#include "ndisc/nm-lndp-ndisc.h"
|
||||
|
||||
#include "platform/nm-linux-platform.h"
|
||||
#include "libnm-platform/nm-linux-platform.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <sys/wait.h>
|
||||
|
||||
#include "nm-dcb.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
static const char *helper_names[] = {"dcbtool", "fcoeadm"};
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include "nm-ip6-config.h"
|
||||
#include "nm-manager.h"
|
||||
#include "settings/nm-settings-connection.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#define CALL_TIMEOUT (1000 * 60 * 10) /* 10 minutes for all scripts */
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#include "main-utils.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "platform/nm-linux-platform.h"
|
||||
#include "libnm-platform/nm-linux-platform.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "dhcp/nm-dhcp-manager.h"
|
||||
#include "ndisc/nm-ndisc.h"
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||
|
||||
#include "nm-utils.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-setting-ip4-config.h"
|
||||
|
||||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "nm-ip-config.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||
|
||||
#include "nm-utils.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-setting-ip6-config.h"
|
||||
|
||||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "nm-ip-config.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -10,9 +10,9 @@
|
|||
|
||||
#include "libnm-glib-aux/nm-enum-utils.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "nm-setting-ip6-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
|
||||
typedef enum {
|
||||
NM_L3_CONFIG_DAT_FLAGS_NONE = 0,
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
#include <linux/rtnetlink.h>
|
||||
|
||||
#include "libnm-glib-aux/nm-time-utils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "nm-netns.h"
|
||||
#include "n-acd/src/n-acd.h"
|
||||
#include "nm-l3-ipv4ll.h"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#ifndef __NM_L3CFG_H__
|
||||
#define __NM_L3CFG_H__
|
||||
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "nm-l3-config-data.h"
|
||||
|
||||
#define NM_L3CFG_CONFIG_PRIORITY_IPV4LL 0
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
#include "vpn/nm-vpn-manager.h"
|
||||
#include "devices/nm-device.h"
|
||||
#include "devices/nm-device-generic.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "nm-hostname-manager.h"
|
||||
#include "nm-keep-alive.h"
|
||||
#include "nm-rfkill-manager.h"
|
||||
|
|
|
@ -13,9 +13,9 @@
|
|||
#include "NetworkManagerUtils.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-l3cfg.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-netns.h"
|
||||
#include "platform/nmp-rules-manager.h"
|
||||
#include "libnm-platform/nmp-rules-manager.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
@ -19,12 +19,14 @@
|
|||
|
||||
typedef struct _NMNetnsClass NMNetnsClass;
|
||||
|
||||
struct _NMPlatform;
|
||||
|
||||
GType nm_netns_get_type(void);
|
||||
|
||||
NMNetns *nm_netns_get(void);
|
||||
NMNetns *nm_netns_new(NMPlatform *platform);
|
||||
NMNetns *nm_netns_new(struct _NMPlatform *platform);
|
||||
|
||||
NMPlatform *nm_netns_get_platform(NMNetns *self);
|
||||
struct _NMPlatform *nm_netns_get_platform(NMNetns *self);
|
||||
NMPNetns * nm_netns_get_platform_netns(NMNetns *self);
|
||||
|
||||
struct _NMPRulesManager *nm_netns_get_rules_manager(NMNetns *self);
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "nm-utils.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
#include "nm-proxy-config.h"
|
||||
#include "nm-ip4-config.h"
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "devices/nm-device.h"
|
||||
#include "nm-setting-ip4-config.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "dns/nm-dns-manager.h"
|
||||
#include "vpn/nm-vpn-manager.h"
|
||||
#include "nm-auth-utils.h"
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
#include <linux/rtnetlink.h>
|
||||
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "nm-platform-private.h"
|
||||
#include "nmp-object.h"
|
||||
#include "libnm-platform/nm-platform-private.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#ifndef __NETWORKMANAGER_FAKE_PLATFORM_H__
|
||||
#define __NETWORKMANAGER_FAKE_PLATFORM_H__
|
||||
|
||||
#include "nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
#define NM_TYPE_FAKE_PLATFORM (nm_fake_platform_get_type())
|
||||
#define NM_FAKE_PLATFORM(obj) \
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <syslog.h>
|
||||
|
||||
#include "platform/nm-linux-platform.h"
|
||||
#include "libnm-platform/nm-linux-platform.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
|
|
|
@ -11,10 +11,10 @@
|
|||
#include <linux/if_link.h>
|
||||
#include <linux/ip6_tunnel.h>
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "platform/nm-fake-platform.h"
|
||||
#include "platform/nm-linux-platform.h"
|
||||
#include "libnm-platform/nm-linux-platform.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#include "libnm-glib-aux/nm-io-utils.h"
|
||||
#include "libnm-base/nm-ethtool-base.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-netns.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <libudev.h>
|
||||
#include <linux/pkt_sched.h>
|
||||
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "libnm-udev-aux/nm-udev-utils.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <linux/rtnetlink.h>
|
||||
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "platform/nm-linux-platform.h"
|
||||
#include "libnm-platform/nm-linux-platform.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include "nm-core-utils.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "platform/nmp-rules-manager.h"
|
||||
#include "libnm-platform/nmp-rules-manager.h"
|
||||
|
||||
#include "test-common.h"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <linux/pkt_sched.h>
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-object.h"
|
||||
#include "libnm-platform/nmp-netns.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "test-common.h"
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <linux/rtnetlink.h>
|
||||
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-act-request.h"
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "libnm-base/nm-ethtool-base.h"
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
#include "nms-ifcfg-rh-common.h"
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "libnm-glib-aux/nm-ref-string.h"
|
||||
#include "nm-supplicant-interface.h"
|
||||
#include "nm-supplicant-types.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <arpa/inet.h>
|
||||
|
||||
#include "nm-ip4-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include "nm-ip6-config.h"
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
static NMIP6Config *
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "nm-l3cfg.h"
|
||||
#include "nm-l3-ipv4ll.h"
|
||||
#include "nm-netns.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
|
||||
#include "platform/tests/test-common.h"
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "nm-proxy-config.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-ip6-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "libnm-platform/nm-platform.h"
|
||||
#include "nm-active-connection.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "settings/nm-settings-connection.h"
|
||||
|
|
|
@ -3,9 +3,13 @@
|
|||
libnm_platform = static_library(
|
||||
'nm-platform',
|
||||
sources: [
|
||||
'nm-linux-platform.c',
|
||||
'nm-netlink.c',
|
||||
'nm-platform-utils.c',
|
||||
'nm-platform.c',
|
||||
'nmp-netns.c',
|
||||
'nmp-object.c',
|
||||
'nmp-rules-manager.c',
|
||||
'wifi/nm-wifi-utils-nl80211.c',
|
||||
'wifi/nm-wifi-utils.c',
|
||||
'wpan/nm-wpan-utils.c',
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2012 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "src/core/nm-default-daemon.h"
|
||||
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-linux-platform.h"
|
||||
|
||||
|
@ -36,6 +36,7 @@
|
|||
#include "libnm-glib-aux/nm-io-utils.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-glib-aux/nm-time-utils.h"
|
||||
#include "libnm-log-core/nm-logging.h"
|
||||
#include "libnm-platform/nm-netlink.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "libnm-platform/nmp-netns.h"
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2012 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "src/core/nm-default-daemon.h"
|
||||
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-platform.h"
|
||||
|
||||
|
@ -25,6 +25,7 @@
|
|||
#include "libnm-glib-aux/nm-dedup-multi.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-glib-aux/nm-time-utils.h"
|
||||
#include "libnm-log-core/nm-logging.h"
|
||||
#include "libnm-platform/nm-platform-utils.h"
|
||||
#include "libnm-platform/nmp-netns.h"
|
||||
#include "libnm-udev-aux/nm-udev-utils.h"
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2015 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "src/core/nm-default-daemon.h"
|
||||
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nmp-object.h"
|
||||
|
|
@ -1,12 +1,13 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "src/core/nm-default-daemon.h"
|
||||
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nmp-rules-manager.h"
|
||||
|
||||
#include <linux/fib_rules.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
|
||||
#include "libnm-log-core/nm-logging.h"
|
||||
#include "libnm-std-aux/c-list-util.h"
|
||||
#include "nmp-object.h"
|
||||
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue