diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 893bc9f40e..dbf842aa8d 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -248,7 +248,6 @@ typedef struct { guint32 mtu; /* Generic DHCP stuff */ - NMDHCPManager * dhcp_manager; guint32 dhcp_timeout; GByteArray * dhcp_anycast_address; @@ -510,8 +509,6 @@ constructor (GType type, if (NM_DEVICE_GET_CLASS (dev)->get_generic_capabilities) priv->capabilities |= NM_DEVICE_GET_CLASS (dev)->get_generic_capabilities (dev); - priv->dhcp_manager = nm_dhcp_manager_get (); - priv->fw_manager = nm_firewall_manager_get (); device_get_driver_info (priv->iface, &priv->driver_version, &priv->firmware_version); @@ -2779,7 +2776,7 @@ dhcp4_start (NMDevice *self, /* Begin DHCP on the interface */ g_warn_if_fail (priv->dhcp4_client == NULL); - priv->dhcp4_client = nm_dhcp_manager_start_ip4 (priv->dhcp_manager, + priv->dhcp4_client = nm_dhcp_manager_start_ip4 (nm_dhcp_manager_get (), nm_device_get_ip_iface (self), tmp, nm_connection_get_uuid (connection), @@ -3219,7 +3216,7 @@ dhcp6_start (NMDevice *self, g_byte_array_append (tmp, priv->hw_addr, priv->hw_addr_len); } - priv->dhcp6_client = nm_dhcp_manager_start_ip6 (priv->dhcp_manager, + priv->dhcp6_client = nm_dhcp_manager_start_ip6 (nm_dhcp_manager_get (), nm_device_get_ip_iface (self), tmp, nm_connection_get_uuid (connection), @@ -5797,9 +5794,6 @@ finalize (GObject *object) NMDevice *self = NM_DEVICE (object); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - if (priv->dhcp_manager) - g_object_unref (priv->dhcp_manager); - if (priv->fw_manager) g_object_unref (priv->fw_manager); @@ -6950,7 +6944,6 @@ find_ip4_lease_config (NMDevice *device, NMConnection *connection, NMIP4Config *ext_ip4_config) { - NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device); const char *ip_iface = nm_device_get_ip_iface (device); GSList *leases, *liter; NMIP4Config *found = NULL; @@ -6958,7 +6951,7 @@ find_ip4_lease_config (NMDevice *device, g_return_val_if_fail (NM_IS_IP4_CONFIG (ext_ip4_config), NULL); g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); - leases = nm_dhcp_manager_get_lease_ip_configs (priv->dhcp_manager, + leases = nm_dhcp_manager_get_lease_ip_configs (nm_dhcp_manager_get (), ip_iface, nm_connection_get_uuid (connection), FALSE); diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index c9e63c7de9..1b5d765640 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -63,8 +63,6 @@ nm_dhcp_manager_error_quark (void) #define PRIV_SOCK_PATH NMRUNDIR "/private-dhcp" #define PRIV_SOCK_TAG "dhcp" -static NMDHCPManager *singleton = NULL; - /* default to installed helper, but can be modified for testing */ const char *nm_dhcp_helper_path = LIBEXECDIR "/nm-dhcp-helper"; @@ -342,71 +340,6 @@ get_client_type (const char *client, GError **error) return G_TYPE_INVALID; } -NMDHCPManager * -nm_dhcp_manager_get (void) -{ - NMDHCPManagerPrivate *priv; - const char *client; - GError *error = NULL; -#if !HAVE_DBUS_GLIB_100 - DBusGConnection *g_connection; -#endif - - if (singleton) - return g_object_ref (singleton); - - singleton = g_object_new (NM_TYPE_DHCP_MANAGER, NULL); - priv = NM_DHCP_MANAGER_GET_PRIVATE (singleton); - - /* Client-specific setup */ - client = nm_config_get_dhcp_client (nm_config_get ()); - priv->client_type = get_client_type (client, &error); - - if (priv->client_type == NM_TYPE_DHCP_DHCLIENT) - priv->get_lease_ip_configs_func = nm_dhcp_dhclient_get_lease_ip_configs; - else if (priv->client_type == G_TYPE_INVALID) { - nm_log_warn (LOGD_DHCP, "No usable DHCP client found (%s)! DHCP configurations will fail.", - error->message); - } - g_clear_error (&error); - - priv->clients = g_hash_table_new_full (g_direct_hash, g_direct_equal, - NULL, - (GDestroyNotify) g_object_unref); - g_assert (priv->clients); - - priv->dbus_mgr = nm_dbus_manager_get (); - -#if HAVE_DBUS_GLIB_100 - /* Register the socket our DHCP clients will return lease info on */ - nm_dbus_manager_private_server_register (priv->dbus_mgr, PRIV_SOCK_PATH, PRIV_SOCK_TAG); - priv->new_conn_id = g_signal_connect (priv->dbus_mgr, - NM_DBUS_MANAGER_PRIVATE_CONNECTION_NEW "::" PRIV_SOCK_TAG, - (GCallback) new_connection_cb, - singleton); - priv->dis_conn_id = g_signal_connect (priv->dbus_mgr, - NM_DBUS_MANAGER_PRIVATE_CONNECTION_DISCONNECTED "::" PRIV_SOCK_TAG, - (GCallback) dis_connection_cb, - singleton); -#else - g_connection = nm_dbus_manager_get_connection (priv->dbus_mgr); - priv->proxy = dbus_g_proxy_new_for_name (g_connection, - "org.freedesktop.nm_dhcp_client", - "/", - NM_DHCP_CLIENT_DBUS_IFACE); - g_assert (priv->proxy); - dbus_g_proxy_add_signal (priv->proxy, - "Event", - DBUS_TYPE_G_MAP_OF_VARIANT, - G_TYPE_INVALID); - dbus_g_proxy_connect_signal (priv->proxy, "Event", - G_CALLBACK (nm_dhcp_manager_handle_event), - singleton, - NULL); -#endif - return singleton; -} - #define REMOVE_ID_TAG "remove-id" #define TIMEOUT_ID_TAG "timeout-id" @@ -656,13 +589,73 @@ nm_dhcp_manager_test_ip4_options_to_config (const char *dhcp_client, /***************************************************/ -static void -nm_dhcp_manager_init (NMDHCPManager *manager) +NMDHCPManager * +nm_dhcp_manager_get (void) { - NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (manager); + static NMDHCPManager *singleton = NULL; + + if (G_UNLIKELY (singleton == NULL)) + singleton = g_object_new (NM_TYPE_DHCP_MANAGER, NULL); + g_assert (singleton); + return singleton; +} + +static void +nm_dhcp_manager_init (NMDHCPManager *self) +{ + NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); + const char *client; + GError *error = NULL; +#if !HAVE_DBUS_GLIB_100 + DBusGConnection *g_connection; +#endif /* Maps DBusGConnection :: DBusGProxy */ priv->proxies = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref); + + /* Client-specific setup */ + client = nm_config_get_dhcp_client (nm_config_get ()); + priv->client_type = get_client_type (client, &error); + + if (priv->client_type == NM_TYPE_DHCP_DHCLIENT) + priv->get_lease_ip_configs_func = nm_dhcp_dhclient_get_lease_ip_configs; + else if (priv->client_type == G_TYPE_INVALID) { + nm_log_warn (LOGD_DHCP, "No usable DHCP client found (%s)! DHCP configurations will fail.", + error->message); + } + g_clear_error (&error); + + priv->clients = g_hash_table_new_full (g_direct_hash, g_direct_equal, + NULL, + (GDestroyNotify) g_object_unref); + g_assert (priv->clients); + + priv->dbus_mgr = nm_dbus_manager_get (); + +#if HAVE_DBUS_GLIB_100 + /* Register the socket our DHCP clients will return lease info on */ + nm_dbus_manager_private_server_register (priv->dbus_mgr, PRIV_SOCK_PATH, PRIV_SOCK_TAG); + priv->new_conn_id = g_signal_connect (priv->dbus_mgr, + NM_DBUS_MANAGER_PRIVATE_CONNECTION_NEW "::" PRIV_SOCK_TAG, + (GCallback) new_connection_cb, + self); + priv->dis_conn_id = g_signal_connect (priv->dbus_mgr, + NM_DBUS_MANAGER_PRIVATE_CONNECTION_DISCONNECTED "::" PRIV_SOCK_TAG, + (GCallback) dis_connection_cb, + self); +#else + g_connection = nm_dbus_manager_get_connection (priv->dbus_mgr); + priv->proxy = dbus_g_proxy_new_for_name (g_connection, + "org.freedesktop.nm_dhcp_client", + "/", + NM_DHCP_CLIENT_DBUS_IFACE); + g_assert (priv->proxy); + dbus_g_proxy_add_signal (priv->proxy, "Event", DBUS_TYPE_G_MAP_OF_VARIANT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal (priv->proxy, "Event", + G_CALLBACK (nm_dhcp_manager_handle_event), + self, + NULL); +#endif } static void diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index 7ab9019d61..377129428e 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -60,7 +60,7 @@ typedef struct { GType nm_dhcp_manager_get_type (void); -NMDHCPManager *nm_dhcp_manager_get (void); +NMDHCPManager *nm_dhcp_manager_get (void); void nm_dhcp_manager_set_hostname_provider(NMDHCPManager *manager, NMHostnameProvider *provider); diff --git a/src/main.c b/src/main.c index 5f386cef28..f73e8073c2 100644 --- a/src/main.c +++ b/src/main.c @@ -598,6 +598,11 @@ main (int argc, char *argv[]) dns_mgr = nm_dns_manager_get (); g_assert (dns_mgr != NULL); + /* Initialize DHCP manager */ + dhcp_mgr = nm_dhcp_manager_get (); + g_assert (dhcp_mgr != NULL); + nm_dhcp_manager_set_hostname_provider (dhcp_mgr, NM_HOSTNAME_PROVIDER (manager)); + settings = nm_settings_new (&error); if (!settings) { nm_log_err (LOGD_CORE, "failed to initialize settings storage: %s", @@ -622,11 +627,6 @@ main (int argc, char *argv[]) sup_mgr = nm_supplicant_manager_get (); g_assert (sup_mgr != NULL); - /* Initialize DHCP manager */ - dhcp_mgr = nm_dhcp_manager_get (); - g_assert (dhcp_mgr != NULL); - nm_dhcp_manager_set_hostname_provider (dhcp_mgr, NM_HOSTNAME_PROVIDER (manager)); - /* Initialize Firewall manager */ fw_mgr = nm_firewall_manager_get (); g_assert (fw_mgr != NULL);