making config changes all happen in "addConfigLine"

[CBFWR.git] / libcbfwr / config.php

diff --git a/libcbfwr/config.php b/libcbfwr/config.php
index 3c7a54f..f2aaa52 100644 (file)
--- a/libcbfwr/config.php
+++ b/libcbfwr/config.php
@@ -63,6 +63,7 @@ class Config {
                                        }
                                        fclose($fp);
                                }
+                               if(file_exists("/sys/class/net/$fname/mtu")) $this->config["hardware"]["netdev"][$fname]["mtu"] = file_get_contents("/sys/class/net/$fname/mtu");
                                if(file_exists("/sys/class/net/$fname/address")) $this->config["hardware"]["netdev"][$fname]["hwaddress"] = file_get_contents("/sys/class/net/$fname/address");
                                if(file_exists("/sys/class/net/$fname/bonding")) $this->config["hardware"]["netdev"][$fname]["bonding"] = true;
                                if(file_exists("/sys/class/net/$fname/bridge")) $this->config["hardware"]["netdev"][$fname]["bridge"] = true;
@@ -75,6 +76,10 @@ class Config {
                return $this->config;
        }
        
+       function setConfig($config) {
+               $this->config = $config;
+       }
+       
        function applyConfig()
        {
                global $AM_DAEMON;
@@ -84,10 +89,7 @@ class Config {
                return true;
        }
        
-       function mergeConfig($configone, $configtwo)
-       {
-               // yep
-       }
+
        
        function loadConfigFile($file=null)
        {
@@ -106,11 +108,11 @@ class Config {
                while($line = fgets($fp)) {
                        $line = trim($line);
                        echo "read line $line\n";
-                       if($line != "") $this->parseLine($line, $i++);
+                       if($line != "") $this->addConfigLine($line, $i++);
                }
        }
        
-       function parseLine($line, $lineno)
+       function addConfigLine($line, $lineno=0)
        {
                $expl = preg_split("/ +/", $line);
                
@@ -139,22 +141,51 @@ class Config {
                        $expl = $expl_r;
                }
                
+               $delete = false;
+               // check for delete on the line
+               if($expl[0] == "delete") {
+                       $delete = true;
+                       
+                       // re-order the array
+                       for($i=0; $i < (count($expl)-1); $i++) {
+                       $expl[$i] = $expl[$i+1];
+                       }
+                       unset($expl[count($expl)-1]);
+               }
+               
                switch($expl[0]) {
                        case "hostname":
                                // set the hostname to $1
-                               $this->config["hostname"] = $expl[1];
+                               if($delete) {
+                                       unset($this->config["hostname"]);                               
+                               } else {
+                                       $this->config["hostname"] = $expl[1];
+                               }
                                break;
                                
                        case "domainname":
                                // set the hostname to $1
-                               $this->config["domainname"] = $expl[1];
+                               if($delete) {
+                                       unset($this->config["domainname"]);
+                               } else {
+                                       $this->config["domainname"] = $expl[1];
+                               }
                                break;
                                
                        case "zone":
-                               if($hasdescription) {
-                                       $this->config["zone"][$expl[2]]["description"] = $description;
+                               if($delete) {
+                                       error_log("delete zone ".$expl[2]);
+                                       unset($this->config["zone"][$expl[2]]);
+                                       if(count($this->config["zone"]) < 1) {
+                                               error_log("zone now empty, delete zones");
+                                               unset($this->config["zone"]);
+                                       }
+                               } else {
+                                       if($hasdescription) {
+                                               $this->config["zone"][$expl[2]]["description"] = $description;
+                                       }
+                                       $this->config["zone"][$expl[2]]["name"] = true;
                                }
-                               $this->config["zone"][$expl[2]]["name"] = true;
                                break;
                                
                        case "interface":
@@ -230,54 +261,65 @@ class Config {
                                
                                
                        case "login":
-                               $this->config["login"][$expl[1]] = $expl[3];
-                               if($hasdescription) {
-                                       $this->config["login"][$expl[1]]["description"] = $description;
+                               if($delete) {
+                                       unset($this->config["login"][$expl[1]]);
+                               } else {
+                                       $this->config["login"][$expl[1]] = $expl[3];
+                                       if($hasdescription) {
+                                               $this->config["login"][$expl[1]]["description"] = $description;
+                                       }
                                }
                                break;
                        
                        case "route4":
-                               $route = $expl[1];
-                               $via = $expl[2];
-                               $dest = $expl[3];
-                               if($via == "to") {
-                                       $this->config["route4"][$route]["address"] = $dest;
+                               if($delete) {
+                                       unset($this->config["route4"][$expl[1]]);
                                } else {
-                                       $this->config["route4"][$route]["device"] = $dest;
-                               }
-                               if(isset($expl[4])) {
-                                       if($expl[4] == "dev") {
-                                               if(isset($expl[5])) {
-                                                       $this->config["route4"][$route]["device"] = $expl[5];
+                                       $route = $expl[1];
+                                       $via = $expl[2];
+                                       $dest = $expl[3];
+                                       if($via == "to") {
+                                               $this->config["route4"][$route]["address"] = $dest;
+                                       } else {
+                                               $this->config["route4"][$route]["device"] = $dest;
+                                       }
+                                       if(isset($expl[4])) {
+                                               if($expl[4] == "dev") {
+                                                       if(isset($expl[5])) {
+                                                               $this->config["route4"][$route]["device"] = $expl[5];
+                                                       }
                                                }
                                        }
-                               }
-                               if($hasdescription) {
-                                       $this->config["route4"][$route]["description"] = $description;
+                                       if($hasdescription) {
+                                               $this->config["route4"][$route]["description"] = $description;
+                                       }
                                }
                                break;
                                
                                
                        case "route6":
-                               $route = $expl[1];
-                               $via = $expl[2];
-                               $dest = $expl[3];
-                               if($via == "to") {
-                                       $this->config["route6"][$route]["address"] = $dest;
+                               if($delete) {
+                                       unset($this->config["route6"][$expl[1]]);
                                } else {
-                                       $this->config["route6"][$route]["device"] = $dest;
-                               }
-                               if(isset($expl[4])) {
-                                       if($expl[4] == "dev") {
-                                               if(isset($expl[5])) {
-                                                       $this->config["route6"][$route]["device"] = $expl[5];
+                                       $route = $expl[1];
+                                       $via = $expl[2];
+                                       $dest = $expl[3];
+                                       if($via == "to") {
+                                               $this->config["route6"][$route]["address"] = $dest;
+                                       } else {
+                                               $this->config["route6"][$route]["device"] = $dest;
+                                       }
+                                       if(isset($expl[4])) {
+                                               if($expl[4] == "dev") {
+                                                       if(isset($expl[5])) {
+                                                               $this->config["route6"][$route]["device"] = $expl[5];
+                                                       }
                                                }
                                        }
+                                       if($hasdescription) {
+                                               $this->config["route6"][$route]["description"] = $description;
+                                       }
                                }
-                               if($hasdescription) {
-                                       $this->config["route6"][$route]["description"] = $description;
-                               }
-                               
                                // here we should check "$route"
                                break;