X-Git-Url: http://git.pjr.cc/?p=CBFWR.git;a=blobdiff_plain;f=libcbfwr%2Ffwui.php;h=e19e9a4b11597c8456ba91f9dd5a2c9399817d58;hp=adc95416a886aa96ab5a9c21287fe547ba1c89eb;hb=cb45585d92144a65ff25bc1109cde4cbf60913de;hpb=2bd3b834225a8b7aaf79b8114c958737411a8281
diff --git a/libcbfwr/fwui.php b/libcbfwr/fwui.php
index adc9541..e19e9a4 100644
--- a/libcbfwr/fwui.php
+++ b/libcbfwr/fwui.php
@@ -217,205 +217,6 @@ function CBFWRoutingPageDisplay()
echo "
Routing
";
}
-function CBFWInterfacesPage($urls)
-{
- if(isset($urls[1])) {
- switch($urls[1]) {
- case "edit":
- CBFWpageBuilder(null, "CBFWInterfacesPageEdit", null, null, $urls[2]);
- break;
- case "change":
- CBFWInterfacesChange();
- break;
- default:
- CBFWpageBuilder(null, "CBFWInterfacesPageDisplay");
- }
- } else {
- error_log("main interface page");
- CBFWpageBuilder(null, "CBFWInterfacesPageDisplay");
- }
-}
-
-function CBFWInterfacesChange()
-{
- global $BASE_URL, $MENU_ITEMS;
- $comms = new Comms();
-
- header("Location: $BASE_URL/interfaces");
-}
-
-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 = " Original address: $hwaddr";
- if($hwaddr != $extra2 && $extra2 != "") {
- $extra .= " Current Address: $hwaddr";
- }
- }
- 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 "Edit Interface $interface
";
- echo "";
-}
-
-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 "Create Interface
";
- echo "Link Aggregation Group (bonded/teamed interfaces)
";
- echo "VLAN Tagged Sub Interfaces
";
- echo "Bridged Interfaces
";
- echo "
";
-
- // 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 "Interfaces
Device | Zone | Type | MAC Address | Address | MTU | Speed/Duplex | Description | Control | ";
- 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"]."
".$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 "$name | $zone | $type | $mac | $address | $mtu | $spanddu | $desc | Edit |
";
- }
- echo "
";
-
- // to test
- echo "config: ";
- print_r($config);
- echo "
";
-}
-
function CBFWObjectsPage($urls)
{
$comms = new Comms();