diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-11-14 14:12:30 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-11-14 16:14:35 +0100 |
| commit | bef9e447dc432bdb156afd6e3f5e1b8ae748e71c (patch) | |
| tree | cbe5e7cf06bc129afcd14af42150d65b6f99f4fe | |
| parent | c2a6f368a4eb40370cd83f83adcdb0d989edee96 (diff) | |
| download | NetworkManager-th/rh1098281_firewall_assumed_device.tar.gz | |
fixup! firewall: don't set firewall zone for assumed devicesth/rh1098281_firewall_assumed_device
| -rw-r--r-- | src/devices/nm-device.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 85f0bf0402..ba5c5397ce 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -259,7 +259,6 @@ typedef struct { gulong dnsmasq_state_id; /* Firewall */ - guint fw_call_idle; NMFirewallPendingCall fw_call; /* avahi-autoipd stuff */ @@ -4547,18 +4546,6 @@ fw_change_zone_cb (GError *error, gpointer user_data) _LOGI (LOGD_DEVICE, "Activation: Stage 3 of 5 (IP Configure Start) scheduled."); } -static gboolean -fw_change_zone_idle_cb (gpointer user_data) -{ - NMDevice *self = NM_DEVICE (user_data); - - NM_DEVICE_GET_PRIVATE (self)->fw_call_idle = 0; - - activation_source_schedule (self, nm_device_activate_stage3_ip_config_start, 0); - _LOGI (LOGD_DEVICE, "Activation: Stage 3 of 5 (IP Configure Start) scheduled."); - return G_SOURCE_REMOVE; -} - /* * nm_device_activate_schedule_stage3_ip_config_start * @@ -4578,7 +4565,6 @@ nm_device_activate_schedule_stage3_ip_config_start (NMDevice *self) g_return_if_fail (priv->act_request); g_return_if_fail (!priv->fw_call); - g_return_if_fail (!priv->fw_call_idle); /* Add the interface to the specified firewall zone */ connection = nm_device_get_connection (self); @@ -4589,7 +4575,8 @@ nm_device_activate_schedule_stage3_ip_config_start (NMDevice *self) if (nm_device_uses_assumed_connection (self)) { _LOGD (LOGD_DEVICE, "Activation: skip setting firewall zone '%s' for assumed device", zone ? zone : "default"); - priv->fw_call_idle = g_idle_add (fw_change_zone_idle_cb, self); + activation_source_schedule (self, nm_device_activate_stage3_ip_config_start, 0); + _LOGI (LOGD_DEVICE, "Activation: Stage 3 of 5 (IP Configure Start) scheduled."); return; } @@ -6888,10 +6875,6 @@ _cleanup_generic_pre (NMDevice *self, gboolean deconfigure) nm_firewall_manager_cancel_call (nm_firewall_manager_get (), priv->fw_call); priv->fw_call = NULL; } - if (priv->fw_call_idle) { - g_source_remove (priv->fw_call_idle); - priv->fw_call_idle = 0; - } connection = nm_device_get_connection (self); if ( deconfigure |