// here we load a config if we can find it
// there are two sides to every class, the fwd side
// and the web page site (command line is web for all intents)
- function __construct()
+ function __construct($look_for_config = false)
{
- global $AM_DAEMON;
- if($AM_DAEMON) {
+ if($look_for_config) {
$this->config_file = null;
if(file_exists("../var/fw.conf")) {
$this->config_file = realpath("../var/fw.conf");
$this->config_file = "/var/lib/fwd/fw.conf";
} else if(is_dir("../var/")) {
echo "no config file found. Will use ../var/fw.conf for now\n";
- $this->config_file = "../var/";
+ $this->config_file = "../var/fw.conf";
} else {
echo "No directory where i can create a config, bailing\n";
- exit(0);
+ $this->config["status"] = "nodir";
}
}
-
- if($this->config["status"] == "conf") {
-
- $this->loadConfig($this->config_file);
- $this->findHardware();
-
- print_r($this->config);
- $this->applyConfig();
- } else {
- // we go into firstrun mode
- }
-
-
- } else {
- // config comes from shm... we'll get there
- }
+ }
+ }
+
+ function loadConfig($config)
+ {
+ $this->config = $config;
}
function findHardware()
{
+
+
// first, network interfaces
$dh = opendir("/sys/class/net/");
while(($fname = readdir($dh)) !== false) {
}
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;
}
return true;
}
- function loadConfig($file)
+ function mergeConfig($configone, $configtwo)
{
- global $AM_DAEMON;
- if(!$AM_DAEMON) return true;
+ // yep this means apply changes in configtwo to configone
+ $newconf = $configone;
+
+ // this is gunna be tough its gunna be a meet on meet sandwitch
+ foreach($configtwo as $key => $var) {
+ if($key != "status") {
+ error_log("apply change $key");
+ foreach($var as $key2=>$var2) {
+ error_log("which is $key2");
+ $splits = explode(" ", $var2);
+
+ // find a description
+ $description = null;
+ $hasdescription = false;
+ for($i=0; $i<count($splits); $i++) {
+ if($hasdescription !== false) {
+ if($description != null) {
+ $description .= " ";
+ }
+ $description .= $splits[$i];
+ }
+ if($splits[$i] == "#") {
+ $hasdescription = $i;
+ }
+ }
+
+
+ switch($key2) {
+ case "add":
+ error_log("would add $var2");
+ $thing = $splits[0];
+ switch($thing) {
+ case "zone":
+ $newconf["zone"][$splits[1]]["name"] = 1;
+ if($hasdescription) {
+ $newconf["zone"][$splits[1]]["description"] = $description;
+ }
+ break;
+
+ }
+ break;
+ case "modify":
+ error_log("would modify $var2");
+ $thing = $splits[0];
+ switch($thing) {
+ case "zone":
+ $zonename = $splits[1];
+ if($hasdescription) {
+ $newconf["zone"][$splits[1]]["description"] = $description;
+ }
+ if($splits[2] == "rename") {
+ $newname = $splits[3];
+ $tree = $newconf["zone"][$splits[1]];
+ unset($newconf["zone"][$splits[1]]);
+ $newconf["zone"][$newname] = $tree;
+ }
+ break;
+
+ }
+ break;
+
+
+ case "delete":
+ error_log("would delete $var2");
+ $thing = $splits[0];
+ switch($thing) {
+ case "zone":
+ $deletezone = $splits[1];
+ unset($newconf["zone"][$deletezone]);
+ break;
+
+ }
+ break;
+ }
+ }
+ }
+ }
+ return $newconf;
+ }
+
+ function loadConfigFile($file=null)
+ {
+
+ if($file == null) {
+ if($this->config["status"] == "nodir") {
+ return "nodir";
+ } else $file = $this->config_file;
+ }
+
+ if(!file_exists($file)) return "noconf";
$fp = fopen($file, "r");
}
- function saveConfig()
+ function saveConfigFile($file)
{
global $AM_DAEMON;
if(!$AM_DAEMON) return true;