Changeset 6244

Timestamp:

Sep 4, 2008, 10:37:42 AM (16 years ago)

Author:

RIck van der Zwet

Message:

• Extended wllogic with some network/broadcast logic
• Used templates and filters in order to be able to properly find and display the network and broadcast of a network which needs to be used a various templates.

Location:

exodus

Files:

• templates/dhcpd.conf (modified) (2 diffs)
• templatetags (added)
• templatetags/__init__.py (added)
• templatetags/network.py (added)
• wllogic.py (modified) (2 diffs)

exodus/templates/dhcpd.conf

@@ +1 @@
+{% load network %}
 # The file is WirelessLeiden specific. Please make all changes in exodus
 #
@@ -16 +17 @@
 option domain-name-servers {{ object.masterip }};
 
-{% for nic in object.nic %}
-        # {{ nic.iface }} {{ nic.desc }}
-        
+{% for nic in object.nic.all %}
+# {{ nic.iface }} {{ nic.desc }}
+        {% for omni in nic.omni.all %}
+subnet {% network omni.ip omni.netmask %} netmask {{ omni.netmask|subnet }} {
+        range {{ omni.dhcpstart }} {{ omni.dhcpstop }};
+        option routers {{ omni.ip }};
+        option broadcast-address {% broadcast omni.ip omni.netmask %};
+        option subnet-mask {{ omni.netmask|subnet }};
+}
+        {% endfor %}
+
 {% endfor %}

exodus/wllogic.py

@@ -1 +1 @@
 # (c) Roland van Laar
 
-from exodus.models import Node, Network, Interlink
+#from exodus.models import Node, Network, Interlink
 
 def newSSIDName(node, nic, desc):
@@ -23 +23 @@
 def showaddr(a):
         return "%d.%d.%d.%d" % ((a >> 24) & 0xff, (a >> 16) & 0xff, (a >> 8) & 0xff, a & 0xff)
+
+def netmask2subnet(s):
+        """IPv4 netmask to subnet"""
+        return (0xffffffff << (32 - s))
+
+def getSubnet(netmask):
+        return(showaddr(netmask2subnet(netmask)))
+
+def network(address, netmask):
+        """IPv4 network address when address and netmask are given"""
+        return(parseaddr(address) & netmask2subnet(netmask))
+
+def broadcast(address, netmask):
+        """IPv4 network address when address and netmask are given"""
+        return((parseaddr(address) & netmask2subnet(netmask)) | 0xffffffff >> netmask) 
+
+def getNetwork(address, netmask):
+        return(showaddr(network(address,netmask)))
+
+def getBroadcast(address, netmask):
+        return(showaddr(broadcast(address,netmask)))
+
 
 def freemasterip():