Bach Dániel · @bachdaniel · Őry Máté · Őry Máté · Bach Dániel · Őry Máté
--- a/circle/firewall/fw.py
+++ b/circle/firewall/fw.py
+    ipv6 = IPAddress(ipv6, version=6)
    octets = []
-    for part in ipv6.split(':'):
-        if not part:
-            octets.extend([0, 0])
-        else:
-            # Pad hex part to 4 digits.
-            part = '%04x' % int(part, 16)
-            octets.append(int(part[:2], 16))
-            octets.append(int(part[2:], 16))
+    for part in ipv6.words:
+        # Pad hex part to 4 digits.
+        part = '%04x' % part
+        octets.append(int(part[:2], 16))
+        octets.append(int(part[2:], 16))
    return '\\' + '\\'.join(['%03o' % x for x in octets])
--- a/circle/firewall/models.py
+++ b/circle/firewall/models.py
        blank=True, null=True, verbose_name=_("source port"),
        validators=[MinValueValidator(1), MaxValueValidator(65535)],
        help_text=_("Source port number of packets that match."))
+    priority = models.IntegerField(
+        verbose_name=_("priority"),
+        validators=[MinValueValidator(1), MaxValueValidator(65535)],
+        help_text=_("TODO"),
+        default=1000)
    proto = models.CharField(max_length=10, choices=CHOICES_proto,
                             blank=True, null=True, verbose_name=_("protocol"),
                             help_text=_("Protocol of packets that match."))
    extra = models.TextField(blank=True, verbose_name=_("extra arguments"),
                             help_text=_("Additional arguments passed "
                                         "literally to the iptables-rule."))
-    accept = models.BooleanField(default=False, verbose_name=_("accept"),
+    accept = models.BooleanField(default=True, verbose_name=_("accept"),
--- a/circle/firewall/models.py
+++ b/circle/firewall/models.py
  
    @property
    def incoming_rules(self):
-        return self.rules.filter(direction='1')
+        return self.rules.filter(direction='in')
+
+    @property
+    def ipv6_with_prefixlen(self):
+        try:
+            net = IPNetwork(self.ipv6)
+            net.prefixlen = 112