X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Ffwui.php;h=e19e9a4b11597c8456ba91f9dd5a2c9399817d58;hp=bb2fc8e7b935e4d32d69d888f66744bf7b22ae5e;hb=cb45585d92144a65ff25bc1109cde4cbf60913de;hpb=482faf0546015989a57b68640fd9a1ff5e8666f2

diff --git a/libcbfwr/fwui.php b/libcbfwr/fwui.php
index bb2fc8e..e19e9a4 100644
--- a/libcbfwr/fwui.php
+++ b/libcbfwr/fwui.php
@@ -192,169 +192,29 @@ function CBFWZonesPageDisplay()
 	
 }
 
-function CBFWInterfacesPage($urls)
+function CBFWRoutingPage($urls)
 {
 	if(isset($urls[1])) {
 		switch($urls[1]) {
 			case "edit":
-				CBFWpageBuilder(null, "CBFWInterfacesPageEdit", null, null, $urls[2]);
+				CBFWpageBuilder(null, "CBFWRoutingPageEdit", null, null, $urls[2]);
 				break;
 			case "change":
-				CBFWInterfacesChange();
+				CBFWRoutingChange();
 				break;
 			default:
-				CBFWpageBuilder(null, "CBFWInterfacesPageDisplay");
+				CBFWpageBuilder(null, "CBFWRoutingPageDisplay");
 		}
 	} else {
 		error_log("main interface page");
-		CBFWpageBuilder(null, "CBFWInterfacesPageDisplay");
+		CBFWpageBuilder(null, "CBFWRoutingPageDisplay");
 	}
-}
-
-function CBFWInterfacesChange()
-{
-	global $BASE_URL, $MENU_ITEMS;
-	$comms = new Comms();
 	
-	$comms->sendMessage("interface eth0 changename poof");
-	header("Location: $BASE_URL/interfaces");
 }
 
-function CBFWInterfacesPageEdit($urls)
+function CBFWRoutingPageDisplay()
 {
-	global $BASE_URL, $MENU_ITEMS;
-	$interface = $urls;
-	
-	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 "</table>";
-	echo "<input type=\"submit\" name=\"Change\" value=\"Change\"><br>";
-	//echo "<a href=\"$BASE_URL/interfaces/\">Back</a>";
-	echo "</form>";
-}
-
-function CBFWInterfacesPageDisplay()
-{
-	global $BASE_URL, $MENU_ITEMS;
-	$comms = new Comms();
-	
-	$config = getWebUserConfig();
-	$boot_config = $comms->getConfig(1);
-	
-	// at the top, we put in the creation bits
-	echo "<h2>Create Interface</h2>";
-	echo "<li><a href=\"$BASE_URL/interfaces/create/bond\">Link Aggregation Group (bonded/teamed interfaces)</a><br>";
-	echo "<li><a href=\"$BASE_URL/interfaces/create/vlan\">VLAN Tagged Sub Interfaces</a><br>";
-	echo "<li><a href=\"$BASE_URL/interfaces/create/bridge\">Bridged Interfaces</a><br>";
-	echo "<hr>";
-	
-	// now build an interface table
-	$table = array();
-	foreach($boot_config["hardware"]["netdev"] as $key=>$val) {
-		$ename = $key;
-		$table[$key]["realname"] = $val["name"];
-		$table[$key]["name"] = $val["name"];
-		
-		
-		// driver
-		if(isset($val["driver"])) $table[$key]["type"] = $val["driver"];
-		else $table[$key]["type"] = "Unknown";
-		
-		// hw address
-		if(isset($val["hwaddress"])) $table[$key]["hwaddress"] = $val["hwaddress"];
-		
-		// current mtu
-		if(isset($val["mtu"])) $table[$key]["mtu"] = $val["mtu"];
-		
-		// speed
-		if(isset($val["speed"])) $table[$key]["speed"] = $val["speed"];
-		else $table[$key]["speed"] = "default";
-		
-		// duplex
-		if(isset($val["duplex"])) $table[$key]["duplex"] = $val["duplex"];
-		else $table[$key]["duplex"] = "default";
-	}
-	
-	foreach($config["interface"]["dev"] as $key => $val) {
-		// TODO construction zone
-		error_log("doing $key");
-		if(isset($val["name"])) $table[$key]["name"] = $val["name"];
-		if(isset($val["address4"])) $table[$key]["address4"] = $val["address4"];
-		if(isset($val["address6"])) $table[$key]["address6"] = $val["address6"];
-		if(isset($val["description"])) $table[$key]["description"] = $val["description"];
-		if(isset($val["zone"])) $table[$key]["zone"] = $val["zone"];
-	}
-
-	
-	echo "<h2>Interfaces</h2><table border=\"1\"><th>Device</th><th>Zone</th><th>Type</th><th>MAC Address</th><th>Address</th><th>MTU</th><th>Speed/Duplex</th><th>Description</th><th>Control</th></tr>";
-	foreach($table as $key =>$val) {
-		if($val["realname"] == $val["name"]) $name = $val["name"];
-		else $name = $val["name"]." (".$val["realname"].")";
-		
-		// zone
-		if(isset($val["zone"])) {
-			if($val["zone"] == null) $zone = "-";
-			else $zone = $val["zone"];
-		} else $zone = "-";
-		
-		// mtu
-		if(isset($val["mtu"])) {
-			$mtu = $val["mtu"];
-		} else $mtu = "-";
-		
-		// driver type
-		if(isset($val["type"])) { 
-			$type = $val["type"];
-		} else $type = "-";
-		
-		// hardware address
-		if(isset($val["hwaddress"])) {
-			$mac = $val["hwaddress"];
-		} else $mac = "-";
-		
-		// speed and duplex
-		if(isset($val["duplex"])) {
-			if($val["duplex"] == null) $dup = "default";
-			else $dup = $val["duplex"];
-		} //else $dup = "default"; // TODO: needs to go away in fav of hardware setting
-		
-		if(isset($val["speed"])) {
-			if($val["speed"] == null) $spd = "default";
-			else $spd = $val["speed"];
-		} //else $spd = "default"; // TODO: needs to go away inf av of hardware setting
-		
-		$spanddu = "$spd/$dup";
-		
-		// network address
-		if(isset($val["address4"]) && isset($val["address6"])) {
-			$address = $val["address4"]."<br>".$val["address6"];
-		} else if(isset($val["address4"])) {
-			$address = $val["address4"];
-		} else if(isset($val["address6"])) {
-			$address = $val["address6"];
-		} else {
-			$address = "-";
-		}
-		
-		if(isset($val["description"])) $desc = $val["description"];
-		else $desc = "-";
-		
-		echo "<tr><th>$name</th><td>$zone</td><td>$type</td><td>$mac</td><td>$address</td><td>$mtu</td><td>$spanddu</td><td>$desc</td><td><a href=\"$BASE_URL/interfaces/edit/".$val["realname"]."\">Edit</a></td></tr>";
-	}
-	echo "</table>";
-	
-	// to test
-	echo "config: <pre>";
-	print_r($config);
-	echo "</pre>";
+	echo "<h2>Routing</h2>";
 }
 
 function CBFWObjectsPage($urls)