Kick the backend in the ass and make it start slbd (I hope)

2 files changed, 19 insertions, 5 deletions

diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php
index 64c6963..bf91305 100755
--- a/usr/local/www/load_balancer_virtual_server.php
+++ b/usr/local/www/load_balancer_virtual_server.php
@@ -30,7 +30,8 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require("guiconfig.inc");
+require_once("guiconfig.inc");
+require_once("vslb.inc");
 
 if (!is_array($config['load_balancer']['virtual_server'])) {
 	$config['load_balancer']['virtual_server'] = array();
@@ -45,6 +46,7 @@ if ($_POST) {
 		if (!file_exists($d_sysrebootreqd_path)) {
 			config_lock();
 			$retval |= filter_configure();
+			$retval |= slbd_configure();
 			config_unlock();
 		}
 		$savemsg = get_std_save_message($retval);
@@ -93,7 +95,8 @@ include("head.inc");
 	<div id="mainarea">
               <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                  <td width="30%" class="listhdrr">Virtual server address</td>
+                  <td width="10%" class="listhdrr">Name</td>
+                  <td width="20%" class="listhdrr">Server address</td>
                   <td width="10%" class="listhdrr">Port</td>
                   <td width="20%" class="listhdrr">Pool</td>
                   <td width="30%" class="listhdr">Description</td>
@@ -102,6 +105,9 @@ include("head.inc");
 			  <?php $i = 0; foreach ($a_vs as $vsent): ?>
                 <tr>
                   <td class="listlr" ondblclick="document.location='load_balancer_virtual_server_edit.php?id=<?=$i;?>';">
+			<?=$vsent['name'];?>
+                  </td>
+                  <td class="listlr" ondblclick="document.location='load_balancer_virtual_server_edit.php?id=<?=$i;?>';">
 			<?=$vsent['ipaddr'];?>
                   </td>
                   <td class="listlr" ondblclick="document.location='load_balancer_virtual_server_edit.php?id=<?=$i;?>';">
@@ -123,7 +129,7 @@ include("head.inc");
                 </tr>
                 <?php $i++; endforeach; ?>
                 <tr>
-                  <td class="list" colspan="4"></td>
+                  <td class="list" colspan="5"></td>
                   <td class="list">
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php
index 417a16c..8e9a613 100755
--- a/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/usr/local/www/load_balancer_virtual_server_edit.php
@@ -46,6 +46,7 @@ if (isset($id) && $a_vs[$id]) {
 	$pconfig['port'] = $a_vs[$id]['port'];
 	$pconfig['pool'] = $a_vs[$id]['pool'];
 	$pconfig['desc'] = $a_vs[$id]['desc'];
+	$pconfig['name'] = $a_vs[$id]['name'];
 }
 
 if ($_POST) {
@@ -53,14 +54,15 @@ if ($_POST) {
 	$pconfig = $_POST;
 
 	/* input validation */
-	$reqdfields = explode(" ", "ipaddr");
-	$reqdfieldsn = explode(",", "IP Address");
+	$reqdfields = explode(" ", "ipaddr name");
+	$reqdfieldsn = explode(",", "IP Address, Name");
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if (!$input_errors) {
 		$vsent = array();
 		
+		$vsent['name'] = $_POST['name'];
 		$vsent['desc'] = $_POST['desc'];
 		$vsent['pool'] = $_POST['pool'];
 		$vsent['port'] = $_POST['port'];
@@ -95,6 +97,12 @@ include("head.inc");
 
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
                 <tr align="left">
+		  <td width="22%" valign="top" class="vncellreq">Name</td>
+                  <td width="78%" class="vtable" colspan="2">
+                    <input name="name" type="text" <?if(isset($pconfig['name'])) echo "value=\"{$pconfig['name']}\"";?>size="32" maxlength="32">
+                  </td>
+		</tr>
+                <tr align="left">
 		  <td width="22%" valign="top" class="vncellreq">Description</td>
                   <td width="78%" class="vtable" colspan="2">
                     <input name="desc" type="text" <?if(isset($pconfig['desc'])) echo "value=\"{$pconfig['desc']}\"";?>size="64">