diff --git a/.travis.yml b/.travis.yml index 44e5e0a247..798db66971 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - sudo apt-get install libnl-3-dev libndp-dev automake script: | - sh autogen.sh --with-systemd-logind=no --enable-more-warnings=no && + sh autogen.sh --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-ifupdown --enable-ifnet --enable-tests && make -j4 && ./contrib/travis/travis-check.sh diff --git a/Makefile.am b/Makefile.am index b7dbdcd9d7..c3896081fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -439,6 +439,23 @@ libnminclude_HEADERS += $(libnm_core_libnm_core_headers) ############################################################################### +dflt_cppflags_libnm_core = \ + -I${srcdir}/shared \ + -I${builddir}/shared \ + -I${srcdir}/libnm-core \ + -I${builddir}/libnm-core \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(JANSSON_CFLAGS) + +if WITH_GNUTLS +dflt_cppflags_libnm_core += $(GNUTLS_CFLAGS) +endif + +if WITH_NSS +dflt_cppflags_libnm_core += $(NSS_CFLAGS) +endif + noinst_LTLIBRARIES += libnm-core/libnm-core.la GLIB_GENERATED += \ @@ -448,20 +465,14 @@ GLIB_GENERATED += \ nm_core_enum_types_sources = $(filter-out %nm-core-enum-types.h,$(libnm_core_libnm_core_headers)) libnm_core_libnm_core_la_CPPFLAGS = \ - -I${srcdir}/shared \ - -I${builddir}/shared \ - -I${srcdir}/libnm-core \ - -I${builddir}/libnm-core \ + $(dflt_cppflags_libnm_core) \ -DG_LOG_DOMAIN=\""libnm"\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ -DNMPLUGINDIR=\"$(pkglibdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - $(JANSSON_CFLAGS) + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_libnm_core_sources) \ @@ -476,13 +487,11 @@ libnm_core_libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) if WITH_GNUTLS -libnm_core_libnm_core_la_CPPFLAGS += $(GNUTLS_CFLAGS) libnm_core_libnm_core_la_SOURCES += libnm-core/crypto_gnutls.c libnm_core_libnm_core_la_LIBADD += $(GNUTLS_LIBS) endif if WITH_NSS -libnm_core_libnm_core_la_CPPFLAGS += $(NSS_CFLAGS) libnm_core_libnm_core_la_SOURCES += libnm-core/crypto_nss.c libnm_core_libnm_core_la_LIBADD += $(NSS_LIBS) endif @@ -519,14 +528,9 @@ GLIB_GENERATED += \ nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h libnm_core_tests_cppflags = \ - -I${srcdir}/shared \ - -I${builddir}/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ + $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm-core/tests \ -I$(builddir)/libnm-core/tests \ - -DNETWORKMANAGER_COMPILATION \ - $(GLIB_CFLAGS) \ -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags) @@ -647,19 +651,14 @@ nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' -nm_src_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' -nm_src_enum_types_sources = $(filter-out \ - %/nm-device-private.h \ - %/nm-rdisc-private.h \ - %/wifi-utils-private.h \ - %/nm-dhcp-client-logging.h \ - %/nm-device-logging.h \ - , $(src_libNetworkManager_la_SOURCES)) - -############################################################################### - EXTRA_DIST += \ src/org.freedesktop.NetworkManager.conf \ src/nm-test-utils-core.h \ @@ -1529,27 +1468,16 @@ src_dhcp_manager_nm_dhcp_helper_LDADD = $(GLIB_LIBS) ############################################################################### src_dhcp_manager_tests_cppflags = \ - -I$(top_srcdir)/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I$(top_srcdir)/src/dhcp-manager \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/platform \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ + $(src_tests_cppflags) \ -DTESTDIR="\"$(abs_srcdir)/src/dhcp-manager/tests\"" src_dhcp_manager_tests_ldadd = \ - src/libNetworkManager.la + src/libNetworkManagerTest.la -src_dhcp_manager_tests_programs = \ +check_programs += \ src/dhcp-manager/tests/test-dhcp-dhclient \ src/dhcp-manager/tests/test-dhcp-utils -check_programs += $(src_dhcp_manager_tests_programs) - src_dhcp_manager_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_manager_tests_cppflags) src_dhcp_manager_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_manager_tests_cppflags) @@ -1603,27 +1531,17 @@ endif check_programs += src/settings/plugins/keyfile/tests/test-keyfile src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/settings \ + $(src_tests_cppflags) \ -I$(top_srcdir)/src/settings/plugins/keyfile \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\" \ - -DNMCONFDIR=\"nonexistent\" + -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\" src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ - src/libNetworkManager.la + src/libNetworkManagerTest.la EXTRA_DIST += \ src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \ @@ -1732,7 +1650,7 @@ src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \ src_settings_plugins_ibft_tests_test_ibft_LDADD = \ src/settings/plugins/ibft/libnms-ibft-core.la \ - src/libNetworkManager.la + src/libNetworkManagerTest.la EXTRA_DIST += \ src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ @@ -1849,22 +1767,10 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \ src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/settings \ + $(src_tests_cppflags) \ -I$(top_srcdir)/src/settings/plugins/ifcfg-rh \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\" \ - -DSYSCONFDIR=\"nonexistent\" \ - -DSBINDIR=\"nonexistent\" + -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\" src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ $(GLIB_LIBS) \ @@ -1872,7 +1778,7 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ - src/libNetworkManager.la + src/libNetworkManagerTest.la endif @@ -2125,7 +2031,7 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ - src/libNetworkManager.la + src/libNetworkManagerTest.la endif @@ -2238,7 +2144,7 @@ src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS = \ src_settings_plugins_ifnet_tests_test_ifnet_LDADD = \ src/settings/plugins/ifnet/libnms-ifnet-core.la \ - src/libNetworkManager.la + src/libNetworkManagerTest.la endif @@ -2345,7 +2251,6 @@ src_devices_wwan_libnm_wwan_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/src/devices/wwan/libnm-wwan.ver" src_devices_wwan_libnm_wwan_la_LIBADD = \ - $(top_builddir)/introspection/libnmdbus.la \ $(GLIB_LIBS) \ $(LIBSYSTEMD_LIBS) \ $(MM_GLIB_LIBS) @@ -2533,7 +2438,7 @@ src_devices_wifi_tests_test_general_CPPFLAGS = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) -src_devices_wifi_tests_test_general_LDADD = src/libNetworkManager.la +src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la endif @@ -2591,67 +2496,21 @@ endif check_programs += src/dnsmasq-manager/tests/test-dnsmasq-utils src_dnsmasq_manager_tests_test_dnsmasq_utils_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I$(top_srcdir)/src/dnsmasq-manager \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/platform \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ + $(src_tests_cppflags) \ -DTESTDIR="\"$(abs_srcdir)\"" src_dnsmasq_manager_tests_test_dnsmasq_utils_LDADD = \ - src/libNetworkManager.la + src/libNetworkManagerTest.la ############################################################################### # src/platform/tests ############################################################################### -src_platform_tests_cppflags = \ - -I${top_srcdir} \ - -I${top_srcdir}/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/src \ - -I${top_builddir}/src \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${srcdir}/src/platform \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - $(LIBNL_CFLAGS) - -check_ltlibraries += \ - src/platform/tests/libnm-platform-tests.la - -src_platform_tests_libnm_platform_tests_la_SOURCES = \ - src/platform/tests/test-common.c \ - src/platform/tests/test-common.h -src_platform_tests_libnm_platform_tests_la_CPPFLAGS = $(src_platform_tests_cppflags) -if REQUIRE_ROOT_TESTS -src_platform_tests_libnm_platform_tests_la_CPPFLAGS += -DREQUIRE_ROOT_TESTS=1 -endif -src_platform_tests_libnm_platform_tests_la_LDFLAGS = \ - $(CODE_COVERAGE_LDFLAGS) -src_platform_tests_libnm_platform_tests_la_LIBADD = \ - src/libNetworkManagerTest.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ - $(LIBNL_LIBS) - -src_platform_tests_cppflags_linux = $(src_platform_tests_cppflags) -DSETUP=nm_linux_platform_setup -src_platform_tests_cppflags_fake = $(src_platform_tests_cppflags) -DSETUP=nm_fake_platform_setup - src_platform_tests_ldflags = \ $(CODE_COVERAGE_LDFLAGS) src_platform_tests_libadd = \ - src/platform/tests/libnm-platform-tests.la \ + src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ $(GUDEV_LIBS) \ $(LIBNL_LIBS) @@ -2671,55 +2530,55 @@ check_programs += \ src/platform/tests/test-cleanup-fake \ src/platform/tests/test-cleanup-linux -src_platform_tests_monitor_CPPFLAGS = $(src_platform_tests_cppflags) +src_platform_tests_monitor_CPPFLAGS = $(src_tests_cppflags) src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd) src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c -src_platform_tests_test_link_fake_CPPFLAGS = $(src_platform_tests_cppflags_fake) +src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake) src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd) src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c -src_platform_tests_test_link_linux_CPPFLAGS = $(src_platform_tests_cppflags_linux) +src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux) src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd) src_platform_tests_test_address_fake_SOURCES = src/platform/tests/test-address.c -src_platform_tests_test_address_fake_CPPFLAGS = $(src_platform_tests_cppflags_fake) +src_platform_tests_test_address_fake_CPPFLAGS = $(src_tests_cppflags_fake) src_platform_tests_test_address_fake_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_address_fake_LDADD = $(src_platform_tests_libadd) src_platform_tests_test_address_linux_SOURCES = src/platform/tests/test-address.c -src_platform_tests_test_address_linux_CPPFLAGS = $(src_platform_tests_cppflags_linux) +src_platform_tests_test_address_linux_CPPFLAGS = $(src_tests_cppflags_linux) src_platform_tests_test_address_linux_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_address_linux_LDADD = $(src_platform_tests_libadd) src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c -src_platform_tests_test_route_fake_CPPFLAGS = $(src_platform_tests_cppflags_fake) +src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake) src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd) src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c -src_platform_tests_test_route_linux_CPPFLAGS = $(src_platform_tests_cppflags_linux) +src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux) src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd) src_platform_tests_test_cleanup_fake_SOURCES = src/platform/tests/test-cleanup.c -src_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_platform_tests_cppflags_fake) +src_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_tests_cppflags_fake) src_platform_tests_test_cleanup_fake_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_cleanup_fake_LDADD = $(src_platform_tests_libadd) src_platform_tests_test_cleanup_linux_SOURCES = src/platform/tests/test-cleanup.c -src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_platform_tests_cppflags_linux) +src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux) src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd) -src_platform_tests_test_nmp_object_CPPFLAGS = $(src_platform_tests_cppflags) +src_platform_tests_test_nmp_object_CPPFLAGS = $(src_tests_cppflags) src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la -src_platform_tests_test_general_CPPFLAGS = $(src_platform_tests_cppflags) +src_platform_tests_test_general_CPPFLAGS = $(src_tests_cppflags) src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la @@ -2727,21 +2586,6 @@ src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la # src/devices/tests ############################################################################### -src_devices_tests_cppflags = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/devices \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/src/platform/tests \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(CODE_COVERAGE_CFLAGS) \ - $(GLIB_CFLAGS) - src_devices_tests_ldflags = \ $(CODE_COVERAGE_LDFLAGS) @@ -2749,35 +2593,20 @@ check_programs += \ src/devices/tests/test-lldp \ src/devices/tests/test-arping -src_devices_tests_test_lldp_CPPFLAGS = $(src_devices_tests_cppflags) +src_devices_tests_test_lldp_CPPFLAGS = $(src_tests_cppflags) src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags) src_devices_tests_test_lldp_LDADD = \ - src/platform/tests/libnm-platform-tests.la + src/libNetworkManagerTest.la -src_devices_tests_test_arping_CPPFLAGS = $(src_devices_tests_cppflags) +src_devices_tests_test_arping_CPPFLAGS = $(src_tests_cppflags) src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags) src_devices_tests_test_arping_LDADD = \ - src/platform/tests/libnm-platform-tests.la + src/libNetworkManagerTest.la ############################################################################### # src/rdisc/tests ############################################################################### -src_rdisc_tests_cppflags = \ - -I${top_srcdir} \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/platform \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${srcdir}/src/rdisc \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - $(LIBNDP_CFLAGS) - src_rdisc_tests_ldflags = \ $(CODE_COVERAGE_LDFLAGS) @@ -2788,11 +2617,11 @@ src_rdisc_tests_ldadd = \ check_programs += src/rdisc/tests/test-rdisc-fake check_programs_norun += src/rdisc/tests/test-rdisc-linux -src_rdisc_tests_test_rdisc_linux_CPPFLAGS = $(src_rdisc_tests_cppflags) +src_rdisc_tests_test_rdisc_linux_CPPFLAGS = $(src_tests_cppflags) src_rdisc_tests_test_rdisc_linux_LDFLAGS = $(src_rdisc_tests_flags) src_rdisc_tests_test_rdisc_linux_LDADD = $(src_rdisc_tests_ldadd) -src_rdisc_tests_test_rdisc_fake_CPPFLAGS = $(src_rdisc_tests_cppflags) +src_rdisc_tests_test_rdisc_fake_CPPFLAGS = $(src_tests_cppflags) src_rdisc_tests_test_rdisc_fake_LDFLAGS = $(src_rdisc_tests_flags) src_rdisc_tests_test_rdisc_fake_LDADD = $(src_rdisc_tests_ldadd) @@ -2803,19 +2632,11 @@ src_rdisc_tests_test_rdisc_fake_LDADD = $(src_rdisc_tests_ldadd) check_programs += src/supplicant-manager/tests/test-supplicant-config src_supplicant_manager_tests_test_supplicant_config_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/supplicant-manager \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant-manager/tests/certs\" \ - $(GLIB_CFLAGS) + $(src_tests_cppflags) \ + -DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant-manager/tests/certs\" src_supplicant_manager_tests_test_supplicant_config_LDADD = \ - src/libNetworkManager.la + src/libNetworkManagerTest.la EXTRA_DIST += \ src/supplicant-manager/tests/certs/test-ca-cert.pem \ @@ -2833,16 +2654,7 @@ src_tests_config_test_config_SOURCES = \ src/tests/config/test-config.c src_tests_config_test_config_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/devices \ - -I${top_srcdir}/src/platform \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ + $(src_tests_cppflags) \ -DSRCDIR=\""$(abs_srcdir)/src/tests/config"\" \ -DBUILDDIR=\""$(abs_builddir)/src/tests/config"\" @@ -2863,26 +2675,11 @@ EXTRA_DIST += \ # src/tests ############################################################################### -src_tests_cppflags = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/dhcp-manager \ - -I$(top_srcdir)/src/devices \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) - src_tests_ldflags = \ $(CODE_COVERAGE_LDFLAGS) src_tests_ldadd = \ - src/libNetworkManager.la + src/libNetworkManagerTest.la check_programs += \ src/tests/test-general \ @@ -2930,30 +2727,22 @@ src_tests_test_utils_LDFLAGS = $(src_tests_ldflags) src_tests_test_utils_LDADD = $(src_tests_ldadd) -src_tests_test_route_manager_cppflags = \ - -I$(top_srcdir)/src/platform/tests \ - $(src_tests_cppflags) \ - $(GUDEV_CFLAGS) - src_tests_test_route_manager_ldflags = \ $(CODE_COVERAGE_LDFLAGS) src_tests_test_route_manager_ldadd = \ - src/platform/tests/libnm-platform-tests.la \ + src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ $(GUDEV_LIBS) \ $(LIBNL_LIBS) -src_tests_test_route_manager_cppflags_fake = $(src_tests_test_route_manager_cppflags) -DSETUP=nm_fake_platform_setup -src_tests_test_route_manager_cppflags_linux = $(src_tests_test_route_manager_cppflags) -DSETUP=nm_linux_platform_setup - src_tests_test_route_manager_fake_SOURCES = src/tests/test-route-manager.c -src_tests_test_route_manager_fake_CPPFLAGS = $(src_tests_test_route_manager_cppflags_fake) +src_tests_test_route_manager_fake_CPPFLAGS = $(src_tests_cppflags_fake) src_tests_test_route_manager_fake_LDFLAGS = $(src_tests_test_route_manager_ldflags) src_tests_test_route_manager_fake_LDADD = $(src_tests_test_route_manager_ldadd) src_tests_test_route_manager_linux_SOURCES = src/tests/test-route-manager.c -src_tests_test_route_manager_linux_CPPFLAGS = $(src_tests_test_route_manager_cppflags_linux) +src_tests_test_route_manager_linux_CPPFLAGS = $(src_tests_cppflags_linux) src_tests_test_route_manager_linux_LDFLAGS = $(src_tests_test_route_manager_ldflags) src_tests_test_route_manager_linux_LDADD = $(src_tests_test_route_manager_ldadd) @@ -2983,7 +2772,6 @@ dispatcher_cppflags = \ -I${top_srcdir}/dispatcher \ -I${top_builddir}/dispatcher \ $(GLIB_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" @@ -3076,7 +2864,6 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ -I$(top_builddir)/libnm-core \ -I$(top_srcdir)/dispatcher \ -I$(top_builddir)/dispatcher \ - -DNETWORKMANAGER_COMPILATION \ -DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \ $(GLIB_CFLAGS) diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index ff4e4cd92a..97552950b4 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -33,7 +33,6 @@ #include #include "nm-device-private.h" -#include "nm-src-enum-types.h" #include "nm-platform.h" #include "ppp-manager/nm-ppp-manager.h" #include "ppp-manager/nm-ppp-status.h" @@ -235,12 +234,14 @@ error: static void link_changed_cb (NMPlatform *platform, - NMPObjectType obj_type, + int obj_type_i, int ifindex, NMPlatformLink *info, - NMPlatformSignalChangeType change_type, + int change_type_i, NMDeviceAdsl *self) { + const NMPlatformSignalChangeType change_type = change_type_i; + if (change_type == NM_PLATFORM_SIGNAL_REMOVED) { NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self); NMDevice *device = NM_DEVICE (self); @@ -248,11 +249,11 @@ link_changed_cb (NMPlatform *platform, /* This only gets called for PPPoE connections and "nas" interfaces */ if (priv->nas_ifindex > 0 && ifindex == priv->nas_ifindex) { - /* NAS device went away for some reason; kill the connection */ - _LOGD (LOGD_ADSL, "br2684 interface disappeared"); - nm_device_state_changed (device, - NM_DEVICE_STATE_FAILED, - NM_DEVICE_STATE_REASON_BR2684_FAILED); + /* NAS device went away for some reason; kill the connection */ + _LOGD (LOGD_ADSL, "br2684 interface disappeared"); + nm_device_state_changed (device, + NM_DEVICE_STATE_FAILED, + NM_DEVICE_STATE_REASON_BR2684_FAILED); } } } diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c index 69045e6ddd..e70b1ba0f4 100644 --- a/src/devices/nm-device-bond.c +++ b/src/devices/nm-device-bond.c @@ -28,7 +28,6 @@ #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-platform.h" -#include "nm-src-enum-types.h" #include "nm-device-factory.h" #include "nm-core-internal.h" #include "nm-ip4-config.h" diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index f727f5c34a..326cafd6bf 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -26,7 +26,6 @@ #include "NetworkManagerUtils.h" #include "nm-device-private.h" -#include "nm-src-enum-types.h" #include "nm-platform.h" #include "nm-device-factory.h" #include "nm-core-internal.h" diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 0c23b3dc07..b99271afdd 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -40,7 +40,6 @@ #include "nm-supplicant-config.h" #include "ppp-manager/nm-ppp-manager.h" #include "ppp-manager/nm-ppp-status.h" -#include "nm-src-enum-types.h" #include "nm-platform.h" #include "nm-platform-utils.h" #include "nm-dcb.h" diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c index 457b92aeac..8116d9edd7 100644 --- a/src/devices/nm-device-generic.c +++ b/src/devices/nm-device-generic.c @@ -23,7 +23,6 @@ #include "nm-device-generic.h" #include "nm-device-private.h" -#include "nm-src-enum-types.h" #include "nm-platform.h" #include "nm-core-internal.h" diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index c8805729c9..fa0d591754 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -26,7 +26,6 @@ #include "NetworkManagerUtils.h" #include "nm-device-private.h" -#include "nm-src-enum-types.h" #include "nm-act-request.h" #include "nm-ip4-config.h" #include "nm-platform.h" diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index de580ed988..71364658e6 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -28,7 +28,6 @@ #include "nm-utils.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" -#include "nm-src-enum-types.h" #include "nm-settings.h" #include "nm-act-request.h" #include "nm-ip4-config.h" diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c508dcc0b4..0d4813e2e6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -53,7 +53,6 @@ #include "nm-dhcp6-config.h" #include "nm-rfkill-manager.h" #include "nm-firewall-manager.h" -#include "nm-src-enum-types.h" #include "nm-settings-connection.h" #include "nm-settings.h" #include "nm-auth-utils.h" @@ -2003,12 +2002,13 @@ device_ip_link_changed (NMDevice *self) static void link_changed_cb (NMPlatform *platform, - NMPObjectType obj_type, + int obj_type_i, int ifindex, NMPlatformLink *info, - NMPlatformSignalChangeType change_type, + int change_type_i, NMDevice *self) { + const NMPlatformSignalChangeType change_type = change_type_i; NMDevicePrivate *priv; if (change_type != NM_PLATFORM_SIGNAL_CHANGED) @@ -9719,12 +9719,14 @@ queued_ip6_config_change (gpointer user_data) static void device_ipx_changed (NMPlatform *platform, - NMPObjectType obj_type, + int obj_type_i, int ifindex, gpointer platform_object, - NMPlatformSignalChangeType change_type, + int change_type_i, NMDevice *self) { + const NMPObjectType obj_type = obj_type_i; + const NMPlatformSignalChangeType change_type = change_type_i; NMDevicePrivate *priv; NMPlatformIP6Address *addr; diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index ff3a6f0b26..c2654b7bf9 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -32,7 +32,6 @@ #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-platform.h" -#include "nm-src-enum-types.h" #include "nm-core-internal.h" #include "nm-ip4-config.h" #include "nm-dbus-compat.h" diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index 95d6dd8d95..78bb4ca678 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -46,7 +46,6 @@ #include "nm-setting-connection.h" #include "nm-setting-olpc-mesh.h" #include "nm-manager.h" -#include "nm-src-enum-types.h" #include "nm-platform.h" /* This is a bug; but we can't really change API now... */ diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 38b4501fe2..320d3a1c55 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -48,7 +48,6 @@ #include "nm-auth-utils.h" #include "nm-settings-connection.h" #include "nm-settings.h" -#include "nm-src-enum-types.h" #include "nm-core-internal.h" #include "nm-config.h" diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c index 5b2e618b2d..56bd9d1768 100644 --- a/src/dhcp-manager/nm-dhcp-listener.c +++ b/src/dhcp-manager/nm-dhcp-listener.c @@ -30,6 +30,7 @@ #include #include "nm-dhcp-helper-api.h" +#include "nm-dhcp-client.h" #include "nm-core-internal.h" #include "nm-bus-manager.h" #include "NetworkManagerUtils.h" @@ -39,6 +40,21 @@ /*****************************************************************************/ +const NMDhcpClientFactory *const _nm_dhcp_manager_factories[3] = { + /* the order here matters, as we will try the plugins in this order to find + * the first available plugin. */ + +#if WITH_DHCLIENT + &_nm_dhcp_client_factory_dhclient, +#endif +#if WITH_DHCPCD + &_nm_dhcp_client_factory_dhcpcd, +#endif + &_nm_dhcp_client_factory_internal, +}; + +/*****************************************************************************/ + typedef struct { NMBusManager * dbus_mgr; gulong new_conn_id; diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 570626dbc7..cc0289c9ab 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -67,22 +67,6 @@ const char *nm_dhcp_helper_path = LIBEXECDIR "/nm-dhcp-helper"; /*****************************************************************************/ -const NMDhcpClientFactory *const _factories[] = { - - /* the order here matters, as we will try the plugins in this order to find - * the first available plugin. */ - -#ifndef NM_DHCP_INTERNAL_ONLY -#if WITH_DHCLIENT - &_nm_dhcp_client_factory_dhclient, -#endif -#if WITH_DHCPCD - &_nm_dhcp_client_factory_dhcpcd, -#endif -#endif - &_nm_dhcp_client_factory_internal, -}; - static const NMDhcpClientFactory * _client_factory_find_by_name (const char *name) { @@ -90,10 +74,10 @@ _client_factory_find_by_name (const char *name) g_return_val_if_fail (name, NULL); - for (i = 0; i < G_N_ELEMENTS (_factories); i++) { - const NMDhcpClientFactory *f = _factories[i]; + for (i = 0; i < G_N_ELEMENTS (_nm_dhcp_manager_factories); i++) { + const NMDhcpClientFactory *f = _nm_dhcp_manager_factories[i]; - if (nm_streq (f->name, name)) + if (f && nm_streq (f->name, name)) return f; } return NULL; @@ -349,8 +333,11 @@ nm_dhcp_manager_init (NMDhcpManager *self) int i; const NMDhcpClientFactory *client_factory = NULL; - for (i = 0; i < G_N_ELEMENTS (_factories); i++) { - const NMDhcpClientFactory *f = _factories[i]; + for (i = 0; i < G_N_ELEMENTS (_nm_dhcp_manager_factories); i++) { + const NMDhcpClientFactory *f = _nm_dhcp_manager_factories[i]; + + if (!f) + continue; nm_log_dbg (LOGD_DHCP, "dhcp-init: enabled DHCP client '%s' (%s)%s", f->name, g_type_name (f->get_type ()), @@ -370,8 +357,8 @@ nm_dhcp_manager_init (NMDhcpManager *self) nm_log_warn (LOGD_DHCP, "dhcp-init: DHCP client '%s' not available", client); } if (!client_factory) { - for (i = 0; i < G_N_ELEMENTS (_factories); i++) { - client_factory = _client_factory_available (_factories[i]); + for (i = 0; i < G_N_ELEMENTS (_nm_dhcp_manager_factories); i++) { + client_factory = _client_factory_available (_nm_dhcp_manager_factories[i]); if (client_factory) break; } diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index 32477a658e..e525180d43 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -81,4 +81,6 @@ GSList * nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self, /* For testing only */ extern const char* nm_dhcp_helper_path; +extern const NMDhcpClientFactory *const _nm_dhcp_manager_factories[3]; + #endif /* __NETWORKMANAGER_DHCP_MANAGER_H__ */ diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c index 04c2a6f9a3..9819ca700c 100644 --- a/src/nm-auth-subject.c +++ b/src/nm-auth-subject.c @@ -34,7 +34,6 @@ #include #include "nm-bus-manager.h" -#include "nm-src-enum-types.h" #include "NetworkManagerUtils.h" enum { @@ -213,7 +212,7 @@ _new_unix_process (GDBusMethodInvocation *context, g_return_val_if_fail (pid > 0 && pid <= MIN (G_MAXINT, G_MAXINT32), NULL); self = NM_AUTH_SUBJECT (g_object_new (NM_TYPE_AUTH_SUBJECT, - NM_AUTH_SUBJECT_SUBJECT_TYPE, NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS, + NM_AUTH_SUBJECT_SUBJECT_TYPE, (int) NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS, NM_AUTH_SUBJECT_UNIX_PROCESS_DBUS_SENDER, dbus_sender, NM_AUTH_SUBJECT_UNIX_PROCESS_PID, (gulong) pid, NM_AUTH_SUBJECT_UNIX_PROCESS_UID, (gulong) uid, @@ -252,7 +251,7 @@ NMAuthSubject * nm_auth_subject_new_internal (void) { return NM_AUTH_SUBJECT (g_object_new (NM_TYPE_AUTH_SUBJECT, - NM_AUTH_SUBJECT_SUBJECT_TYPE, NM_AUTH_SUBJECT_TYPE_INTERNAL, + NM_AUTH_SUBJECT_SUBJECT_TYPE, (int) NM_AUTH_SUBJECT_TYPE_INTERNAL, NULL)); } @@ -265,7 +264,7 @@ get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) switch (prop_id) { case PROP_SUBJECT_TYPE: - g_value_set_enum (value, priv->subject_type); + g_value_set_int (value, priv->subject_type); break; case PROP_UNIX_PROCESS_DBUS_SENDER: g_value_set_string (value, priv->unix_process.dbus_sender); @@ -287,14 +286,16 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *p { NMAuthSubjectPrivate *priv = NM_AUTH_SUBJECT_GET_PRIVATE ((NMAuthSubject *) object); NMAuthSubjectType subject_type; + int i; const char *str; gulong id; /* all properties are construct-only */ switch (prop_id) { case PROP_SUBJECT_TYPE: - subject_type = g_value_get_enum (value); - g_return_if_fail (subject_type != NM_AUTH_SUBJECT_TYPE_INVALID); + i = g_value_get_int (value); + g_return_if_fail (NM_IN_SET (i, (int) NM_AUTH_SUBJECT_TYPE_INTERNAL, (int) NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS)); + subject_type = i; priv->subject_type |= subject_type; g_return_if_fail (priv->subject_type == subject_type); break; @@ -414,12 +415,13 @@ nm_auth_subject_class_init (NMAuthSubjectClass *config_class) g_object_class_install_property (object_class, PROP_SUBJECT_TYPE, - g_param_spec_enum (NM_AUTH_SUBJECT_SUBJECT_TYPE, "", "", - NM_TYPE_AUTH_SUBJECT_TYPE, - NM_AUTH_SUBJECT_TYPE_INVALID, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_STRINGS)); + g_param_spec_int (NM_AUTH_SUBJECT_SUBJECT_TYPE, "", "", + NM_AUTH_SUBJECT_TYPE_INVALID, + NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS, + NM_AUTH_SUBJECT_TYPE_INVALID, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); g_object_class_install_property (object_class, PROP_UNIX_PROCESS_DBUS_SENDER, diff --git a/src/nm-config.c b/src/nm-config.c index 2d7237faa8..46fce99820 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -29,7 +29,6 @@ #include "nm-utils.h" #include "nm-device.h" #include "NetworkManagerUtils.h" -#include "nm-src-enum-types.h" #include "nm-core-internal.h" #include "nm-keyfile-internal.h" diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c index c93e46fca2..cf0fae0769 100644 --- a/src/nm-default-route-manager.c +++ b/src/nm-default-route-manager.c @@ -1364,12 +1364,14 @@ _platform_ipx_route_changed_cb (const VTableIP *vtable, static void _platform_changed_cb (NMPlatform *platform, - NMPObjectType obj_type, + int obj_type_i, int ifindex, gpointer platform_object, - NMPlatformSignalChangeType change_type, + int change_type_i, NMDefaultRouteManager *self) { + const NMPObjectType obj_type = obj_type_i; + switch (obj_type) { case NMP_OBJECT_TYPE_IP4_ADDRESS: _platform_ipx_route_changed_cb (&vtable_ip4, self, NULL); diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 9f66ff145f..a64f876126 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -333,12 +333,14 @@ do_early_setup (int *argc, char **argv[]) static void ip6_address_changed (NMPlatform *platform, - NMPObjectType obj_type, + int obj_type_i, int iface, NMPlatformIP6Address *addr, - NMPlatformSignalChangeType change_type, + int change_type_i, NMRDisc *rdisc) { + const NMPlatformSignalChangeType change_type = change_type_i; + if ( (change_type == NM_PLATFORM_SIGNAL_CHANGED && addr->n_ifa_flags & IFA_F_DADFAILED) || (change_type == NM_PLATFORM_SIGNAL_REMOVED && addr->n_ifa_flags & IFA_F_TENTATIVE)) nm_rdisc_dad_failed (rdisc, &addr->address); @@ -544,6 +546,12 @@ main (int argc, char *argv[]) return 0; } +/*****************************************************************************/ + +const NMDhcpClientFactory *const _nm_dhcp_manager_factories[3] = { + &_nm_dhcp_client_factory_internal, +}; + /*****************************************************************************/ /* Stub functions */ diff --git a/src/nm-manager.c b/src/nm-manager.c index 1d70561777..93fd29b5a7 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -43,7 +43,6 @@ #include "nm-auth-manager.h" #include "NetworkManagerUtils.h" #include "nm-device-factory.h" -#include "nm-src-enum-types.h" #include "nm-sleep-monitor.h" #include "nm-connectivity.h" #include "nm-policy.h" @@ -2225,12 +2224,13 @@ out: static void platform_link_cb (NMPlatform *platform, - NMPObjectType obj_type, + int obj_type_i, int ifindex, NMPlatformLink *plink, - NMPlatformSignalChangeType change_type, + int change_type_i, gpointer user_data) { + const NMPlatformSignalChangeType change_type = change_type_i; PlatformLinkCbData *data; switch (change_type) { diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 8c97f911d0..2181a57c71 100644 --- a/src/nm-route-manager.c +++ b/src/nm-route-manager.c @@ -1027,12 +1027,13 @@ _ip4_device_routes_idle_cb (IP4DeviceRoutePurgeEntry *entry) static void _ip4_device_routes_ip4_route_changed (NMPlatform *platform, - NMPObjectType obj_type, + int obj_type_i, int ifindex, const NMPlatformIP4Route *route, - NMPlatformSignalChangeType change_type, + int change_type_i, NMRouteManager *self) { + const NMPlatformSignalChangeType change_type = change_type_i; NMRouteManagerPrivate *priv; NMPObject obj_needle; IP4DeviceRoutePurgeEntry *entry; diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index 3726518bf5..0f34b8453f 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -321,7 +321,7 @@ link_add (NMPlatform *platform, new_device = &g_array_index (priv->links, NMFakePlatformLink, priv->links->len - 1); if (device.link.ifindex) { - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_LINK_CHANGED, NMP_OBJECT_TYPE_LINK, device.link.ifindex, &device, NM_PLATFORM_SIGNAL_ADDED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_LINK_CHANGED, (int) NMP_OBJECT_TYPE_LINK, device.link.ifindex, &device, (int) NM_PLATFORM_SIGNAL_ADDED); link_changed (platform, &g_array_index (priv->links, NMFakePlatformLink, priv->links->len - 1), FALSE); } @@ -373,7 +373,7 @@ link_delete (NMPlatform *platform, int ifindex) memset (route, 0, sizeof (*route)); } - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_LINK_CHANGED, NMP_OBJECT_TYPE_LINK, ifindex, &deleted_device, NM_PLATFORM_SIGNAL_REMOVED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_LINK_CHANGED, (int) NMP_OBJECT_TYPE_LINK, ifindex, &deleted_device, (int) NM_PLATFORM_SIGNAL_REMOVED); return TRUE; } @@ -391,7 +391,7 @@ link_changed (NMPlatform *platform, NMFakePlatformLink *device, gboolean raise_s int i; if (raise_signal) - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_LINK_CHANGED, NMP_OBJECT_TYPE_LINK, device->link.ifindex, &device->link, NM_PLATFORM_SIGNAL_CHANGED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_LINK_CHANGED, (int) NMP_OBJECT_TYPE_LINK, device->link.ifindex, &device->link, (int) NM_PLATFORM_SIGNAL_CHANGED); if (device->link.ifindex && !IN6_IS_ADDR_UNSPECIFIED (&device->ip6_lladdr)) { if (device->link.connected) @@ -947,12 +947,12 @@ ip4_address_add (NMPlatform *platform, memcpy (item, &address, sizeof (address)); if (changed) - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ADDRESS_CHANGED, NMP_OBJECT_TYPE_IP4_ADDRESS, ifindex, &address, NM_PLATFORM_SIGNAL_CHANGED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ADDRESS_CHANGED, (int) NMP_OBJECT_TYPE_IP4_ADDRESS, ifindex, &address, (int) NM_PLATFORM_SIGNAL_CHANGED); return TRUE; } g_array_append_val (priv->ip4_addresses, address); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ADDRESS_CHANGED, NMP_OBJECT_TYPE_IP4_ADDRESS, ifindex, &address, NM_PLATFORM_SIGNAL_ADDED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ADDRESS_CHANGED, (int) NMP_OBJECT_TYPE_IP4_ADDRESS, ifindex, &address, (int) NM_PLATFORM_SIGNAL_ADDED); return TRUE; } @@ -994,12 +994,12 @@ ip6_address_add (NMPlatform *platform, memcpy (item, &address, sizeof (address)); if (changed) - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ADDRESS_CHANGED, NMP_OBJECT_TYPE_IP6_ADDRESS, ifindex, &address, NM_PLATFORM_SIGNAL_CHANGED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ADDRESS_CHANGED, (int) NMP_OBJECT_TYPE_IP6_ADDRESS, ifindex, &address, (int) NM_PLATFORM_SIGNAL_CHANGED); return TRUE; } g_array_append_val (priv->ip6_addresses, address); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ADDRESS_CHANGED, NMP_OBJECT_TYPE_IP6_ADDRESS, ifindex, &address, NM_PLATFORM_SIGNAL_ADDED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ADDRESS_CHANGED, (int) NMP_OBJECT_TYPE_IP6_ADDRESS, ifindex, &address, (int) NM_PLATFORM_SIGNAL_ADDED); return TRUE; } @@ -1021,7 +1021,7 @@ ip4_address_delete (NMPlatform *platform, int ifindex, in_addr_t addr, guint8 pl memcpy (&deleted_address, address, sizeof (deleted_address)); memset (address, 0, sizeof (*address)); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ADDRESS_CHANGED, NMP_OBJECT_TYPE_IP4_ADDRESS, ifindex, &deleted_address, NM_PLATFORM_SIGNAL_REMOVED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ADDRESS_CHANGED, (int) NMP_OBJECT_TYPE_IP4_ADDRESS, ifindex, &deleted_address, (int) NM_PLATFORM_SIGNAL_REMOVED); return TRUE; } } @@ -1045,7 +1045,7 @@ ip6_address_delete (NMPlatform *platform, int ifindex, struct in6_addr addr, gui memcpy (&deleted_address, address, sizeof (deleted_address)); memset (address, 0, sizeof (*address)); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ADDRESS_CHANGED, NMP_OBJECT_TYPE_IP6_ADDRESS, ifindex, &deleted_address, NM_PLATFORM_SIGNAL_REMOVED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ADDRESS_CHANGED, (int) NMP_OBJECT_TYPE_IP6_ADDRESS, ifindex, &deleted_address, (int) NM_PLATFORM_SIGNAL_REMOVED); return TRUE; } } @@ -1170,7 +1170,7 @@ ip4_route_delete (NMPlatform *platform, int ifindex, in_addr_t network, guint8 p memcpy (&deleted_route, route, sizeof (deleted_route)); g_array_remove_index (priv->ip4_routes, i); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, NMP_OBJECT_TYPE_IP4_ROUTE, ifindex, &deleted_route, NM_PLATFORM_SIGNAL_REMOVED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, (int) NMP_OBJECT_TYPE_IP4_ROUTE, ifindex, &deleted_route, (int) NM_PLATFORM_SIGNAL_REMOVED); } return TRUE; @@ -1196,7 +1196,7 @@ ip6_route_delete (NMPlatform *platform, int ifindex, struct in6_addr network, gu memcpy (&deleted_route, route, sizeof (deleted_route)); g_array_remove_index (priv->ip6_routes, i); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, NMP_OBJECT_TYPE_IP6_ROUTE, ifindex, &deleted_route, NM_PLATFORM_SIGNAL_REMOVED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, (int) NMP_OBJECT_TYPE_IP6_ROUTE, ifindex, &deleted_route, (int) NM_PLATFORM_SIGNAL_REMOVED); } return TRUE; @@ -1260,12 +1260,12 @@ ip4_route_add (NMPlatform *platform, int ifindex, NMIPConfigSource source, } memcpy (item, &route, sizeof (route)); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, NMP_OBJECT_TYPE_IP4_ROUTE, ifindex, &route, NM_PLATFORM_SIGNAL_CHANGED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, (int) NMP_OBJECT_TYPE_IP4_ROUTE, ifindex, &route, (int) NM_PLATFORM_SIGNAL_CHANGED); return TRUE; } g_array_append_val (priv->ip4_routes, route); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, NMP_OBJECT_TYPE_IP4_ROUTE, ifindex, &route, NM_PLATFORM_SIGNAL_ADDED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP4_ROUTE_CHANGED, (int) NMP_OBJECT_TYPE_IP4_ROUTE, ifindex, &route, (int) NM_PLATFORM_SIGNAL_ADDED); return TRUE; } @@ -1326,12 +1326,12 @@ ip6_route_add (NMPlatform *platform, int ifindex, NMIPConfigSource source, } memcpy (item, &route, sizeof (route)); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, NMP_OBJECT_TYPE_IP6_ROUTE, ifindex, &route, NM_PLATFORM_SIGNAL_CHANGED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, (int) NMP_OBJECT_TYPE_IP6_ROUTE, ifindex, &route, (int) NM_PLATFORM_SIGNAL_CHANGED); return TRUE; } g_array_append_val (priv->ip6_routes, route); - g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, NMP_OBJECT_TYPE_IP6_ROUTE, ifindex, &route, NM_PLATFORM_SIGNAL_ADDED); + g_signal_emit_by_name (platform, NM_PLATFORM_SIGNAL_IP6_ROUTE_CHANGED, (int) NMP_OBJECT_TYPE_IP6_ROUTE, ifindex, &route, (int) NM_PLATFORM_SIGNAL_ADDED); return TRUE; } diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 700f1e5d7e..bd69298fe8 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -2807,10 +2807,10 @@ do_emit_signal (NMPlatform *platform, const NMPObject *obj, NMPCacheOpsType cach g_signal_emit (platform, _nm_platform_signal_id_get (klass->signal_type_id), 0, - klass->obj_type, + (int) klass->obj_type, obj_clone.object.ifindex, &obj_clone.object, - (NMPlatformSignalChangeType) cache_op); + (int) cache_op); } /*****************************************************************************/ diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index d1bd44886f..0b1d25d302 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -37,7 +37,6 @@ #include "nm-core-internal.h" #include "nm-core-utils.h" -#include "nm-src-enum-types.h" #include "nm-platform-utils.h" #include "nmp-object.h" #include "nmp-netns.h" @@ -4295,7 +4294,12 @@ nm_platform_class_init (NMPlatformClass *platform_class) G_SIGNAL_RUN_FIRST, \ G_CALLBACK (method), \ NULL, NULL, NULL, \ - G_TYPE_NONE, 4, NM_TYPE_POBJECT_TYPE, G_TYPE_INT, G_TYPE_POINTER, NM_TYPE_PLATFORM_SIGNAL_CHANGE_TYPE); \ + G_TYPE_NONE, 4, \ + G_TYPE_INT, /* (int) NMPObjectType */ \ + G_TYPE_INT, /* ifindex */ \ + G_TYPE_POINTER /* const NMPObject * */, \ + G_TYPE_INT /* (int) NMPlatformSignalChangeType */ \ + ); \ } G_STMT_END /* Signals */ diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 5a1bc6736f..f23cec4606 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -149,12 +149,15 @@ _free_signal (const char *file, int line, const char *func, SignalData *data) } void -link_callback (NMPlatform *platform, NMPObjectType obj_type, int ifindex, NMPlatformLink *received, NMPlatformSignalChangeType change_type, SignalData *data) +link_callback (NMPlatform *platform, int obj_type_i, int ifindex, NMPlatformLink *received, int change_type_i, SignalData *data) { + const NMPObjectType obj_type = obj_type_i; + const NMPlatformSignalChangeType change_type = change_type_i; GArray *links; NMPlatformLink *cached; int i; + g_assert_cmpint (obj_type, ==, NMP_OBJECT_TYPE_LINK); g_assert (received); g_assert_cmpint (received->ifindex, ==, ifindex); g_assert (data && data->name); @@ -341,10 +344,10 @@ typedef struct { static void _wait_for_signal_cb (NMPlatform *platform, - NMPObjectType obj_type, + int obj_type_i, int ifindex, NMPlatformLink *plink, - NMPlatformSignalChangeType change_type, + int change_type_i, gpointer user_data) { WaitForSignalData *data = user_data; diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h index c3af382ada..16b2f8b8af 100644 --- a/src/platform/tests/test-common.h +++ b/src/platform/tests/test-common.h @@ -80,7 +80,7 @@ void _free_signal (const char *file, int line, const char *func, SignalData *dat #define ensure_no_signal(data) _ensure_no_signal(__FILE__, __LINE__, G_STRFUNC, data) #define free_signal(data) _free_signal(__FILE__, __LINE__, G_STRFUNC, data) -void link_callback (NMPlatform *platform, NMPObjectType obj_type, int ifindex, NMPlatformLink *received, NMPlatformSignalChangeType change_type, SignalData *data); +void link_callback (NMPlatform *platform, int obj_type_i, int ifindex, NMPlatformLink *received, int change_type_i, SignalData *data); /*****************************************************************************/ diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index 0877824fa5..238b653522 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -157,12 +157,15 @@ software_add (NMLinkType link_type, const char *name) static void test_link_changed_signal_cb (NMPlatform *platform, - NMPObjectType obj_type, + int obj_type_i, int ifindex, const NMPlatformIP4Route *route, - NMPlatformSignalChangeType change_type, + int change_type_i, gboolean *p_test_link_changed_signal_arg) { + const NMPObjectType obj_type = obj_type_i; + const NMPlatformSignalChangeType change_type = change_type_i; + /* test invocation of platform signals with multiple listeners * connected to the signal. Platform signals have enum-typed * arguments and there seem to be an issue with invoking such diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c index 8174167bc5..65cc699a8a 100644 --- a/src/platform/tests/test-route.c +++ b/src/platform/tests/test-route.c @@ -30,8 +30,12 @@ #define DEVICE_NAME "nm-test-device" static void -ip4_route_callback (NMPlatform *platform, NMPObjectType obj_type, int ifindex, const NMPlatformIP4Route *received, NMPlatformSignalChangeType change_type, SignalData *data) +ip4_route_callback (NMPlatform *platform, int obj_type_i, int ifindex, const NMPlatformIP4Route *received, int change_type_i, SignalData *data) { + const NMPObjectType obj_type = obj_type_i; + const NMPlatformSignalChangeType change_type = change_type_i; + + g_assert_cmpint (obj_type, ==, NMP_OBJECT_TYPE_IP4_ROUTE); g_assert (received); g_assert_cmpint (received->ifindex, ==, ifindex); g_assert (data && data->name); @@ -50,8 +54,12 @@ ip4_route_callback (NMPlatform *platform, NMPObjectType obj_type, int ifindex, c } static void -ip6_route_callback (NMPlatform *platform, NMPObjectType obj_type, int ifindex, const NMPlatformIP6Route *received, NMPlatformSignalChangeType change_type, SignalData *data) +ip6_route_callback (NMPlatform *platform, int obj_type_i, int ifindex, const NMPlatformIP6Route *received, int change_type_i, SignalData *data) { + const NMPObjectType obj_type = obj_type_i; + const NMPlatformSignalChangeType change_type = change_type_i; + + g_assert_cmpint (obj_type, ==, NMP_OBJECT_TYPE_IP6_ROUTE); g_assert (received); g_assert_cmpint (received->ifindex, ==, ifindex); g_assert (data && data->name); diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index 24ecf07991..8e2b144a01 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -30,7 +30,6 @@ #include "nm-secret-agent.h" #include "nm-auth-utils.h" #include "nm-setting-vpn.h" -#include "nm-src-enum-types.h" #include "nm-auth-manager.h" #include "nm-bus-manager.h" #include "nm-session-monitor.h" diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c index a20916914a..3877bb7305 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c @@ -116,10 +116,11 @@ devtimeout_ready (gpointer user_data) } static void -link_changed (NMPlatform *platform, NMPObjectType obj_type, int ifindex, const NMPlatformLink *link, - NMPlatformSignalChangeType change_type, +link_changed (NMPlatform *platform, int obj_type_i, int ifindex, const NMPlatformLink *link, + int change_type_i, NMConnection *self) { + const NMPlatformSignalChangeType change_type = change_type_i; NMIfcfgConnectionPrivate *priv = NM_IFCFG_CONNECTION_GET_PRIVATE ((NMIfcfgConnection *) self); const char *ifname; diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 0b092a67a1..8e708d125c 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -30,7 +30,6 @@ #include "nm-setting-vpn.h" #include "nm-vpn-dbus-interface.h" #include "nm-core-internal.h" -#include "nm-src-enum-types.h" typedef struct { GSList *plugins;