From 604b1d033126700d26182bb02f3180a80ef388ca Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 4 Mar 2021 11:29:39 +0100 Subject: [PATCH] platform: move more platform code to src/libnm-platform/ --- Makefile.am | 20 +++++++++---------- src/core/NetworkManagerUtils.c | 6 +++--- src/core/NetworkManagerUtils.h | 2 +- src/core/devices/adsl/nm-atm-manager.c | 2 +- src/core/devices/adsl/nm-device-adsl.c | 2 +- src/core/devices/bluetooth/nm-bluez-manager.c | 2 +- src/core/devices/bluetooth/nm-device-bt.c | 2 +- src/core/devices/nm-acd-manager.c | 2 +- src/core/devices/nm-device-6lowpan.c | 2 +- src/core/devices/nm-device-bond.c | 2 +- src/core/devices/nm-device-bridge.c | 2 +- src/core/devices/nm-device-dummy.c | 2 +- src/core/devices/nm-device-ethernet.c | 2 +- src/core/devices/nm-device-factory.c | 2 +- src/core/devices/nm-device-generic.c | 2 +- src/core/devices/nm-device-infiniband.c | 2 +- src/core/devices/nm-device-ip-tunnel.c | 2 +- src/core/devices/nm-device-macsec.c | 2 +- src/core/devices/nm-device-macvlan.c | 2 +- src/core/devices/nm-device-ppp.c | 2 +- src/core/devices/nm-device-tun.c | 2 +- src/core/devices/nm-device-veth.c | 2 +- src/core/devices/nm-device-vlan.c | 4 ++-- src/core/devices/nm-device-vrf.c | 2 +- src/core/devices/nm-device-vxlan.c | 2 +- src/core/devices/nm-device-wireguard.c | 6 +++--- src/core/devices/nm-device-wpan.c | 2 +- src/core/devices/nm-device.c | 6 +++--- src/core/devices/nm-lldp-listener.c | 2 +- src/core/devices/ovs/nm-ovs-factory.c | 2 +- src/core/devices/team/nm-device-team.c | 2 +- src/core/devices/team/nm-team-factory.c | 2 +- src/core/devices/wifi/nm-device-olpc-mesh.c | 2 +- src/core/devices/wifi/nm-device-wifi-p2p.c | 4 ++-- src/core/devices/wifi/nm-device-wifi.c | 2 +- src/core/devices/wifi/nm-wifi-ap.c | 2 +- src/core/devices/wifi/nm-wifi-factory.c | 2 +- src/core/devices/wifi/nm-wifi-p2p-peer.c | 2 +- src/core/devices/wwan/nm-modem-broadband.c | 2 +- src/core/devices/wwan/nm-modem-ofono.c | 2 +- src/core/devices/wwan/nm-modem.c | 2 +- src/core/devices/wwan/nm-wwan-factory.c | 2 +- src/core/dhcp/nm-dhcp-client.c | 2 +- src/core/dhcp/nm-dhcp-dhclient-utils.c | 2 +- src/core/dhcp/nm-dhcp-nettools.c | 2 +- src/core/dhcp/nm-dhcp-systemd.c | 2 +- src/core/dhcp/nm-dhcp-utils.c | 2 +- src/core/dhcp/tests/test-dhcp-dhclient.c | 2 +- src/core/dhcp/tests/test-dhcp-utils.c | 2 +- src/core/dns/nm-dns-dnsmasq.c | 2 +- src/core/dns/nm-dns-systemd-resolved.c | 2 +- src/core/dnsmasq/nm-dnsmasq-utils.c | 2 +- src/core/dnsmasq/nm-dnsmasq-utils.h | 2 +- src/core/main.c | 2 +- src/core/meson.build | 4 ---- src/core/ndisc/nm-lndp-ndisc.c | 2 +- src/core/ndisc/nm-ndisc.c | 2 +- src/core/ndisc/nm-ndisc.h | 4 ++-- src/core/ndisc/tests/test-ndisc-linux.c | 2 +- src/core/nm-dcb.c | 2 +- src/core/nm-dispatcher.c | 2 +- src/core/nm-iface-helper.c | 2 +- src/core/nm-ip4-config.c | 4 ++-- src/core/nm-ip4-config.h | 2 +- src/core/nm-ip6-config.c | 4 ++-- src/core/nm-ip6-config.h | 2 +- src/core/nm-l3-config-data.c | 4 ++-- src/core/nm-l3-config-data.h | 4 ++-- src/core/nm-l3cfg.c | 4 ++-- src/core/nm-l3cfg.h | 2 +- src/core/nm-manager.c | 4 ++-- src/core/nm-netns.c | 4 ++-- src/core/nm-netns.h | 8 +++++--- src/core/nm-pacrunner-manager.c | 2 +- src/core/nm-policy.c | 2 +- src/core/platform/nm-fake-platform.c | 4 ++-- src/core/platform/nm-fake-platform.h | 2 +- src/core/platform/tests/monitor.c | 2 +- src/core/platform/tests/test-common.h | 6 +++--- src/core/platform/tests/test-link.c | 2 +- src/core/platform/tests/test-nmp-object.c | 2 +- .../platform/tests/test-platform-general.c | 2 +- src/core/platform/tests/test-route.c | 2 +- src/core/platform/tests/test-tc.c | 2 +- src/core/ppp/nm-ppp-manager.c | 2 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 2 +- src/core/supplicant/nm-supplicant-manager.c | 2 +- src/core/tests/test-ip4-config.c | 2 +- src/core/tests/test-ip6-config.c | 2 +- src/core/tests/test-l3cfg.c | 2 +- src/core/vpn/nm-vpn-connection.c | 2 +- src/libnm-platform/meson.build | 4 ++++ .../nm-linux-platform.c | 3 ++- .../nm-linux-platform.h | 0 .../nm-platform-private.h | 0 .../platform => libnm-platform}/nm-platform.c | 3 ++- .../platform => libnm-platform}/nm-platform.h | 0 .../platform => libnm-platform}/nmp-object.c | 2 +- .../platform => libnm-platform}/nmp-object.h | 0 .../nmp-rules-manager.c | 3 ++- .../nmp-rules-manager.h | 0 101 files changed, 133 insertions(+), 128 deletions(-) rename src/{core/platform => libnm-platform}/nm-linux-platform.c (99%) rename src/{core/platform => libnm-platform}/nm-linux-platform.h (100%) rename src/{core/platform => libnm-platform}/nm-platform-private.h (100%) rename src/{core/platform => libnm-platform}/nm-platform.c (99%) rename src/{core/platform => libnm-platform}/nm-platform.h (100%) rename src/{core/platform => libnm-platform}/nmp-object.c (99%) rename src/{core/platform => libnm-platform}/nmp-object.h (100%) rename src/{core/platform => libnm-platform}/nmp-rules-manager.c (99%) rename src/{core/platform => libnm-platform}/nmp-rules-manager.h (100%) diff --git a/Makefile.am b/Makefile.am index 291f1c20ae..38c84732ba 100644 --- a/Makefile.am +++ b/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 \ diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index ab2667b86e..a236faac31 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.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" diff --git a/src/core/NetworkManagerUtils.h b/src/core/NetworkManagerUtils.h index bd7ca33645..a004dbb718 100644 --- a/src/core/NetworkManagerUtils.h +++ b/src/core/NetworkManagerUtils.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" /*****************************************************************************/ diff --git a/src/core/devices/adsl/nm-atm-manager.c b/src/core/devices/adsl/nm-atm-manager.c index 8aa23f5005..bd9ed8cc23 100644 --- a/src/core/devices/adsl/nm-atm-manager.c +++ b/src/core/devices/adsl/nm-atm-manager.c @@ -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" /*****************************************************************************/ diff --git a/src/core/devices/adsl/nm-device-adsl.c b/src/core/devices/adsl/nm-device-adsl.c index 34c062a8db..01a1b39024 100644 --- a/src/core/devices/adsl/nm-device-adsl.c +++ b/src/core/devices/adsl/nm-device-adsl.c @@ -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" diff --git a/src/core/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c index a9fdcdd7fd..a16a22a096 100644 --- a/src/core/devices/bluetooth/nm-bluez-manager.c +++ b/src/core/devices/bluetooth/nm-bluez-manager.c @@ -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" /*****************************************************************************/ diff --git a/src/core/devices/bluetooth/nm-device-bt.c b/src/core/devices/bluetooth/nm-device-bt.c index 2c336587ed..c7f76a5ab8 100644 --- a/src/core/devices/bluetooth/nm-device-bt.c +++ b/src/core/devices/bluetooth/nm-device-bt.c @@ -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" diff --git a/src/core/devices/nm-acd-manager.c b/src/core/devices/nm-acd-manager.c index b95f90fd45..995abacded 100644 --- a/src/core/devices/nm-acd-manager.c +++ b/src/core/devices/nm-acd-manager.c @@ -12,7 +12,7 @@ #include #include -#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" diff --git a/src/core/devices/nm-device-6lowpan.c b/src/core/devices/nm-device-6lowpan.c index fe116dd47a..96218658c1 100644 --- a/src/core/devices/nm-device-6lowpan.c +++ b/src/core/devices/nm-device-6lowpan.c @@ -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" diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c index 9741be8c52..878d3e9e0c 100644 --- a/src/core/devices/nm-device-bond.c +++ b/src/core/devices/nm-device-bond.c @@ -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" diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c index 239333edb4..8bed7839ae 100644 --- a/src/core/devices/nm-device-bridge.c +++ b/src/core/devices/nm-device-bridge.c @@ -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" diff --git a/src/core/devices/nm-device-dummy.c b/src/core/devices/nm-device-dummy.c index b553299ada..bb7150ccc7 100644 --- a/src/core/devices/nm-device-dummy.c +++ b/src/core/devices/nm-device-dummy.c @@ -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" diff --git a/src/core/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c index 8139cf629c..064d79f5c2 100644 --- a/src/core/devices/nm-device-ethernet.c +++ b/src/core/devices/nm-device-ethernet.c @@ -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" diff --git a/src/core/devices/nm-device-factory.c b/src/core/devices/nm-device-factory.c index 8dbc985ceb..bdc64135d9 100644 --- a/src/core/devices/nm-device-factory.c +++ b/src/core/devices/nm-device-factory.c @@ -11,7 +11,7 @@ #include #include -#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" diff --git a/src/core/devices/nm-device-generic.c b/src/core/devices/nm-device-generic.c index 497a5f94b7..299cb08d27 100644 --- a/src/core/devices/nm-device-generic.c +++ b/src/core/devices/nm-device-generic.c @@ -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" /*****************************************************************************/ diff --git a/src/core/devices/nm-device-infiniband.c b/src/core/devices/nm-device-infiniband.c index feee1583aa..954302507b 100644 --- a/src/core/devices/nm-device-infiniband.c +++ b/src/core/devices/nm-device-infiniband.c @@ -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" diff --git a/src/core/devices/nm-device-ip-tunnel.c b/src/core/devices/nm-device-ip-tunnel.c index 75cc222e92..1e7f134ae8 100644 --- a/src/core/devices/nm-device-ip-tunnel.c +++ b/src/core/devices/nm-device-ip-tunnel.c @@ -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" diff --git a/src/core/devices/nm-device-macsec.c b/src/core/devices/nm-device-macsec.c index 839a3f094c..14844c4085 100644 --- a/src/core/devices/nm-device-macsec.c +++ b/src/core/devices/nm-device-macsec.c @@ -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" diff --git a/src/core/devices/nm-device-macvlan.c b/src/core/devices/nm-device-macvlan.c index e8b39ed6b0..b9903bc06d 100644 --- a/src/core/devices/nm-device-macvlan.c +++ b/src/core/devices/nm-device-macvlan.c @@ -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" diff --git a/src/core/devices/nm-device-ppp.c b/src/core/devices/nm-device-ppp.c index 4040f2d316..b642d0d7de 100644 --- a/src/core/devices/nm-device-ppp.c +++ b/src/core/devices/nm-device-ppp.c @@ -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" diff --git a/src/core/devices/nm-device-tun.c b/src/core/devices/nm-device-tun.c index d3050b8c89..1b3348dcba 100644 --- a/src/core/devices/nm-device-tun.c +++ b/src/core/devices/nm-device-tun.c @@ -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" diff --git a/src/core/devices/nm-device-veth.c b/src/core/devices/nm-device-veth.c index 03e34bd8bc..b1737b5b7f 100644 --- a/src/core/devices/nm-device-veth.c +++ b/src/core/devices/nm-device-veth.c @@ -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" diff --git a/src/core/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c index 8f3a89b7db..3b426ef4c9 100644 --- a/src/core/devices/nm-device-vlan.c +++ b/src/core/devices/nm-device-vlan.c @@ -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 diff --git a/src/core/devices/nm-device-vrf.c b/src/core/devices/nm-device-vrf.c index ab17197add..2a1f42c646 100644 --- a/src/core/devices/nm-device-vrf.c +++ b/src/core/devices/nm-device-vrf.c @@ -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 diff --git a/src/core/devices/nm-device-vxlan.c b/src/core/devices/nm-device-vxlan.c index c0a11cd042..557b545cf1 100644 --- a/src/core/devices/nm-device-vxlan.c +++ b/src/core/devices/nm-device-vxlan.c @@ -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" diff --git a/src/core/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c index 4ad75d1db5..09030dd8f7 100644 --- a/src/core/devices/nm-device-wireguard.c +++ b/src/core/devices/nm-device-wireguard.c @@ -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" diff --git a/src/core/devices/nm-device-wpan.c b/src/core/devices/nm-device-wpan.c index 7f1f9e3286..73d7941001 100644 --- a/src/core/devices/nm-device-wpan.c +++ b/src/core/devices/nm-device-wpan.c @@ -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" diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 55884c4edc..9d44757c08 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -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" diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c index 9eeea0b2de..808c1e2680 100644 --- a/src/core/devices/nm-lldp-listener.c +++ b/src/core/devices/nm-lldp-listener.c @@ -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" diff --git a/src/core/devices/ovs/nm-ovs-factory.c b/src/core/devices/ovs/nm-ovs-factory.c index 3a9a736448..6f5d88326b 100644 --- a/src/core/devices/ovs/nm-ovs-factory.c +++ b/src/core/devices/ovs/nm-ovs-factory.c @@ -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" diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c index 6fc5c78f78..efd71dcb60 100644 --- a/src/core/devices/team/nm-device-team.c +++ b/src/core/devices/team/nm-device-team.c @@ -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" diff --git a/src/core/devices/team/nm-team-factory.c b/src/core/devices/team/nm-team-factory.c index 21be23965b..e2040d19fd 100644 --- a/src/core/devices/team/nm-team-factory.c +++ b/src/core/devices/team/nm-team-factory.c @@ -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" /*****************************************************************************/ diff --git a/src/core/devices/wifi/nm-device-olpc-mesh.c b/src/core/devices/wifi/nm-device-olpc-mesh.c index af83c4a334..4ec8b077fb 100644 --- a/src/core/devices/wifi/nm-device-olpc-mesh.c +++ b/src/core/devices/wifi/nm-device-olpc-mesh.c @@ -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" diff --git a/src/core/devices/wifi/nm-device-wifi-p2p.c b/src/core/devices/wifi/nm-device-wifi-p2p.c index 0a0955deda..7ff0434ca9 100644 --- a/src/core/devices/wifi/nm-device-wifi-p2p.c +++ b/src/core/devices/wifi/nm-device-wifi-p2p.c @@ -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 diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c index baf4e3f21e..6eed0302a2 100644 --- a/src/core/devices/wifi/nm-device-wifi.c +++ b/src/core/devices/wifi/nm-device-wifi.c @@ -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" diff --git a/src/core/devices/wifi/nm-wifi-ap.c b/src/core/devices/wifi/nm-wifi-ap.c index 68c06af178..883593f6a0 100644 --- a/src/core/devices/wifi/nm-wifi-ap.c +++ b/src/core/devices/wifi/nm-wifi-ap.c @@ -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" diff --git a/src/core/devices/wifi/nm-wifi-factory.c b/src/core/devices/wifi/nm-wifi-factory.c index 933f2a416f..c7be7ab8cb 100644 --- a/src/core/devices/wifi/nm-wifi-factory.c +++ b/src/core/devices/wifi/nm-wifi-factory.c @@ -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" /*****************************************************************************/ diff --git a/src/core/devices/wifi/nm-wifi-p2p-peer.c b/src/core/devices/wifi/nm-wifi-p2p-peer.c index 6b04204cb1..228a26bf16 100644 --- a/src/core/devices/wifi/nm-wifi-p2p-peer.c +++ b/src/core/devices/wifi/nm-wifi-p2p-peer.c @@ -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" /*****************************************************************************/ diff --git a/src/core/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c index 51f7088899..0872a8a1f9 100644 --- a/src/core/devices/wwan/nm-modem-broadband.c +++ b/src/core/devices/wwan/nm-modem-broadband.c @@ -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" diff --git a/src/core/devices/wwan/nm-modem-ofono.c b/src/core/devices/wwan/nm-modem-ofono.c index 6ca78292f0..74b2552a42 100644 --- a/src/core/devices/wwan/nm-modem-ofono.c +++ b/src/core/devices/wwan/nm-modem-ofono.c @@ -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) \ diff --git a/src/core/devices/wwan/nm-modem.c b/src/core/devices/wwan/nm-modem.c index 68cd8f00b2..5366562670 100644 --- a/src/core/devices/wwan/nm-modem.c +++ b/src/core/devices/wwan/nm-modem.c @@ -13,7 +13,7 @@ #include #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" diff --git a/src/core/devices/wwan/nm-wwan-factory.c b/src/core/devices/wwan/nm-wwan-factory.c index 5d2ce2b320..0d802ae1b4 100644 --- a/src/core/devices/wwan/nm-wwan-factory.c +++ b/src/core/devices/wwan/nm-wwan-factory.c @@ -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" /*****************************************************************************/ diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c index 1b5aa1060e..c128095aba 100644 --- a/src/core/dhcp/nm-dhcp-client.c +++ b/src/core/dhcp/nm-dhcp-client.c @@ -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" diff --git a/src/core/dhcp/nm-dhcp-dhclient-utils.c b/src/core/dhcp/nm-dhcp-dhclient-utils.c index 59682fb5ae..83de1c156d 100644 --- a/src/core/dhcp/nm-dhcp-dhclient-utils.c +++ b/src/core/dhcp/nm-dhcp-dhclient-utils.c @@ -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 " diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c index 525fe752a9..dc9cbf58c4 100644 --- a/src/core/dhcp/nm-dhcp-nettools.c +++ b/src/core/dhcp/nm-dhcp-nettools.c @@ -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" diff --git a/src/core/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c index 827ebb77aa..de8e5142a4 100644 --- a/src/core/dhcp/nm-dhcp-systemd.c +++ b/src/core/dhcp/nm-dhcp-systemd.c @@ -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" diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c index 0233943de2..c3cbe610b1 100644 --- a/src/core/dhcp/nm-dhcp-utils.c +++ b/src/core/dhcp/nm-dhcp-utils.c @@ -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" diff --git a/src/core/dhcp/tests/test-dhcp-dhclient.c b/src/core/dhcp/tests/test-dhcp-dhclient.c index 24ea9a448f..e9a6209644 100644 --- a/src/core/dhcp/tests/test-dhcp-dhclient.c +++ b/src/core/dhcp/tests/test-dhcp-dhclient.c @@ -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" diff --git a/src/core/dhcp/tests/test-dhcp-utils.c b/src/core/dhcp/tests/test-dhcp-utils.c index 9fd224e339..4d47e7e283 100644 --- a/src/core/dhcp/tests/test-dhcp-utils.c +++ b/src/core/dhcp/tests/test-dhcp-utils.c @@ -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" diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c index 6ef9f924ee..126e0a217a 100644 --- a/src/core/dns/nm-dns-dnsmasq.c +++ b/src/core/dns/nm-dns-dnsmasq.c @@ -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" diff --git a/src/core/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c index 236a8283aa..de01cf9fb7 100644 --- a/src/core/dns/nm-dns-systemd-resolved.c +++ b/src/core/dns/nm-dns-systemd-resolved.c @@ -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" diff --git a/src/core/dnsmasq/nm-dnsmasq-utils.c b/src/core/dnsmasq/nm-dnsmasq-utils.c index ea23a78d41..86e18b5640 100644 --- a/src/core/dnsmasq/nm-dnsmasq-utils.c +++ b/src/core/dnsmasq/nm-dnsmasq-utils.c @@ -8,7 +8,7 @@ #include #include "nm-dnsmasq-utils.h" -#include "platform/nm-platform.h" +#include "libnm-platform/nm-platform.h" #include "nm-utils.h" gboolean diff --git a/src/core/dnsmasq/nm-dnsmasq-utils.h b/src/core/dnsmasq/nm-dnsmasq-utils.h index 57bbc4c40c..1fabc9bab2 100644 --- a/src/core/dnsmasq/nm-dnsmasq-utils.h +++ b/src/core/dnsmasq/nm-dnsmasq-utils.h @@ -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, diff --git a/src/core/main.c b/src/core/main.c index 88fd8f20d4..bf8f8d44c4 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -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" diff --git a/src/core/meson.build b/src/core/meson.build index ac9f165d0f..f3dc965762 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -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', diff --git a/src/core/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c index 8b63f92c91..7ba9be3b46 100644 --- a/src/core/ndisc/nm-lndp-ndisc.c +++ b/src/core/ndisc/nm-lndp-ndisc.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" diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c index e92134c53e..736fc937d7 100644 --- a/src/core/ndisc/nm-ndisc.c +++ b/src/core/ndisc/nm-ndisc.c @@ -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" diff --git a/src/core/ndisc/nm-ndisc.h b/src/core/ndisc/nm-ndisc.h index 93aee4db38..31f736a8f0 100644 --- a/src/core/ndisc/nm-ndisc.h +++ b/src/core/ndisc/nm-ndisc.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) diff --git a/src/core/ndisc/tests/test-ndisc-linux.c b/src/core/ndisc/tests/test-ndisc-linux.c index 9a5df60b1c..c84ee142b1 100644 --- a/src/core/ndisc/tests/test-ndisc-linux.c +++ b/src/core/ndisc/tests/test-ndisc-linux.c @@ -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" diff --git a/src/core/nm-dcb.c b/src/core/nm-dcb.c index b3958caa51..930a10238f 100644 --- a/src/core/nm-dcb.c +++ b/src/core/nm-dcb.c @@ -8,7 +8,7 @@ #include #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"}; diff --git a/src/core/nm-dispatcher.c b/src/core/nm-dispatcher.c index 5d9c51aa81..4fdb905dcf 100644 --- a/src/core/nm-dispatcher.c +++ b/src/core/nm-dispatcher.c @@ -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 */ diff --git a/src/core/nm-iface-helper.c b/src/core/nm-iface-helper.c index 9dfee8d9e7..c4d87b96e4 100644 --- a/src/core/nm-iface-helper.c +++ b/src/core/nm-iface-helper.c @@ -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" diff --git a/src/core/nm-ip4-config.c b/src/core/nm-ip4-config.c index 575d2876f3..e2e4251fe3 100644 --- a/src/core/nm-ip4-config.c +++ b/src/core/nm-ip4-config.c @@ -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" diff --git a/src/core/nm-ip4-config.h b/src/core/nm-ip4-config.h index 1196a724cd..7032a2385e 100644 --- a/src/core/nm-ip4-config.h +++ b/src/core/nm-ip4-config.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" /*****************************************************************************/ diff --git a/src/core/nm-ip6-config.c b/src/core/nm-ip6-config.c index 5501e02f5f..a5a885f44f 100644 --- a/src/core/nm-ip6-config.c +++ b/src/core/nm-ip6-config.c @@ -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" diff --git a/src/core/nm-ip6-config.h b/src/core/nm-ip6-config.h index 7cc00a83f3..4aa0ee4e58 100644 --- a/src/core/nm-ip6-config.h +++ b/src/core/nm-ip6-config.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" /*****************************************************************************/ diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c index cce7364cd4..bf358f9e47 100644 --- a/src/core/nm-l3-config-data.c +++ b/src/core/nm-l3-config-data.c @@ -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" /*****************************************************************************/ diff --git a/src/core/nm-l3-config-data.h b/src/core/nm-l3-config-data.h index f89095f9b9..229851c588 100644 --- a/src/core/nm-l3-config-data.h +++ b/src/core/nm-l3-config-data.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, diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c index ab4bcdb737..ef875b71d5 100644 --- a/src/core/nm-l3cfg.c +++ b/src/core/nm-l3cfg.c @@ -10,8 +10,8 @@ #include #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" diff --git a/src/core/nm-l3cfg.h b/src/core/nm-l3cfg.h index 5cfc93f643..a477d6c3d1 100644 --- a/src/core/nm-l3cfg.h +++ b/src/core/nm-l3cfg.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 diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index 9e61379660..1e9c265fac 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -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" diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c index 17ba5d6453..90728e7a1f 100644 --- a/src/core/nm-netns.c +++ b/src/core/nm-netns.c @@ -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" /*****************************************************************************/ diff --git a/src/core/nm-netns.h b/src/core/nm-netns.h index 58c8265730..78a9121a6c 100644 --- a/src/core/nm-netns.h +++ b/src/core/nm-netns.h @@ -19,13 +19,15 @@ 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); -NMPNetns * nm_netns_get_platform_netns(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); diff --git a/src/core/nm-pacrunner-manager.c b/src/core/nm-pacrunner-manager.c index 492580a071..a51d48d57d 100644 --- a/src/core/nm-pacrunner-manager.c +++ b/src/core/nm-pacrunner-manager.c @@ -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" diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index 176cc2ebf3..b247fe96e4 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -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" diff --git a/src/core/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c index 2569e188bb..f65dbebd9d 100644 --- a/src/core/platform/nm-fake-platform.c +++ b/src/core/platform/nm-fake-platform.c @@ -14,8 +14,8 @@ #include #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" diff --git a/src/core/platform/nm-fake-platform.h b/src/core/platform/nm-fake-platform.h index a1d44f8ff9..8f8571fa1f 100644 --- a/src/core/platform/nm-fake-platform.h +++ b/src/core/platform/nm-fake-platform.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) \ diff --git a/src/core/platform/tests/monitor.c b/src/core/platform/tests/monitor.c index abdf2cd54b..ff6fae6565 100644 --- a/src/core/platform/tests/monitor.c +++ b/src/core/platform/tests/monitor.c @@ -8,7 +8,7 @@ #include #include -#include "platform/nm-linux-platform.h" +#include "libnm-platform/nm-linux-platform.h" #include "nm-test-utils-core.h" diff --git a/src/core/platform/tests/test-common.h b/src/core/platform/tests/test-common.h index 618645fea9..ff116fa97f 100644 --- a/src/core/platform/tests/test-common.h +++ b/src/core/platform/tests/test-common.h @@ -11,10 +11,10 @@ #include #include -#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" diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c index 30097e33c7..1613703251 100644 --- a/src/core/platform/tests/test-link.c +++ b/src/core/platform/tests/test-link.c @@ -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" diff --git a/src/core/platform/tests/test-nmp-object.c b/src/core/platform/tests/test-nmp-object.c index 6f8be00d10..6d2236ecb8 100644 --- a/src/core/platform/tests/test-nmp-object.c +++ b/src/core/platform/tests/test-nmp-object.c @@ -8,7 +8,7 @@ #include #include -#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" diff --git a/src/core/platform/tests/test-platform-general.c b/src/core/platform/tests/test-platform-general.c index 796500d510..685cd18aa7 100644 --- a/src/core/platform/tests/test-platform-general.c +++ b/src/core/platform/tests/test-platform-general.c @@ -8,7 +8,7 @@ #include #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" diff --git a/src/core/platform/tests/test-route.c b/src/core/platform/tests/test-route.c index 6fdb2f5b24..2b9b2f8f67 100644 --- a/src/core/platform/tests/test-route.c +++ b/src/core/platform/tests/test-route.c @@ -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" diff --git a/src/core/platform/tests/test-tc.c b/src/core/platform/tests/test-tc.c index e0c102e6cc..cd9536cced 100644 --- a/src/core/platform/tests/test-tc.c +++ b/src/core/platform/tests/test-tc.c @@ -5,7 +5,7 @@ #include #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" diff --git a/src/core/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c index a14d1c3552..137fccf31f 100644 --- a/src/core/ppp/nm-ppp-manager.c +++ b/src/core/ppp/nm-ppp-manager.c @@ -28,7 +28,7 @@ #include #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" diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index cbe363de02..9100beb8ac 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -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" diff --git a/src/core/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c index e9b084f0bd..8db44c46ef 100644 --- a/src/core/supplicant/nm-supplicant-manager.c +++ b/src/core/supplicant/nm-supplicant-manager.c @@ -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" /*****************************************************************************/ diff --git a/src/core/tests/test-ip4-config.c b/src/core/tests/test-ip4-config.c index 27b1d61139..3a095d4ad9 100644 --- a/src/core/tests/test-ip4-config.c +++ b/src/core/tests/test-ip4-config.c @@ -8,7 +8,7 @@ #include #include "nm-ip4-config.h" -#include "platform/nm-platform.h" +#include "libnm-platform/nm-platform.h" #include "nm-test-utils-core.h" diff --git a/src/core/tests/test-ip6-config.c b/src/core/tests/test-ip6-config.c index 3b48fb7f38..ddf4c789c8 100644 --- a/src/core/tests/test-ip6-config.c +++ b/src/core/tests/test-ip6-config.c @@ -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 * diff --git a/src/core/tests/test-l3cfg.c b/src/core/tests/test-l3cfg.c index 43132c6d93..f2af928a8a 100644 --- a/src/core/tests/test-l3cfg.c +++ b/src/core/tests/test-l3cfg.c @@ -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" diff --git a/src/core/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c index 3d110b2888..ba5e36dab2 100644 --- a/src/core/vpn/nm-vpn-connection.c +++ b/src/core/vpn/nm-vpn-connection.c @@ -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" diff --git a/src/libnm-platform/meson.build b/src/libnm-platform/meson.build index c91c5292f3..3e4f41a929 100644 --- a/src/libnm-platform/meson.build +++ b/src/libnm-platform/meson.build @@ -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', diff --git a/src/core/platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c similarity index 99% rename from src/core/platform/nm-linux-platform.c rename to src/libnm-platform/nm-linux-platform.c index 3404c61c60..d689dfae63 100644 --- a/src/core/platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.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" diff --git a/src/core/platform/nm-linux-platform.h b/src/libnm-platform/nm-linux-platform.h similarity index 100% rename from src/core/platform/nm-linux-platform.h rename to src/libnm-platform/nm-linux-platform.h diff --git a/src/core/platform/nm-platform-private.h b/src/libnm-platform/nm-platform-private.h similarity index 100% rename from src/core/platform/nm-platform-private.h rename to src/libnm-platform/nm-platform-private.h diff --git a/src/core/platform/nm-platform.c b/src/libnm-platform/nm-platform.c similarity index 99% rename from src/core/platform/nm-platform.c rename to src/libnm-platform/nm-platform.c index 79cb02bfb8..6049906a62 100644 --- a/src/core/platform/nm-platform.c +++ b/src/libnm-platform/nm-platform.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-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" diff --git a/src/core/platform/nm-platform.h b/src/libnm-platform/nm-platform.h similarity index 100% rename from src/core/platform/nm-platform.h rename to src/libnm-platform/nm-platform.h diff --git a/src/core/platform/nmp-object.c b/src/libnm-platform/nmp-object.c similarity index 99% rename from src/core/platform/nmp-object.c rename to src/libnm-platform/nmp-object.c index 4241ecf650..b27d8dfd99 100644 --- a/src/core/platform/nmp-object.c +++ b/src/libnm-platform/nmp-object.c @@ -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" diff --git a/src/core/platform/nmp-object.h b/src/libnm-platform/nmp-object.h similarity index 100% rename from src/core/platform/nmp-object.h rename to src/libnm-platform/nmp-object.h diff --git a/src/core/platform/nmp-rules-manager.c b/src/libnm-platform/nmp-rules-manager.c similarity index 99% rename from src/core/platform/nmp-rules-manager.c rename to src/libnm-platform/nmp-rules-manager.c index bdaefc8eab..636c90b299 100644 --- a/src/core/platform/nmp-rules-manager.c +++ b/src/libnm-platform/nmp-rules-manager.c @@ -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 #include +#include "libnm-log-core/nm-logging.h" #include "libnm-std-aux/c-list-util.h" #include "nmp-object.h" diff --git a/src/core/platform/nmp-rules-manager.h b/src/libnm-platform/nmp-rules-manager.h similarity index 100% rename from src/core/platform/nmp-rules-manager.h rename to src/libnm-platform/nmp-rules-manager.h