Index: /nodes/CNodeBurcht/wleiden.conf
===================================================================
--- /nodes/CNodeBurcht/wleiden.conf	(revision 3782)
+++ /nodes/CNodeBurcht/wleiden.conf	(revision 3783)
@@ -1,8 +1,8 @@
 #
 # config CNodeBurcht
+#
 
 $location="Sociteitsgebouw de Burcht";
-$master_part='172.17.184';
-$master_ip="$master_part.1";
+$master_ip='172.17.184.1';
 $gw_open='closed';
 $nodetype='CNode';
@@ -11,5 +11,5 @@
 $OS='FreeBSD';
 
-$status='planned';
+$status='up';
 
 $X='093786';
@@ -18,5 +18,5 @@
 $config{'ep0'}=sprintf <<EP0;
 TYPE=ethernet
-IP=$master_part.65/26
+IP=172.17.184.65/26
 
 DESC=Access Point 1 (binnen)
@@ -28,5 +28,5 @@
 $config{'xl0'}=sprintf <<EP1;
 TYPE=ethernet
-IP=$master_part.129/26
+IP=172.17.184.129/26
 
 DESC=Access Point 2 (binnen)
@@ -38,5 +38,5 @@
 $config{'wi0'}=sprintf <<EW0;
 TYPE=wireless
-IP=$master_part.1/26
+IP=$master_ip/26
 
 DESC=Omni Burcht
Index: /nodes/CNodeLMkempers1/wleiden.conf
===================================================================
--- /nodes/CNodeLMkempers1/wleiden.conf	(revision 3782)
+++ /nodes/CNodeLMkempers1/wleiden.conf	(revision 3783)
@@ -18,5 +18,4 @@
 $X='107010';
 $Y='471233';
-                                                                                                                                                                         
 $AGGREGATE=22;
 
Index: /nodes/CNodeLorentzhof/wleiden.conf
===================================================================
--- /nodes/CNodeLorentzhof/wleiden.conf	(revision 3782)
+++ /nodes/CNodeLorentzhof/wleiden.conf	(revision 3783)
@@ -70,12 +70,9 @@
 $config{'wi1'}=sprintf <<EW1;
 TYPE=wireless
-IP=172.16.1.210/30
+IP=172.16.1.66/30
 DESC=Link naar Roomburgh1
 SDESC=2roomburgh
 SPEED=11534336
-POINT_TO_POINT=172.16.1.209
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.209
+POINT_TO_POINT=172.16.1.65
 
 MODE=managed
Index: /nodes/CNodeRoomburgh1/wleiden.conf
===================================================================
--- /nodes/CNodeRoomburgh1/wleiden.conf	(revision 3782)
+++ /nodes/CNodeRoomburgh1/wleiden.conf	(revision 3783)
@@ -3,6 +3,5 @@
 #
 $location="Leiden";
-$master_part='172.18.48';
-$master_ip="$master_part.1";
+$master_ip='172.18.48.1';
 $gw_open='closed';
 $nodetype='CNode';
@@ -17,10 +16,8 @@
 $LOKATIE='R.K. Zorgcentrum Roomburgh Ketelhok';
 
-$N='';
-$E='';
 
 $config{'ep0'}=sprintf <<ED0;  # Ethernet
 TYPE=ethernet
-IP=$master_part.65/28
+IP=172.18.48.65/28
 
 DESC=Ethernet voor debuggen
@@ -99,9 +96,9 @@
 $config{'wi1:0'}=sprintf <<EW10;
 TYPE=wireless
-IP=172.16.1.209/30
+IP=172.16.1.65/30
 DESC=Link naar Lorentzhof
 SDESC=2lorentzhof
 SPEED=11534336
-POINT_TO_POINT=172.16.1.210
+POINT_TO_POINT=172.16.1.66
 
 DHCP=no
Index: /nodes/CNodeRoomburgh2/wleiden.conf
===================================================================
--- /nodes/CNodeRoomburgh2/wleiden.conf	(revision 3782)
+++ /nodes/CNodeRoomburgh2/wleiden.conf	(revision 3783)
@@ -1,5 +1,4 @@
 $location="Leiden";
-$master_part='172.18.49';
-$master_ip="$master_part.1";
+$master_ip='172.18.49.1';
 $gw_open='closed';
 $nodetype='CNode';
@@ -17,5 +16,5 @@
 $config{'ep0'}=sprintf <<ED0;  # Ethernet
 TYPE=ethernet
-IP=$master_part.65/28
+IP=172.18.49.65/28
 
 DESC=Ethernet voor Zorghuis
Index: /nodes/CNodeZwet/wleiden.conf
===================================================================
--- /nodes/CNodeZwet/wleiden.conf	(revision 3782)
+++ /nodes/CNodeZwet/wleiden.conf	(revision 3783)
@@ -3,5 +3,5 @@
 # config CNodeZwet 
 $location="Buurt sportvelden, Particulier dak,Zoeterwoude ";
-$master_ip='172.27.129.1';   
+$master_part='172.27.129.1';
 $gw_open='closed';
 $nodetype='CNode';
@@ -49,5 +49,5 @@
 $config{'wi0'}=sprintf <<EW0;  # OMNI
 TYPE=wireless
-IP=$172.27.129.2/26
+IP=172.27.129.2/26
 
 DESC=Omni voor de buurt
Index: /nodes/dubbelipcheck.sh
===================================================================
--- /nodes/dubbelipcheck.sh	(revision 3783)
+++ /nodes/dubbelipcheck.sh	(revision 3783)
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# dubbelipcheck.sh
+# Scriptje om in de wleiden.conf files van Wireless Leiden
+# te controleren of er geen dubbele ip addressen bestaan
+#
+# Rick van der Zwet (rick@wirelessleiden.nl)
+genesis_nodes_dir="."
+allowed_dubbel_ip="172.31.255.1 172.31.255.2"
+tmp_files="all_ips all_ips_no_double"
+
+#zoek alle ip address in de files op
+init()
+{
+	files=`find $genesis_nodes_dir/*/wleiden.conf | grep -e "[A-Z]Node\|proxy"`
+	
+	master_ips=`cat $files | grep '^$master_ip' |\
+						sed -e 's/$master_ip='\''//' -e 's/'\'\;'//'`
+	link_ips=`cat $files | grep ^IP | grep -v '$master_ip' |\
+					sed -e 's/IP=//' -e 's/\/[0-9]*//'`
+	echo "$master_ips $link_ips" | sort > all_ips
+	echo "$master_ips $link_ips" | sort -u > all_ips_no_double
+}
+
+
+#check up dubbele ip addressen
+dubbelIpCheck() {
+	dubbel_ips=`comm -23 all_ips all_ips_no_double | sort -u`
+}
+
+
+#verwijder toegestaande dubbele ip's
+verwijderToegestaandeIps() {
+	for allowed in $allowed_dubbel_ip; do
+		dubbel_ips=`echo $dubbel_ips | sed s/$allowed//`
+	done
+}
+
+
+#print resultaten
+results() {
+	if [ "$dubbel_ips" ]; then
+		for dubbel_ip in $dubbel_ips ; do
+			echo ""
+			echo "Dubbel ip gevonden: $dubbel_ip"
+			echo "Wordt gebruikt in:"
+			for file in $files ; do
+				grep $dubbel_ip $file | grep "^IP\|^$master_ip" > /dev/null && echo "  -$file"
+			done
+		done
+	else
+		echo "Geen dubbele ip's gevonden"
+	fi
+	echo ""
+	echo "Toegestaande dubbele ip's:"
+	for ip in $allowed_dubbel_ip ; do
+		echo "   -$ip"
+	done
+}
+
+
+#verwijder tijdelijke files
+cleanup() {
+	for file in $tmp_files ; do
+		rm $file
+	done
+}
+
+
+
+#hoofdmodule
+main() {
+	init
+	dubbelIpCheck
+	verwijderToegestaandeIps
+	results
+	cleanup
+}
+
+main
+exit 0
+