colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: merge branch 'bg/update-dev-state-file-rh1593282'

Browse Source 
https://github.com/NetworkManager/NetworkManager/pull/178
https://bugzilla.redhat.com/show_bug.cgi?id=1593282
This commit is contained in:
Beniamino Galvani
2018-08-02 16:42:48 +02:00
parent 7b7c3c0889 614f4733e2
commit 2d6864efe1
3 changed files with 79 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.c
View File

@@ -59,7 +59,6 @@
#endif #endif
#define NM_DEFAULT_PID_FILE NMRUNDIR "/NetworkManager.pid" #define NM_DEFAULT_PID_FILE NMRUNDIR "/NetworkManager.pid"
#define NM_DEFAULT_SYSTEM_STATE_FILE NMSTATEDIR "/NetworkManager.state"
#define CONFIG_ATOMIC_SECTION_PREFIXES ((char **) NULL) #define CONFIG_ATOMIC_SECTION_PREFIXES ((char **) NULL)
@@ -444,7 +443,7 @@ done:
* state here. We don't bother updating the state as devices * state here. We don't bother updating the state as devices
* change during regular operation. If NM is killed with SIGKILL, * change during regular operation. If NM is killed with SIGKILL,
* it misses to update the state. */ * it misses to update the state. */
nm_manager_write_device_state (manager); nm_manager_write_device_state_all (manager);
nm_manager_stop (manager); nm_manager_stop (manager);

140
src/nm-manager.c
View File

@@ -1459,20 +1459,23 @@ manager_device_state_changed (NMDevice *device,
&& new_state > NM_DEVICE_STATE_UNMANAGED) && new_state > NM_DEVICE_STATE_UNMANAGED)
retry_connections_for_parent_device (self, device); retry_connections_for_parent_device (self, device);
switch (new_state) { if (NM_IN_SET (new_state,
case NM_DEVICE_STATE_UNMANAGED: NM_DEVICE_STATE_UNMANAGED,
case NM_DEVICE_STATE_UNAVAILABLE: NM_DEVICE_STATE_UNAVAILABLE,
case NM_DEVICE_STATE_DISCONNECTED: NM_DEVICE_STATE_DISCONNECTED,
case NM_DEVICE_STATE_PREPARE: NM_DEVICE_STATE_PREPARE,
case NM_DEVICE_STATE_FAILED: NM_DEVICE_STATE_FAILED))
_notify (self, PROP_ACTIVE_CONNECTIONS); _notify (self, PROP_ACTIVE_CONNECTIONS);
break;
default:
break;
}
if ( new_state == NM_DEVICE_STATE_UNAVAILABLE if (NM_IN_SET (new_state,
|| new_state == NM_DEVICE_STATE_DISCONNECTED) NM_DEVICE_STATE_UNMANAGED,
NM_DEVICE_STATE_DISCONNECTED,
NM_DEVICE_STATE_ACTIVATED))
nm_manager_write_device_state (self, device);
if (NM_IN_SET (new_state,
NM_DEVICE_STATE_UNAVAILABLE,
NM_DEVICE_STATE_DISCONNECTED))
nm_settings_device_added (priv->settings, device); nm_settings_device_added (priv->settings, device);
} }
@@ -5934,66 +5937,75 @@ start_factory (NMDeviceFactory *factory, gpointer user_data)
nm_device_factory_start (factory); nm_device_factory_start (factory);
} }
void gboolean
nm_manager_write_device_state (NMManager *self) nm_manager_write_device_state (NMManager *self, NMDevice *device)
{ {
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
NMDevice *device; int ifindex;
gs_unref_hashtable GHashTable *seen_ifindexes = NULL; gboolean managed;
NMConfigDeviceStateManagedType managed_type;
NMConnection *settings_connection;
const char *uuid = NULL;
const char *perm_hw_addr_fake = NULL;
gboolean perm_hw_addr_is_fake;
guint32 route_metric_default_aspired;
guint32 route_metric_default_effective;
int nm_owned; int nm_owned;
ifindex = nm_device_get_ip_ifindex (device);
if (ifindex <= 0)
return FALSE;
if (ifindex == 1) {
/* ignore loopback */
return FALSE;
}
if (!nm_platform_link_get (priv->platform, ifindex))
return FALSE;
managed = nm_device_get_managed (device, FALSE);
if (managed) {
settings_connection = NM_CONNECTION (nm_device_get_settings_connection (device));
if (settings_connection)
uuid = nm_connection_get_uuid (settings_connection);
managed_type = NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_MANAGED;
} else if (nm_device_get_unmanaged_flags (device, NM_UNMANAGED_USER_EXPLICIT))
managed_type = NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_UNMANAGED;
else
managed_type = NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_UNKNOWN;
perm_hw_addr_fake = nm_device_get_permanent_hw_address_full (device, FALSE, &perm_hw_addr_is_fake);
if (perm_hw_addr_fake && !perm_hw_addr_is_fake)
perm_hw_addr_fake = NULL;
nm_owned = nm_device_is_software (device) ? nm_device_is_nm_owned (device) : -1;
route_metric_default_effective = _device_route_metric_get (self, ifindex, NM_DEVICE_TYPE_UNKNOWN,
TRUE, &route_metric_default_aspired);
return nm_config_device_state_write (ifindex,
managed_type,
perm_hw_addr_fake,
uuid,
nm_owned,
route_metric_default_aspired,
route_metric_default_effective);
}
void
nm_manager_write_device_state_all (NMManager *self)
{
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
gs_unref_hashtable GHashTable *seen_ifindexes = NULL;
NMDevice *device;
seen_ifindexes = g_hash_table_new (nm_direct_hash, NULL); seen_ifindexes = g_hash_table_new (nm_direct_hash, NULL);
c_list_for_each_entry (device, &priv->devices_lst_head, devices_lst) { c_list_for_each_entry (device, &priv->devices_lst_head, devices_lst) {
int ifindex; if (nm_manager_write_device_state (self, device)) {
gboolean managed; g_hash_table_add (seen_ifindexes,
NMConfigDeviceStateManagedType managed_type; GINT_TO_POINTER (nm_device_get_ip_ifindex (device)));
NMConnection *settings_connection;
const char *uuid = NULL;
const char *perm_hw_addr_fake = NULL;
gboolean perm_hw_addr_is_fake;
guint32 route_metric_default_aspired;
guint32 route_metric_default_effective;
ifindex = nm_device_get_ip_ifindex (device);
if (ifindex <= 0)
continue;
if (ifindex == 1) {
/* ignore loopback */
continue;
} }
if (!nm_platform_link_get (priv->platform, ifindex))
continue;
managed = nm_device_get_managed (device, FALSE);
if (managed) {
settings_connection = NM_CONNECTION (nm_device_get_settings_connection (device));
if (settings_connection)
uuid = nm_connection_get_uuid (settings_connection);
managed_type = NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_MANAGED;
} else if (nm_device_get_unmanaged_flags (device, NM_UNMANAGED_USER_EXPLICIT))
managed_type = NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_UNMANAGED;
else
managed_type = NM_CONFIG_DEVICE_STATE_MANAGED_TYPE_UNKNOWN;
perm_hw_addr_fake = nm_device_get_permanent_hw_address_full (device, FALSE, &perm_hw_addr_is_fake);
if (perm_hw_addr_fake && !perm_hw_addr_is_fake)
perm_hw_addr_fake = NULL;
nm_owned = nm_device_is_software (device) ? nm_device_is_nm_owned (device) : -1;
route_metric_default_effective = _device_route_metric_get (self, ifindex, NM_DEVICE_TYPE_UNKNOWN,
TRUE, &route_metric_default_aspired);
if (nm_config_device_state_write (ifindex,
managed_type,
perm_hw_addr_fake,
uuid,
nm_owned,
route_metric_default_aspired,
route_metric_default_effective))
g_hash_table_add (seen_ifindexes, GINT_TO_POINTER (ifindex));
} }
nm_config_device_state_prune_unseen (seen_ifindexes); nm_config_device_state_prune_unseen (seen_ifindexes);

3
src/nm-manager.h
View File

@@ -101,7 +101,8 @@ NMSettingsConnection **nm_manager_get_activatable_connections (NMManager *manage
guint *out_len, guint *out_len,
gboolean sort); gboolean sort);
void nm_manager_write_device_state (NMManager *manager); void nm_manager_write_device_state_all (NMManager *manager);
gboolean nm_manager_write_device_state (NMManager *manager, NMDevice *device);
/* Device handling */ /* Device handling */