Index: /trunk/exodus/sql/dnsserver.sql
===================================================================
--- /trunk/exodus/sql/dnsserver.sql	(revision 6311)
+++ /trunk/exodus/sql/dnsserver.sql	(revision 6312)
@@ -1,4 +1,2 @@
-INSERT INTO exodus_DnsServer VALUES ( 1, '172.17.8.68', 1);
-INSERT INTO exodus_DnsServer VALUES ( 2, '172.17.143.4', 1);
-INSERT INTO exodus_DnsServer VALUES ( 3, '172.20.128.98', 1);
-INSERT INTO exodus_DnsServer VALUES ( 4, '172.27.129.66', 1);
+INSERT INTO exodus_DnsServer VALUES ( 1, '172.17.8.68', 'wleiden.net');
+INSERT INTO exodus_DnsServer VALUES ( 2, '172.17.143.4', 'wzoeterwoude.net');
Index: /trunk/exodus/views.py
===================================================================
--- /trunk/exodus/views.py	(revision 6311)
+++ /trunk/exodus/views.py	(revision 6312)
@@ -11,5 +11,5 @@
 
 from exodus.models import *
-from exodus.wllogic import freemasterip, newSSIDName, freeinterlinkip
+from exodus.wllogic import freeMasterIP, newSSIDName, freeinterlinkip
 
 class AddLocationForm(forms.ModelForm):
@@ -22,5 +22,5 @@
 		if form.is_valid():
 			form.save()
-			return HttpResponseRedirect(reverse('exodus.views.addNode'))
+			return HttpResponseRedirect(reverse('exodus.views.addNode') + "?location=" + request.POST['description'])
 	else:
 		form = AddLocationForm()
@@ -38,9 +38,14 @@
 			# input a valid master ip into new_data
 			instance  = form.save(commit=False)
-			instance.masterip = freemasterip()
+			instance.masterip = freeMasterIP(instance)
 			instance.save()
-			return HttpResponseRedirect(reverse('nodelist'))
-	else:
-		form = AddNodeForm()
+			return HttpResponseRedirect(reverse('node-detail', args=[instance.name]))
+	else:
+		if 'location' in request.GET:
+			newNode = Node()
+			newNode.location = Location.objects.get(description=request.GET['location'])
+			form = AddNodeForm(instance=newNode)
+		else:
+			form = AddNodeForm()
 	return render_to_response('addnode.html', {'form': form })
 
@@ -68,5 +73,5 @@
 			# input a valid master ip into new_data
 			instance  = form.save(commit=False)
-			instance.masterip = freemasterip()
+			instance.masterip = freeMasterIP(instance)
 			instance.save()
 			return HttpResponseRedirect(reverse('nodelist'))
Index: /trunk/exodus/wllogic.py
===================================================================
--- /trunk/exodus/wllogic.py	(revision 6311)
+++ /trunk/exodus/wllogic.py	(revision 6312)
@@ -45,6 +45,5 @@
 	return(showaddr(broadcast(address,netmask)))
 
-
-def freemasterip():
+def freeMasterIP(node):
 	taken = {}
 
@@ -53,8 +52,10 @@
 		taken[addr] = 1
 
+	#Currently claiming a /24 for every node
 	size = 24
 	numaddrs = 1 << (32 - size)
 
-	i = 0xAC110001L # hardcoded 172.17.0.1 ## need to fix this
+	#XXX: No out of bond checking done yet
+	i = parseaddr(node.network.ipspacestart)
 	while taken.has_key(i):
 		i = i + numaddrs