Imported Upstream version 1.0.0 upstream/1.0.0

1 files changed, 236 insertions, 72 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 2929e18c..808e59eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,43 +5,121 @@ include $(GLIB_MAKEFILE)
 SUBDIRS =				\
 	.				\
 	devices/adsl			\
-	devices/wwan			\
-	devices/bluetooth		\
-	devices/wifi                    \
+	devices/wifi			\
 	dhcp-manager			\
 	ppp-manager			\
 	settings/plugins
 
+if WITH_MODEM_MANAGER_1
+SUBDIRS +=				\
+	devices/wwan			\
+	devices/bluetooth
+endif
+
 if WITH_WIMAX
 SUBDIRS += devices/wimax
 endif
 
+if WITH_TEAMDCTL
+SUBDIRS += devices/team
+endif
+
 if ENABLE_TESTS
 SUBDIRS += \
-	config/tests \
 	dhcp-manager/tests \
 	dnsmasq-manager/tests \
 	platform \
 	rdisc \
-	settings/tests \
 	supplicant-manager/tests \
 	tests
 endif
 
 AM_CPPFLAGS =				\
 	-I$(top_srcdir)/include		\
-	-I$(top_builddir)/include	\
-	-I${top_srcdir}/libgsystem	\
-	-I$(top_srcdir)/libnm-util	\
-	-I$(top_builddir)/libnm-util	\
+	-I$(top_srcdir)/libnm-core	\
+	-I$(top_builddir)/libnm-core	\
 	-I$(top_srcdir)/callouts	\
+	-DPREFIX=\"$(prefix)\"          \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION	\
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
 
 # add each subdirectory that contains a libNM source file. $(sort) is being used
 # primarily for its side effect of removing duplicates.
 AM_CPPFLAGS += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d)
 
+noinst_LTLIBRARIES = \
+	libNetworkManager.la \
+	libnm-iface-helper.la \
+	libsystemd-dhcp.la
+
+######################
+# libsystemd-dhcp
+######################
+
+SYSTEMD_DHCP_CFLAGS = \
+	-I$(top_srcdir)/src/dhcp-manager/systemd-dhcp/src/systemd \
+	-I$(top_srcdir)/src/dhcp-manager/systemd-dhcp/src/libsystemd-network \
+	-I$(top_srcdir)/src/dhcp-manager/systemd-dhcp/src/shared \
+	-I$(top_srcdir)/src/dhcp-manager/systemd-dhcp
+
+libsystemd_dhcp_la_SOURCES = \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-internal.h \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-lease-internal.h \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-internal.h \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h \
+	dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c \
+	dhcp-manager/systemd-dhcp/src/shared/async.h \
+	dhcp-manager/systemd-dhcp/src/shared/time-util.h \
+	dhcp-manager/systemd-dhcp/src/shared/siphash24.h \
+	dhcp-manager/systemd-dhcp/src/shared/time-util.c \
+	dhcp-manager/systemd-dhcp/src/shared/socket-util.h \
+	dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h \
+	dhcp-manager/systemd-dhcp/src/shared/macro.h \
+	dhcp-manager/systemd-dhcp/src/shared/refcnt.h \
+	dhcp-manager/systemd-dhcp/src/shared/util.c \
+	dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c \
+	dhcp-manager/systemd-dhcp/src/shared/siphash24.c \
+	dhcp-manager/systemd-dhcp/src/shared/util.h \
+	dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h \
+	dhcp-manager/systemd-dhcp/src/shared/list.h \
+	dhcp-manager/systemd-dhcp/src/shared/fileio.h \
+	dhcp-manager/systemd-dhcp/src/shared/fileio.c \
+	dhcp-manager/systemd-dhcp/src/shared/strv.h \
+	dhcp-manager/systemd-dhcp/src/shared/strv.c \
+	dhcp-manager/systemd-dhcp/src/shared/unaligned.h \
+	dhcp-manager/systemd-dhcp/src/shared/utf8.h \
+	dhcp-manager/systemd-dhcp/src/shared/utf8.c \
+	dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h \
+	dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h \
+	dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h \
+	dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h \
+	dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h \
+	dhcp-manager/systemd-dhcp/src/systemd/sd-event.h \
+	dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h \
+	dhcp-manager/systemd-dhcp/nm-sd-adapt.h \
+	dhcp-manager/systemd-dhcp/nm-sd-adapt.c
+
+libsystemd_dhcp_la_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	$(SYSTEMD_DHCP_CFLAGS) \
+	$(GLIB_CFLAGS)
+
+libsystemd_dhcp_la_LIBADD = \
+	$(GLIB_LIBS)
+
 ###########################################
 # NetworkManager
 ###########################################
@@ -49,56 +127,71 @@ AM_CPPFLAGS += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(to
 sbin_PROGRAMS = NetworkManager
 
 NetworkManager_SOURCES = \
+	$(nm_device_sources) $(nm_device_headers) \
+	$(nm_dhcp_client_sources) $(nm_dhcp_client_headers) \
+	main-utils.c \
+	main-utils.h \
 	main.c
 
-NetworkManager_LDADD = libNetworkManager.la $(top_builddir)/libgsystem.la $(LIBNDP_LIBS)
+NetworkManager_LDADD = libNetworkManager.la
 
-noinst_LTLIBRARIES = libNetworkManager.la
-
-nm_sources = \
-	config/nm-config.c \
-	config/nm-config.h \
-	config/nm-config-device.c \
-	config/nm-config-device.h \
-	\
-	devices/nm-device.c \
-	devices/nm-device.h \
+nm_device_sources = \
 	devices/nm-device-bond.c \
-	devices/nm-device-bond.h \
 	devices/nm-device-bridge.c \
-	devices/nm-device-bridge.h \
 	devices/nm-device-ethernet.c \
-	devices/nm-device-ethernet.h \
-	devices/nm-device-factory.c \
-	devices/nm-device-factory.h \
-	devices/nm-device-generic.c \
-	devices/nm-device-generic.h \
 	devices/nm-device-gre.c \
-	devices/nm-device-gre.h \
 	devices/nm-device-infiniband.c \
-	devices/nm-device-infiniband.h \
 	devices/nm-device-macvlan.c \
-	devices/nm-device-macvlan.h \
-	devices/nm-device-private.h \
-	devices/nm-device-team.c \
-	devices/nm-device-team.h \
 	devices/nm-device-tun.c \
-	devices/nm-device-tun.h \
 	devices/nm-device-veth.c \
-	devices/nm-device-veth.h \
 	devices/nm-device-vlan.c \
-	devices/nm-device-vlan.h \
 	devices/nm-device-vxlan.c \
-	devices/nm-device-vxlan.h \
-	\
-	dhcp-manager/nm-dhcp-client.c \
-	dhcp-manager/nm-dhcp-client.h \
+	$(NULL)
+
+nm_device_headers = \
+	devices/nm-device-bond.h \
+	devices/nm-device-bridge.h \
+	devices/nm-device-ethernet.h \
+	devices/nm-device-gre.h \
+	devices/nm-device-infiniband.h \
+	devices/nm-device-macvlan.h \
+	devices/nm-device-tun.h \
+	devices/nm-device-veth.h \
+	devices/nm-device-vlan.h \
+	devices/nm-device-vxlan.h
+
+nm_dhcp_client_sources = \
 	dhcp-manager/nm-dhcp-dhclient.c \
-	dhcp-manager/nm-dhcp-dhclient.h \
 	dhcp-manager/nm-dhcp-dhclient-utils.c \
-	dhcp-manager/nm-dhcp-dhclient-utils.h \
 	dhcp-manager/nm-dhcp-dhcpcd.c \
+	dhcp-manager/nm-dhcp-systemd.c
+
+nm_dhcp_client_headers = \
+	dhcp-manager/nm-dhcp-dhclient.h \
+	dhcp-manager/nm-dhcp-dhclient-utils.h \
 	dhcp-manager/nm-dhcp-dhcpcd.h \
+	dhcp-manager/nm-dhcp-systemd.h
+
+nm_sources = \
+	$(nm_device_headers) \
+	$(nm_dhcp_client_headers) \
+	devices/nm-device.c \
+	devices/nm-device.h \
+	devices/nm-device-ethernet-utils.c \
+	devices/nm-device-ethernet-utils.h \
+	devices/nm-device-factory.c \
+	devices/nm-device-factory.h \
+	devices/nm-device-generic.c \
+	devices/nm-device-generic.h \
+	devices/nm-device-logging.h \
+	devices/nm-device-private.h \
+	\
+	dhcp-manager/nm-dhcp-client.c \
+	dhcp-manager/nm-dhcp-client.h \
+	dhcp-manager/nm-dhcp-utils.c \
+	dhcp-manager/nm-dhcp-utils.h \
+	dhcp-manager/nm-dhcp-listener.c \
+	dhcp-manager/nm-dhcp-listener.h \
 	dhcp-manager/nm-dhcp-manager.c \
 	dhcp-manager/nm-dhcp-manager.h \
 	\
@@ -118,12 +211,6 @@ nm_sources = \
 	dnsmasq-manager/nm-dnsmasq-utils.c \
 	dnsmasq-manager/nm-dnsmasq-utils.h \
 	\
-	firewall-manager/nm-firewall-manager.c \
-	firewall-manager/nm-firewall-manager.h \
-	\
-	logging/nm-logging.c \
-	logging/nm-logging.h \
-	\
 	platform/nm-fake-platform.c \
 	platform/nm-fake-platform.h \
 	platform/nm-linux-platform.c \
@@ -143,9 +230,6 @@ nm_sources = \
 	rdisc/nm-rdisc.c \
 	rdisc/nm-rdisc.h \
 	\
-	posix-signals/nm-posix-signals.c \
-	posix-signals/nm-posix-signals.h \
-	\
 	ppp-manager/nm-ppp-manager.c \
 	ppp-manager/nm-ppp-manager.h \
 	ppp-manager/nm-ppp-status.h \
@@ -158,17 +242,12 @@ nm_sources = \
 	settings/nm-secret-agent.h \
 	settings/nm-settings-connection.c \
 	settings/nm-settings-connection.h \
-	settings/nm-settings-error.c \
-	settings/nm-settings-error.h \
-	settings/nm-settings-utils.c \
-	settings/nm-settings-utils.h \
 	settings/nm-settings.c \
 	settings/nm-settings.h \
 	settings/nm-system-config-interface.c \
 	settings/nm-system-config-interface.h \
 	\
 	settings/plugins/keyfile/common.h \
-	settings/plugins/keyfile/errors.c \
 	settings/plugins/keyfile/nm-keyfile-connection.c \
 	settings/plugins/keyfile/nm-keyfile-connection.h \
 	settings/plugins/keyfile/plugin.c \
@@ -203,6 +282,8 @@ nm_sources = \
 	nm-activation-request.h \
 	nm-active-connection.c \
 	nm-active-connection.h \
+	nm-config.c \
+	nm-config.h \
 	nm-connection-provider.c \
 	nm-connection-provider.h \
 	nm-connectivity.c \
@@ -211,6 +292,8 @@ nm_sources = \
 	nm-dbus-manager.h \
 	nm-dcb.c \
 	nm-dcb.h \
+	nm-default-route-manager.c \
+	nm-default-route-manager.h \
 	nm-dhcp4-config.c \
 	nm-dhcp4-config.h \
 	nm-dhcp6-config.c \
@@ -219,18 +302,26 @@ nm_sources = \
 	nm-dispatcher.h \
 	nm-enum-types.c \
 	nm-enum-types.h \
+	nm-firewall-manager.c \
+	nm-firewall-manager.h \
 	nm-ip4-config.c \
 	nm-ip4-config.h \
 	nm-ip6-config.c \
 	nm-ip6-config.h \
-	nm-manager-auth.c \
-	nm-manager-auth.h \
+	nm-logging.c \
+	nm-logging.h \
+	nm-auth-manager.c \
+	nm-auth-manager.h \
 	nm-auth-subject.c \
 	nm-auth-subject.h \
+	nm-auth-utils.c \
+	nm-auth-utils.h \
 	nm-manager.c \
 	nm-manager.h \
 	nm-policy.c \
 	nm-policy.h \
+	nm-posix-signals.c \
+	nm-posix-signals.h \
 	nm-properties-changed-signal.c \
 	nm-properties-changed-signal.h \
 	nm-rfkill-manager.c \
@@ -268,7 +359,7 @@ endif
 
 
 GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
-GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
+GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
 GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
 nm_enum_types_sources = $(nm_sources)
 
@@ -292,7 +383,6 @@ glue_sources = \
 	nm-device-gre-glue.h \
 	nm-device-infiniband-glue.h \
 	nm-device-macvlan-glue.h \
-	nm-device-team-glue.h \
 	nm-device-tun-glue.h \
 	nm-device-veth-glue.h \
 	nm-device-vlan-glue.h \
@@ -320,8 +410,8 @@ AM_CPPFLAGS += \
 	$(LIBNL_CFLAGS) \
 	$(LIBNDP_CFLAGS) \
 	$(LIBSOUP_CFLAGS) \
-	$(POLKIT_CFLAGS) \
 	$(SYSTEMD_LOGIN_CFLAGS) \
+	$(SYSTEMD_DHCP_CFLAGS) \
 	\
 	-DBINDIR=\"$(bindir)\" \
 	-DDATADIR=\"$(datadir)\" \
@@ -347,35 +437,109 @@ if SESSION_TRACKING_CK
 AM_CPPFLAGS += -DCKDB_PATH=\"${CKDB_PATH}\"
 endif
 
-if WITH_TEAMDCTL
-AM_CPPFLAGS += ${LIBTEAMDCTL_CFLAGS}
-endif
-
 libNetworkManager_la_SOURCES = \
 	$(nm_sources) \
 	$(glue_sources)
 
 libNetworkManager_la_LIBADD = \
-	$(top_builddir)/libgsystem.la \
-	$(top_builddir)/libnm-util/libnm-util.la \
+	$(top_builddir)/libnm-core/libnm-core.la \
+	libsystemd-dhcp.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(GUDEV_LIBS) \
 	$(LIBNL_LIBS) \
-	$(POLKIT_LIBS) \
 	$(SYSTEMD_LOGIN_LIBS) \
+	$(LIBNDP_LIBS) \
 	$(LIBDL) \
 	$(LIBM)
 
-if WITH_CONCHECK
+if WITH_LIBSOUP
 libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS)
 endif
 
-if WITH_TEAMDCTL
-libNetworkManager_la_LIBADD += $(LIBTEAMDCTL_LIBS)
+NetworkManager_LDFLAGS = -rdynamic
+
+######################
+
+libnm_iface_helper_la_SOURCES = \
+	dhcp-manager/nm-dhcp-client.c \
+	dhcp-manager/nm-dhcp-client.h \
+	dhcp-manager/nm-dhcp-utils.c \
+	dhcp-manager/nm-dhcp-utils.h \
+	dhcp-manager/nm-dhcp-manager.c \
+	dhcp-manager/nm-dhcp-manager.h \
+	\
+	platform/nm-linux-platform.c \
+	platform/nm-linux-platform.h \
+	platform/nm-platform.c \
+	platform/nm-platform.h \
+	platform/wifi/wifi-utils-nl80211.c \
+	platform/wifi/wifi-utils-nl80211.h \
+	platform/wifi/wifi-utils-private.h \
+	platform/wifi/wifi-utils.c \
+	platform/wifi/wifi-utils.h \
+	\
+	rdisc/nm-fake-rdisc.c \
+	rdisc/nm-fake-rdisc.h \
+	rdisc/nm-lndp-rdisc.c \
+	rdisc/nm-lndp-rdisc.h \
+	rdisc/nm-rdisc.c \
+	rdisc/nm-rdisc.h \
+	\
+	nm-ip4-config.c \
+	nm-ip4-config.h \
+	nm-ip6-config.c \
+	nm-ip6-config.h \
+	\
+	nm-enum-types.c \
+	nm-enum-types.h \
+	nm-logging.c \
+	nm-logging.h \
+	nm-posix-signals.c \
+	nm-posix-signals.h \
+	NetworkManagerUtils.c \
+	NetworkManagerUtils.h
+
+if WITH_WEXT
+libnm_iface_helper_la_SOURCES += \
+	platform/wifi/wifi-utils-wext.c \
+	platform/wifi/wifi-utils-wext.h
 endif
 
-NetworkManager_LDFLAGS = -rdynamic
+libnm_iface_helper_la_LIBADD = \
+	$(top_builddir)/libnm-core/libnm-core.la \
+	libsystemd-dhcp.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS) \
+	$(GUDEV_LIBS) \
+	$(LIBNL_LIBS) \
+	$(LIBNDP_LIBS) \
+	$(LIBDL) \
+	$(LIBM)
+
+libexec_PROGRAMS = nm-iface-helper
+
+nm_iface_helper_SOURCES = \
+	dhcp-manager/nm-dhcp-systemd.h \
+	dhcp-manager/nm-dhcp-systemd.c \
+	nm-iface-helper.c \
+	main-utils.c \
+	main-utils.h
+
+nm_iface_helper_LDADD = \
+	$(top_builddir)/libnm-core/libnm-core.la \
+	libsystemd-dhcp.la \
+	libnm-iface-helper.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS) \
+	$(GUDEV_LIBS) \
+	$(LIBNL_LIBS) \
+	$(LIBNDP_LIBS) \
+	$(LIBM)
+
+nm_iface_helper_LDFLAGS = -rdynamic
+
+######################
 
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = org.freedesktop.NetworkManager.conf