From bcc34e20633d5bfeaa556866cc6fe7f2b40531d2 Mon Sep 17 00:00:00 2001 From: Colin Smith Date: Mon, 21 Mar 2005 05:27:55 +0000 Subject: Move some functions around. --- packages/ifdepd.xml | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'packages/ifdepd.xml') diff --git a/packages/ifdepd.xml b/packages/ifdepd.xml index 2d195f76..47bbac39 100644 --- a/packages/ifdepd.xml +++ b/packages/ifdepd.xml @@ -31,33 +31,38 @@ input + + functionn sync_package_ifdepd() { + conf_mount_rw(); + config_lock(); + global $config; + if ($_POST[0] == "") $_POST = $config['installedpackages']['ifdepd']['config']; + if($config['installedpackages']['ifdepd']['config'] != "") { + $fout = fopen("/usr/local/etc/rc.d/ifdepd.sh","w"); + fwrite($fout, "#!/bin/sh\n\n"); + if(isset($_POST['usedefaults'])) { + $lan_int = $config['interfaces']['lan']['if']; + $wan_int = $config['interfaces']['wan']['if']; + fwrite($fout, "/usr/local/bin/ifdepd -d -S " . $lan_int . ":" . $wan_int . " -D carp0:carp1\n"); + } else { + fwrite($fout, "/usr/local/bin/ifdepd -d -S " . $_POST['srcinterface'] . " -D " . $_POST['destinterface'] . "\n"); + } + fclose($fout); + } + conf_mount_ro(); + config_unlock(); + } + unlink_if_exists("/usr/local/etc/rc.d/ifdep*"); - function sync_package_ifdepd() { - conf_mount_rw(); - config_lock(); - global $config; - if ($_POST[0] == "") $_POST = $config['installedpackages']['ifdepd']['config']; - if($config['installedpackages']['ifdepd']['config'] != "") { - $fout = fopen("/usr/local/etc/rc.d/ifdepd.sh","w"); - fwrite($fout, "#!/bin/sh\n\n"); - if(isset($_POST['usedefaults'])) { - $lan_int = $config['interfaces']['lan']['if']; - $wan_int = $config['interfaces']['wan']['if']; - fwrite($fout, "/usr/local/bin/ifdepd -d -S " . $lan_int . ":" . $wan_int . " -D carp0:carp1\n"); - } else { - fwrite($fout, "/usr/local/bin/ifdepd -d -S " . $_POST['srcinterface'] . " -D " . $_POST['destinterface'] . "\n"); - } - fclose($fout); - } - conf_mount_ro(); - config_unlock(); - } sync_package_ifdepd(); mwexec("/usr/bin/killall ifdepd"); mwexec("/usr/local/etc/rc.d/ifdepd.sh"); + + sync_package_ifdepd(); + -- cgit v1.2.3