Attachment 576536 Details for Bug 804814 – update interfaces in default zone after reload

[patch] update interfaces in default zone after reload

0001-update-interfaces-in-default-zone-after-reload-rhbz-.patch (text/plain), 2.47 KB, created by Jiri Popelka on 2012-04-10 18:04:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2012-04-10 18:04:26 UTC

Size: 2.47 KB

patch

obsolete

>From 09dcf2d69962b1e50d27c8ce9733a058f074b28c Mon Sep 17 00:00:00 2001
>From: Jiri Popelka <jpopelka@redhat.com>
>Date: Tue, 10 Apr 2012 20:01:09 +0200
>Subject: [PATCH] update interfaces in default zone after reload (rhbz#804814)
>
>---
> src/firewall/core/fw.py      |   12 ++++++++++++
> src/firewall/core/fw_zone.py |    6 +++---
> 2 files changed, 15 insertions(+), 3 deletions(-)
>
>diff --git a/src/firewall/core/fw.py b/src/firewall/core/fw.py
>index 0b73c62..1dd70f8 100644
>--- a/src/firewall/core/fw.py
>+++ b/src/firewall/core/fw.py
>@@ -428,6 +428,7 @@ class Firewall:
>             _zone_settings[zone] = self.zone.get_settings(zone)
>         # save direct config
>         _direct_config = self.direct.get_config()
>+        old_dz = self.get_default_zone()
> 
>         if stop:
>             self.stop()
>@@ -441,6 +442,17 @@ class Firewall:
>         if _panic:
>             self.enable_panic_mode()
> 
>+        new_dz = self.get_default_zone()
>+        if new_dz != old_dz:
>+            # default zone changed. Move interfaces from old default zone to the new one.
>+            for iface, settings in _zone_settings[old_dz]["interfaces"].items():
>+                if settings["default"]:
>+                    # move only those that were added to default zone
>+                    # (not those that were added to specific zone same as default)
>+                    _zone_settings[new_dz]["interfaces"][iface] = \
>+                    _zone_settings[old_dz]["interfaces"][iface]
>+                    del _zone_settings[old_dz]["interfaces"][iface]
>+
>         # restore zone settings
>         for zone in self.zone.get_zones():
>             if zone in _zone_settings:
>diff --git a/src/firewall/core/fw_zone.py b/src/firewall/core/fw_zone.py
>index 1c6f2cc..1898253 100644
>--- a/src/firewall/core/fw_zone.py
>+++ b/src/firewall/core/fw_zone.py
>@@ -275,6 +275,8 @@ class FirewallZone:
> 
>         _obj.settings["interfaces"][interface_id] = \
>             self.__gen_settings(0, sender)
>+        # add information whether we add to default or specific zone
>+        _obj.settings["interfaces"][interface_id]["default"] = (not zone or zone == "")
> 
>         return _zone
> 
>@@ -289,9 +291,7 @@ class FirewallZone:
>         if _old_zone != None:
>             self.remove_interface(_old_zone, interface)
> 
>-        self.add_interface(_new_zone, interface, sender)
>-
>-        return _new_zone
>+        return self.add_interface(zone, interface, sender)
> 
>     def remove_interface(self, zone, interface):
>         self._fw.check_panic()
>-- 
>1.7.9.3
>

Actions: View | Diff

Attachments on bug 804814: 575187 | 576536