[Netpass-devel] NetPass/www/htdocs/Admin network.mhtml,1.13,1.14

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass/www/htdocs/Admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15265/www/htdocs/Admin

Modified Files:
	network.mhtml 
Log Message:
added custom-mac specification to per-network config to more easily support NU non-GARP feature. see appendix D in doc

Index: network.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/Admin/network.mhtml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- network.mhtml	6 Sep 2005 20:29:18 -0000	1.13
+++ network.mhtml	23 Mar 2006 18:50:04 -0000	1.14
@@ -6,6 +6,7 @@
  - add/remove networks
  - configure per-network settings
 	- comment
+	- custom mac address (see Appendix D)
 	- ha enabled/disabled + settings
 	- garp enabled/disabled + settings
 	- netgroup membership
@@ -24,6 +25,7 @@
 	$submitButton        => '';
 	$network             => '';
 	$comment             => '';
+	$cmac                => '';
 	$interface           => '';
 	$qvid                => '';
 	$uqvid               => '';
@@ -79,11 +81,12 @@
 if ( ($submitButton eq "Commit Changes") && $network && ($network ne $WH) ) {
 	_log("DEBUG", $m->session->{'username'}. " is updating $network $secondaryRedirector\n");
 
-	$rv = $np->cfg->setNetwork(-network => $network,
-					-comment => $comment,
+	$rv = $np->cfg->setNetwork(-network        => $network,
+					-comment   => $comment,
 					-interface => $interface,
-					-qvid => $qvid,
-					-uqvid => $uqvid);
+					-qvid      => $qvid,
+					-uqvid     => $uqvid,
+					-cmac      => $cmac);
 	push @setResults, "Failed to set 'network' fields: $rv" if $rv;
 
 	$rv = $np->cfg->setHA(  -network   => $network, 
@@ -175,6 +178,7 @@
 	$uqvid      = $np->cfg->nonquarantineVlan($network);
 	$interface  = $np->cfg->getInterface($network);
 	$comment    = $np->cfg->getNetComment($network);
+	$cmac       = $np->cfg->getCustomMAC($network);
 	$ng         = $np->cfg->getNetgroup(-network => $network);
 	$ng       ||= '';
 	$switches   = $np->cfg->getSwitches($network);
@@ -275,6 +279,8 @@
 <tr class='garpOptions' id='garpOptions1'><td class='left'>Delay:</td><td colspan=2><input size=4 maxlength=8 name='garpDelay' value="<%$garpDelay%>"> seconds </td></tr>
 <tr class='garpOptions' id='garpOptions2'><td class='left'>Number:</td><td colspan=2><input size=4 maxlength=8 name='garpNumber' value="<%$garpNumber%>"></td></tr>
 
+<tr class='left' id='cmac'><td class='left'>Custom MAC:</td><td colspan=2><input size=18 maxlength=22 name='cmac' value="<%$cmac%>"></td></tr>
+
 <tr><td class='left'>Switches:<BR>
 <button id='delSwitch' onclick='network_onclick_delSwitch(); return false;' 
 	type='button'>Delete</button><BR>
@@ -291,11 +297,6 @@
 </td>
 </tr>
 <tr><td colspan=3>
-<PRE><B>TODO:
-        - when click netgroup .. highlight networks list</B>
-</PRE>
-</td></tr>
-<tr><td colspan=3>
 %       my $ngtxt = $ng ? qq{<BR>(Part of the "<a href='netgroups.mhtml?netgroups=$ng'>$ng</a>" netgroup)} : "";
 % 	$m->comp('/Admin/TableEditPolicy', %ARGS, 'tableName' => 'Network General Settings for '.$network.$ngtxt, 
 %		 'showDefault' => 1, 'formatFor' => 'network',