From 83901e1e475f6bcb6aca0aefbcbebde62339b481 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 18 Jul 2015 14:30:29 +0200
Subject: 3 lass.iptables sort rules instead of tables

---
 3modules/lass/iptables.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to '3modules')

diff --git a/3modules/lass/iptables.nix b/3modules/lass/iptables.nix
index 52058821c..b78879d2c 100644
--- a/3modules/lass/iptables.nix
+++ b/3modules/lass/iptables.nix
@@ -99,26 +99,27 @@ let
   #todo: differentiate by iptables-version
   buildTables = v: ts:
     let
-      sortedTable = sort (a: b: a.precedence < b.precedence) ts;
 
       declareChain = t: cn:
         #TODO: find out what to do whit these count numbers
         ":${cn} ${t."${cn}".policy} [0:0]";
 
       buildChain = tn: cn:
-      #"${concatStringsSep " " ((attrNames t."${cn}") ++ [cn])}";
-
-      #TODO: double check should be unneccessary, refactor!
-        if (hasAttr "rules" ts."${tn}"."${cn}") then
-          if (ts."${tn}"."${cn}".rules == null) then
-            ""
+        let
+          sortedRules = sort (a: b: a.precedence < b.precedence) ts."${tn}"."${cn}".rules;
+
+        in
+          #TODO: double check should be unneccessary, refactor!
+          if (hasAttr "rules" ts."${tn}"."${cn}") then
+            if (ts."${tn}"."${cn}".rules == null) then
+              ""
+            else
+              concatMapStringsSep "\n" (rule: "\n-A ${cn} ${rule}") ([]
+                ++ map (buildRule tn cn) sortedRules
+              )
           else
-            concatMapStringsSep "\n" (rule: "\n-A ${cn} ${rule}") ([]
-              ++ map (buildRule tn cn) ts."${tn}"."${cn}".rules
-            )
-        else
-          ""
-        ;
+            ""
+          ;
 
 
       buildRule = tn: cn: rule:
@@ -143,7 +144,7 @@ let
         "\nCOMMIT";
     in
       concatStringsSep "\n" ([]
-        ++ map buildTable (attrNames sortedTable)
+        ++ map buildTable (attrNames ts)
       );
 
 #=====
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/d2100000.lock: No such file or directory (2)