[Zrouter-src] ZRouter.org: push to zconf++ zconf++/zconfig.cc

[zrouter-src at zrouter.org]

details:   /rev/d80c02ff4e88
changeset: 22:d80c02ff4e88
user:      "Nicolai Petri <nicolai at petri.dk>"
date:      Sat Dec 03 21:41:36 2011 +0100
description:
Slightly change interface model.

diffstat:

 zconf++/zconfig.cc |  21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diffs (50 lines):

diff -r 50cdd5d796ae -r d80c02ff4e88 zconf++/zconfig.cc
--- a/zconf++/zconfig.cc	Fri Dec 02 08:25:57 2011 +0100
+++ b/zconf++/zconfig.cc	Sat Dec 03 21:41:36 2011 +0100
@@ -59,15 +59,18 @@
 			l["networking"]["routing"]["ipv4"]["default"]["netmask"] = "0.0.0.0";
 			l["networking"]["routing"]["ipv4"]["default"]["gateway"] = "192.168.1.1";
 			l["networking"]["routing"]["ipv4"]["default"]["interface"] = "em0";
-			l["networking"]["interfaces"]["em0"]["static"] = Leaf(true);
+			l["networking"]["interfaces"]["em0"]["static"] = Leaf(false);
 			l["networking"]["interfaces"]["em0"]["name"] = "em0";
 			l["networking"]["interfaces"]["em0"]["type"] = "ethernet";
 			l["networking"]["interfaces"]["em0"]["description"] = "LAN";
 			l["networking"]["interfaces"]["em0"]["enabled"] = Leaf(true);
 			l["networking"]["interfaces"]["em0"]["virtual"] = Leaf(false);
-			l["networking"]["interfaces"]["em0"]["addresses"]["192.168.1.100"]["type"] = "ipv4";
-			l["networking"]["interfaces"]["em0"]["addresses"]["192.168.1.100"]["address"] = "192.168.1.100";
-			l["networking"]["interfaces"]["em0"]["addresses"]["192.168.1.100"]["netmask"] = "255.255.255.0";
+			l["networking"]["interfaces"]["em0"]["addresses"][0]["type"] = "ipv4";
+			l["networking"]["interfaces"]["em0"]["addresses"][0]["address"] = "192.168.1.100";
+			l["networking"]["interfaces"]["em0"]["addresses"][0]["netmask"] = "255.255.255.0";
+			l["networking"]["interfaces"]["em0"]["addresses"][1]["type"] = "ipv4";
+			l["networking"]["interfaces"]["em0"]["addresses"][1]["address"] = "192.168.1.101";
+			l["networking"]["interfaces"]["em0"]["addresses"][1]["netmask"] = "255.255.255.255";
 			l["networking"]["interfaces"]["em0"]["mtu"] = 1500;
 			l["networking"]["interfaces"]["em1"]["static"] = Leaf(true);
 			l["networking"]["interfaces"]["em1"]["name"] = "em1";
@@ -75,9 +78,9 @@
 			l["networking"]["interfaces"]["em1"]["description"] = "WAN";
 			l["networking"]["interfaces"]["em1"]["enabled"] = Leaf(true);
 			l["networking"]["interfaces"]["em1"]["virtual"] = Leaf(false);
-			l["networking"]["interfaces"]["em1"]["addresses"]["172.16.1.2"]["address"] = "172.16.1.2";
-			l["networking"]["interfaces"]["em1"]["addresses"]["172.16.1.2"]["netmask"] = "255.255.255.252";
-			l["networking"]["interfaces"]["em1"]["addresses"]["172.16.1.2"]["type"] = "ipv4";
+			l["networking"]["interfaces"]["em1"]["addresses"][0]["address"] = "172.16.1.2";
+			l["networking"]["interfaces"]["em1"]["addresses"][0]["netmask"] = "255.255.255.252";
+			l["networking"]["interfaces"]["em1"]["addresses"][0]["type"] = "ipv4";
 			l["networking"]["interfaces"]["em1"]["mtu"] = 1500;
 			l["networking"]["interfaces"]["em2"]["static"] = Leaf(true);
 			l["networking"]["interfaces"]["em2"]["name"] = "em2";
@@ -85,8 +88,8 @@
 			l["networking"]["interfaces"]["em2"]["description"] = "OPT";
 			l["networking"]["interfaces"]["em2"]["enabled"] = Leaf(true);
 			l["networking"]["interfaces"]["em2"]["virtual"] = Leaf(false);
-			l["networking"]["interfaces"]["em2"]["addresses"]["DHCP"]["type"] = "ipv4";
-			l["networking"]["interfaces"]["em2"]["addresses"]["DHCP"]["dhcp_enabled"] = Leaf(true);
+			l["networking"]["interfaces"]["em2"]["addresses"][0]["type"] = "ipv4";
+			l["networking"]["interfaces"]["em2"]["addresses"][0]["address"] = "DHCP";
 			l["networking"]["services"]["sshd"]["name"] = "Secure Shell Daemon";
 			l["networking"]["services"]["sshd"]["enabled"] = Leaf(true);
 			l["networking"]["services"]["sshd"]["port"] = 22;