X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Ffwui.php;h=adc95416a886aa96ab5a9c21287fe547ba1c89eb;hp=da324e8af358e6e921aecf39a212014117db4e90;hb=13e5ebe14a18fb0d217fdc6fc4fc786a678889da;hpb=3463517ff571fd38da7efe4bcfca2828e1dc6fa6

diff --git a/libcbfwr/fwui.php b/libcbfwr/fwui.php
index da324e8..adc9541 100644
--- a/libcbfwr/fwui.php
+++ b/libcbfwr/fwui.php
@@ -192,6 +192,31 @@ function CBFWZonesPageDisplay()
 	
 }
 
+function CBFWRoutingPage($urls)
+{
+	if(isset($urls[1])) {
+		switch($urls[1]) {
+			case "edit":
+				CBFWpageBuilder(null, "CBFWRoutingPageEdit", null, null, $urls[2]);
+				break;
+			case "change":
+				CBFWRoutingChange();
+				break;
+			default:
+				CBFWpageBuilder(null, "CBFWRoutingPageDisplay");
+		}
+	} else {
+		error_log("main interface page");
+		CBFWpageBuilder(null, "CBFWRoutingPageDisplay");
+	}
+	
+}
+
+function CBFWRoutingPageDisplay()
+{
+	echo "<h2>Routing</h2>";
+}
+
 function CBFWInterfacesPage($urls)
 {
 	if(isset($urls[1])) {
@@ -216,7 +241,6 @@ function CBFWInterfacesChange()
 	global $BASE_URL, $MENU_ITEMS;
 	$comms = new Comms();
 	
-	$comms->sendMessage("interface eth0 changename poof");
 	header("Location: $BASE_URL/interfaces");
 }
 
@@ -225,16 +249,51 @@ function CBFWInterfacesPageEdit($urls)
 	global $BASE_URL, $MENU_ITEMS;
 	$interface = $urls;
 	
+	$comms = new Comms();
+	
+	$config = getWebUserConfig();
+	$boot_config = $comms->getConfig(1);
+	
+	if(isset($config["interface"]["dev"]["$interface"]["name"])) $name = $config["interface"]["dev"]["$interface"]["name"];
+	else $name = "";
+	
+	$extra2 = "";
+	if(file_exists("/sys/class/net/$interface/address")) {
+		$extra2 = trim(file_get_contents("/sys/class/net/$interface/address"));
+	}
+	
+	$extra = "";
+	if(isset($boot_config["hardware"]["netdev"]["$interface"]["hwaddress"])) {
+		$hwaddr = $boot_config["hardware"]["netdev"]["$interface"]["hwaddress"];
+		$extra = " <i>Original address: $hwaddr</i>";
+		if($hwaddr != $extra2 && $extra2 != "") {
+			$extra .= " <i>Current Address: $hwaddr</i>";
+		}
+	}
+	if(isset($config["interface"]["dev"]["$interface"]["hwaddress"])) $hwaddr = $config["interface"]["dev"]["$interface"]["hwaddress"];
+	
+	if(isset($config["interface"]["dev"]["$interface"]["zone"])) $zone = $config["interface"]["dev"]["$interface"]["zone"];
+	
+	if(isset($config["interface"]["dev"]["$interface"]["address4"])) $ip4 = $config["interface"]["dev"]["$interface"]["address4"];
+	
+	if(isset($config["interface"]["dev"]["$interface"]["address6"])) $ip6 = $config["interface"]["dev"]["$interface"]["address6"];
+	
+	if(isset($boot_config["hardware"]["netdev"]["$interface"]["speed"])) $speed = $boot_config["hardware"]["netdev"]["$interface"]["speed"];
+	if(isset($boot_config["hardware"]["netdev"]["$interface"]["duplex"])) $duplex = $boot_config["hardware"]["netdev"]["$interface"]["duplex"];
+	if(isset($config["interface"]["dev"]["$interface"]["speed"])) $speed = $config["interface"]["dev"]["$interface"]["speed"];
+	if(isset($config["interface"]["dev"]["$interface"]["duplex"])) $duplex = $config["interface"]["dev"]["$interface"]["duplex"];
+	
 	echo "<h3>Edit Interface $interface</h3><br>";
 	echo "<form method=\"post\" action=\"$BASE_URL/interfaces/change/$interface\">";
 	echo "<table>";
-	echo "<tr><td>Name</td><td><input type=\"text\" name=\"name\"></td></tr>";
-	echo "<tr><td>HW Address</td><td><input type=\"text\" name=\"hwaddr\"></td></tr>";
-	echo "<tr><td>Zone</td><td><input type=\"text\" name=\"zone\"></td></tr>";
-	echo "<tr><td>IPv4 Address</td><td><input type=\"text\" name=\"ipv4addr\"></td></tr>";
-	echo "<tr><td>IPv6 Address</td><td><input type=\"text\" name=\"ipv6addr\"></td></tr>";
-	echo "<tr><td>Speed</td><td><input type=\"text\" name=\"speed\"></td></tr>";
-	echo "<tr><td>Duplex</td><td><input type=\"text\" name=\"duplex\"></td></tr>";
+	echo "<tr><td>Name</td><td><input type=\"text\" name=\"name\" value=\"$name\"></td></tr>";
+	echo "<tr><td>HW Address</td><td><input type=\"text\" name=\"hwaddr\" value=\"$hwaddr\">$extra</td></tr>";
+	echo "<tr><td>Zone</td><td><input type=\"text\" name=\"zone\" value=\"$zone\"></td></tr>";
+	echo "<tr><td>IPv4 Address</td><td><input type=\"text\" name=\"ipv4addr\" value=\"$ip4\"></td></tr>";
+	echo "<tr><td>IPv6 Address</td><td><input type=\"text\" name=\"ipv6addr\" value=\"$ip6\"></td></tr>";
+	echo "<tr><td>Speed</td><td><select name=\"duplex\"><option value=\"auto\">Auto</option><option value=\"10\">10</option>";
+	echo "<option value=\"100\">100</option><option value=\"1000\">1000</option><option value=\"10000\">10000</option></select></td></tr>";
+	echo "<tr><td>Duplex</td><td><select name=\"duplex\"><option value=\"auto\">Auto</option><option value=\"full\">Full</option><option value=\"half\">Half</option></select></td></tr>";
 	echo "</table>";
 	echo "<input type=\"submit\" name=\"Change\" value=\"Change\"><br>";
 	//echo "<a href=\"$BASE_URL/interfaces/\">Back</a>";
@@ -351,6 +410,7 @@ function CBFWInterfacesPageDisplay()
 	}
 	echo "</table>";
 	
+	// to test
 	echo "config: <pre>";
 	print_r($config);
 	echo "</pre>";