valgrind-*.log
test-*.log
test-*.trs
-*-glue.h
/ABOUT-NLS
/COPYING
/libnm-core/tests/test-setting-8021x
/libnm-core/tests/test-setting-dcb
+/libnm-glib/nm-secret-agent-glue.h
+/libnm-glib/nm-vpn-plugin-glue.h
/libnm-glib/libnm-glib-test
/libnm-glib/tests/test-nm-client
/libnm-glib/tests/test-remote-settings-client
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
-DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNMCONFDIR=\"$(nmconfdir)\" \
-DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DSRCDIR=\"$(abs_srcdir)\" \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(GLIB_CFLAGS)
noinst_PROGRAMS = \
test-dispatcher-envp
test_dispatcher_envp_LDADD = \
$(top_builddir)/libnm/libnm.la \
$(top_builddir)/callouts/libtest-dispatcher-envp.la \
- $(GLIB_LIBS) \
- $(DBUS_LIBS)
+ $(GLIB_LIBS)
###########################################
dnl
PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94)
-AC_CHECK_LIB([dbus-glib-1], [dbus_g_method_invocation_get_g_connection], ac_have_gmi_get_con="1", ac_have_gmi_get_con="0")
-AC_DEFINE_UNQUOTED(HAVE_DBUS_GLIB_GMI_GET_CONNECTION, $ac_have_gmi_get_con, [Define if you have a dbus-glib with dbus_g_method_invocation_get_g_connection()])
-
-dnl
-dnl Only dbus-glib >= 0.100 can use private dbus connections
-dnl
-PKG_CHECK_MODULES(DBUS_GLIB_100, [dbus-glib-1 >= 0.100], [have_dbus_glib_100=yes],[have_dbus_glib_100=no])
-if (test "${have_dbus_glib_100}" = "yes"); then
- AC_DEFINE(HAVE_DBUS_GLIB_100, 1, [Define if you have dbus-glib >= 0.100])
-else
- AC_DEFINE(HAVE_DBUS_GLIB_100, 0, [Define if you have dbus-glib >= 0.100])
-fi
-AM_CONDITIONAL(HAVE_DBUS_GLIB_100, test "${have_dbus_glib_100}" = "yes")
-
PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
[AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh'),
AC_SUBST(AM_TESTS_FD_REDIRECT, '--tap')],
EXTRA_DIST = \
gsystem-local-alloc.h \
nm-dbus-compat.h \
- nm-dbus-glib-types.h \
nm-default.h \
nm-glib.h \
- nm-gvaluearray-compat.h \
nm-test-utils.h \
nm-macros-internal.h
#endif
-
-#include "nm-gvaluearray-compat.h"
-
static inline void
__g_type_ensure (GType type)
{
libnm_util_la_private_headers = \
crypto.h \
+ nm-dbus-glib-types.h \
+ nm-gvaluearray-compat.h \
nm-param-spec-specialized.h \
- nm-utils-private.h \
- nm-setting-private.h
+ nm-setting-private.h \
+ nm-utils-private.h
libnm_util_la_csources = \
crypto.c \
#include "config.h"
#include "nm-default.h"
+#include "nm-gvaluearray-compat.h"
#include "nm-param-spec-specialized.h"
struct _NMParamSpecSpecialized {
#include <gmodule.h>
#include "nm-default.h"
+#include "nm-gvaluearray-compat.h"
#include "nm-utils.h"
#include "nm-utils-private.h"
#include "nm-dbus-glib-types.h"
#include <string.h>
#include "nm-default.h"
+#include "nm-gvaluearray-compat.h"
#include "nm-utils.h"
#include "nm-utils-private.h"
#include "nm-dbus-glib-types.h"
#include <nm-utils.h>
#include "nm-default.h"
+#include "nm-gvaluearray-compat.h"
#include "nm-setting-private.h"
#include "nm-setting-connection.h"
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
+ -I$(top_builddir)/introspection \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/callouts \
dhcp-manager/nm-dhcp-dhcpcd.h \
dhcp-manager/nm-dhcp-systemd.h
-nm_sources = \
+libNetworkManager_la_SOURCES = \
$(nm_device_headers) \
$(nm_dhcp_client_headers) \
devices/nm-device.c \
if SUSPEND_RESUME_UPOWER
-nm_sources += nm-sleep-monitor-upower.c
+libNetworkManager_la_SOURCES += nm-sleep-monitor-upower.c
else
# systemd/consolekit suspend/resume used whenever upower is not enabled
-nm_sources += nm-sleep-monitor-systemd.c
+libNetworkManager_la_SOURCES += nm-sleep-monitor-systemd.c
endif
if WITH_WEXT
-nm_sources += \
+libNetworkManager_la_SOURCES += \
platform/wifi/wifi-utils-wext.c \
platform/wifi/wifi-utils-wext.h
endif
GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
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)
+nm_enum_types_sources = $(libNetworkManager_la_SOURCES)
BUILT_SOURCES = $(GLIB_GENERATED)
-
-glue_sources = \
- nm-access-point-glue.h \
- nm-active-connection-glue.h \
- nm-agent-manager-glue.h \
- nm-device-bond-glue.h \
- nm-device-bridge-glue.h \
- nm-device-ethernet-glue.h \
- nm-device-generic-glue.h \
- nm-device-glue.h \
- nm-device-gre-glue.h \
- nm-device-infiniband-glue.h \
- nm-device-macvlan-glue.h \
- nm-device-tun-glue.h \
- nm-device-veth-glue.h \
- nm-device-vlan-glue.h \
- nm-device-vxlan-glue.h \
- nm-dhcp4-config-glue.h \
- nm-dhcp6-config-glue.h \
- nm-ip4-config-glue.h \
- nm-ip6-config-glue.h \
- nm-manager-glue.h \
- nm-ppp-manager-glue.h \
- nm-settings-connection-glue.h \
- nm-settings-glue.h \
- nm-vpn-connection-glue.h
-
-BUILT_SOURCES += $(glue_sources)
-
-%-glue.h: $(top_srcdir)/introspection/%.xml
- $(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(subst -glue.h,,$@)) --mode=glib-server --output=$@ $<
-
-
AM_CPPFLAGS += \
- $(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \
$(LIBNL_CFLAGS) \
\
$(NULL)
-libNetworkManager_la_SOURCES = \
- $(nm_sources) \
- $(glue_sources)
-
libNetworkManager_la_LIBADD = \
$(top_builddir)/libnm-core/libnm-core.la \
+ $(top_builddir)/introspection/libnmdbus.la \
libsystemd-nm.la \
- $(DBUS_LIBS) \
$(GLIB_LIBS) \
$(GUDEV_LIBS) \
$(LIBNL_LIBS) \
libnm_iface_helper_la_LIBADD = \
$(top_builddir)/libnm-core/libnm-core.la \
+ $(top_builddir)/introspection/libnmdbus.la \
libsystemd-nm.la \
- $(DBUS_LIBS) \
$(GLIB_LIBS) \
$(GUDEV_LIBS) \
$(LIBNL_LIBS) \
$(top_builddir)/libnm-core/libnm-core.la \
libsystemd-nm.la \
libnm-iface-helper.la \
- $(DBUS_LIBS) \
$(GLIB_LIBS) \
$(GUDEV_LIBS) \
$(SYSTEMD_JOURNAL_LIBS) \
$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
CLEANFILES = \
- $(BUILT_SOURCES) \
- settings/*-glue.h \
- devices/*-glue.h \
- devices/*/*-glue.h
-
+ $(BUILT_SOURCES)
#include "nm-setting-wireless.h"
#include "nm-setting-wireless-security.h"
#include "nm-auth-utils.h"
-#include "nm-dbus-glib-types.h"
/*
* Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export
memcpy (iid, addr->s6_addr + 8, 8);
}
-/**
- * nm_utils_connection_hash_to_dict:
- * @hash: a hashed #NMConnection
- *
- * Returns: a (floating) #GVariant equivalent to @hash.
- */
-GVariant *
-nm_utils_connection_hash_to_dict (GHashTable *hash)
-{
- GValue val = { 0, };
- GVariant *variant;
-
- if (!hash)
- return NULL;
-
- g_value_init (&val, DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT);
- g_value_set_boxed (&val, hash);
- variant = dbus_g_value_build_g_variant (&val);
- g_value_unset (&val);
-
- return variant;
-}
-
-/**
- * nm_utils_connection_dict_to_hash:
- * @dict: a #GVariant-serialized #NMConnection
- *
- * Returns: a #GHashTable equivalent to @dict.
- */
-GHashTable *
-nm_utils_connection_dict_to_hash (GVariant *dict)
-{
- GValue val = { 0, };
-
- if (!dict)
- return NULL;
-
- dbus_g_value_parse_g_variant (dict, &val);
- return g_value_get_boxed (&val);
-}
-
/**
* nm_utils_setpgid:
* @unused: unused
g_return_if_fail (!object || NM_IS_EXPORTED_OBJECT (object));
if (object && nm_exported_object_is_exported (object))
- g_value_set_boxed (value, nm_exported_object_get_path (object));
+ g_value_set_string (value, nm_exported_object_get_path (object));
else
- g_value_set_boxed (value, "/");
+ g_value_set_string (value, "/");
}
/**
continue;
g_ptr_array_add (paths, g_strdup (nm_exported_object_get_path (object)));
}
- g_value_take_boxed (value, paths);
+ g_ptr_array_add (paths, NULL);
+ g_value_take_boxed (value, (char **) g_ptr_array_free (paths, FALSE));
}
/**
void nm_utils_ipv6_interface_identfier_get_from_addr (NMUtilsIPv6IfaceId *iid,
const struct in6_addr *addr);
-GVariant *nm_utils_connection_hash_to_dict (GHashTable *hash);
-GHashTable *nm_utils_connection_dict_to_hash (GVariant *dict);
-
void nm_utils_array_remove_at_indexes (GArray *array, const guint *indexes_to_delete, gsize len);
void nm_utils_setpgid (gpointer unused);
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\""
noinst_PROGRAMS = \
#include "config.h"
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib.h>
#include <getopt.h>
#include <locale.h>
#include <errno.h>
}
g_clear_error (&error);
- dbus_threads_init_default ();
-
- /* Ensure that non-exported properties don't leak out, and that the
- * introspection 'access' permissions are respected.
- */
- dbus_glib_global_set_disable_legacy_property_access ();
-
nm_log_info (LOGD_CORE, "Read config: %s", nm_config_data_get_config_description (nm_config_get_data (config)));
nm_config_data_log (nm_config_get_data (config), "CONFIG: ");
nm_log_dbg (LOGD_CORE, "WEXT support is %s",
wimax_enabled);
if (!nm_bus_manager_get_connection (nm_bus_manager_get ())) {
-#if HAVE_DBUS_GLIB_100
nm_log_warn (LOGD_CORE, "Failed to connect to D-Bus; only private bus is available");
-#else
- nm_log_err (LOGD_CORE, "Failed to connect to D-Bus, exiting...");
- goto done;
-#endif
} else {
/* Start our DBus service */
if (!nm_bus_manager_start_service (nm_bus_manager_get ())) {
/**************************************************************/
static NMAuthSubject *
-_new_unix_process (DBusGMethodInvocation *context,
- DBusConnection *connection,
- DBusMessage *message)
+_new_unix_process (GDBusMethodInvocation *context,
+ GDBusConnection *connection,
+ GDBusMessage *message)
{
NMAuthSubject *self;
gboolean success = FALSE;
}
NMAuthSubject *
-nm_auth_subject_new_unix_process_from_context (DBusGMethodInvocation *context)
+nm_auth_subject_new_unix_process_from_context (GDBusMethodInvocation *context)
{
return _new_unix_process (context, NULL, NULL);
}
NMAuthSubject *
-nm_auth_subject_new_unix_process_from_message (DBusConnection *connection,
- DBusMessage *message)
+nm_auth_subject_new_unix_process_from_message (GDBusConnection *connection,
+ GDBusMessage *message)
{
return _new_unix_process (NULL, connection, message);
}
#define __NETWORKMANAGER_AUTH_SUBJECT_H__
#include "config.h"
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
#include "nm-default.h"
NMAuthSubject *nm_auth_subject_new_internal (void);
-NMAuthSubject *nm_auth_subject_new_unix_process_from_context (DBusGMethodInvocation *context);
+NMAuthSubject *nm_auth_subject_new_unix_process_from_context (GDBusMethodInvocation *context);
-NMAuthSubject *nm_auth_subject_new_unix_process_from_message (DBusConnection *connection, DBusMessage *message);
+NMAuthSubject *nm_auth_subject_new_unix_process_from_message (GDBusConnection *connection, GDBusMessage *message);
NMAuthSubjectType nm_auth_subject_get_subject_type (NMAuthSubject *subject);
GSList *calls;
GHashTable *data;
- DBusGMethodInvocation *context;
+ GDBusMethodInvocation *context;
NMAuthSubject *subject;
GError *error;
/* Creates the NMAuthSubject automatically */
NMAuthChain *
-nm_auth_chain_new_context (DBusGMethodInvocation *context,
+nm_auth_chain_new_context (GDBusMethodInvocation *context,
NMAuthChainResultFunc done_func,
gpointer user_data)
{
/* Requires an NMAuthSubject */
NMAuthChain *
nm_auth_chain_new_subject (NMAuthSubject *subject,
- DBusGMethodInvocation *context,
+ GDBusMethodInvocation *context,
NMAuthChainResultFunc done_func,
gpointer user_data)
{
#ifndef __NETWORKMANAGER_MANAGER_AUTH_H__
#define __NETWORKMANAGER_MANAGER_AUTH_H__
-#include <dbus/dbus-glib.h>
-
#include <nm-connection.h>
#include "nm-default.h"
typedef void (*NMAuthChainResultFunc) (NMAuthChain *chain,
GError *error,
- DBusGMethodInvocation *context,
+ GDBusMethodInvocation *context,
gpointer user_data);
-NMAuthChain *nm_auth_chain_new_context (DBusGMethodInvocation *context,
+NMAuthChain *nm_auth_chain_new_context (GDBusMethodInvocation *context,
NMAuthChainResultFunc done_func,
gpointer user_data);
NMAuthChain *nm_auth_chain_new_subject (NMAuthSubject *subject,
- DBusGMethodInvocation *context,
+ GDBusMethodInvocation *context,
NMAuthChainResultFunc done_func,
gpointer user_data);
#include "nm-dhcp6-config.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
-#include "nm-dbus-glib-types.h"
#include "nm-settings-connection.h"
#include "nm-platform.h"
#include "nm-core-internal.h"
AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
AM_LDFLAGS = \
$(GLIB_LIBS) \
- $(DBUS_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
@GNOME_CODE_COVERAGE_RULES@
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager-ibft"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DSBINDIR=\"$(sbindir)\"
#include <nm-setting-connection.h>
#include "nm-default.h"
-#include "nm-dbus-glib-types.h"
#include "nm-system-config-interface.h"
#include "NetworkManagerUtils.h"
AM_LDFLAGS = \
$(GLIB_LIBS) \
- $(DBUS_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
noinst_PROGRAMS = test-ibft
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\"
-DSBINDIR=\"$(sbindir)\"
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(CHECK_CFLAGS) \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-DTEST_IFNET_DIR=\"$(abs_srcdir)\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
$(GUDEV_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\"
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
-DNMCONFDIR=\"$(nmconfdir)\"
noinst_LTLIBRARIES = \
#include "nm-default.h"
#include "nm-system-config-interface.h"
-#include "nm-dbus-glib-types.h"
#include "nm-keyfile-connection.h"
#include "reader.h"
#include "writer.h"
-I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
test_keyfile_LDADD = \
$(top_builddir)/src/libNetworkManager.la \
- $(DBUS_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
@VALGRIND_RULES@
#include <string.h>
#include <stdlib.h>
-#include <dbus/dbus-glib.h>
#include "nm-default.h"
#include "nm-supplicant-config.h"
#include "config.h"
#include <string.h>
-#include <dbus/dbus.h>
#include "nm-default.h"
#include "nm-supplicant-manager.h"
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(GLIB_CFLAGS)
noinst_PROGRAMS = test-supplicant-config
#include <sys/types.h>
#include <sys/stat.h>
-#include <dbus/dbus-glib.h>
-
#include "nm-core-internal.h"
#include "nm-supplicant-config.h"
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(GLIB_CFLAGS)
noinst_PROGRAMS = \
test-general \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
-DSRCDIR=\""$(srcdir)"\" \
-DBUILDDIR=\""$(builddir)"\"