[Astlinux-commits] SF.net SVN: astlinux:[4300] branches/0.7/package/webinterface/altweb

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4300
          http://astlinux.svn.sourceforge.net/astlinux/?rev=4300&view=rev
Author:   abelbeck
Date:     2010-08-13 16:34:50 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
Web interface, add 'QoS Passthrough' support for OpenVPN client/server

Modified Paths:
--------------
    branches/0.7/package/webinterface/altweb/admin/openvpn.php
    branches/0.7/package/webinterface/altweb/admin/openvpnclient.php
    branches/0.7/package/webinterface/altweb/common/version.php

Modified: branches/0.7/package/webinterface/altweb/admin/openvpn.php
===================================================================

--- branches/0.7/package/webinterface/altweb/admin/openvpn.php	2010-08-13 16:33:09 UTC (rev 4299)
+++ branches/0.7/package/webinterface/altweb/admin/openvpn.php	2010-08-13 16:34:50 UTC (rev 4300)
@@ -10,6 +10,7 @@
 // 09-06-2008
 // 12-27-2008, Added Certificate Support
 // 02-06-2009, Added tls-verify, temporarily disable clients
+// 08-13-2010, Added QoS Passthrough, setting passtos
 //
 // System location of /mnt/kd/rc.conf.d directory
 $OVPNCONFDIR = '/mnt/kd/rc.conf.d';
@@ -111,6 +112,9 @@
   $value = 'OVPN_LZO="'.$_POST['compression'].'"';
   fwrite($fp, "### Compression\n".$value."\n");
   
+  $value = 'OVPN_QOS="'.$_POST['qos_passthrough'].'"';
+  fwrite($fp, "### QoS Passthrough\n".$value."\n");
+  
   $value = 'OVPN_CIPHER="'.$_POST['cipher_menu'].'"';
   fwrite($fp, "### Cipher\n".$value."\n");
   
@@ -364,36 +368,32 @@
   <input type="checkbox" value="restart" name="confirm_restart" />&nbsp;Confirm
   </td></tr></table>
   <table class="stdtable">
-  <tr class="dtrow0"><td width="100">&nbsp;</td><td width="100">&nbsp;</td><td width="100">&nbsp;</td><td>&nbsp;</td><td width="100">&nbsp;</td><td width="100">&nbsp;</td></tr>
+  <tr class="dtrow0"><td width="60">&nbsp;</td><td width="100">&nbsp;</td><td width="100">&nbsp;</td><td>&nbsp;</td><td width="100">&nbsp;</td><td width="60">&nbsp;</td></tr>
 <?php
   putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
   putHtml('<strong>Tunnel Options:</strong>');
   putHtml('</td></tr>');
-  putHtml('<tr class="dtrow1"><td style="text-align: center;" colspan="2">');
-  putHtml('Device:');
-  putHtml('<select name="device">');
-  $sel = (getVARdef($db, 'OVPN_DEV') === 'tun0') ? ' selected="selected"' : '';
-  putHtml('<option value="tun0"'.$sel.'>tun0</option>');
-  $sel = (getVARdef($db, 'OVPN_DEV') === 'tun1') ? ' selected="selected"' : '';
-  putHtml('<option value="tun1"'.$sel.'>tun1</option>');
-  putHtml('</select>');
-  putHtml('</td><td style="text-align: center;" colspan="2">');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Protocol:');
+  putHtml('</td><td style="text-align: left;" colspan="1">');
   putHtml('<select name="protocol">');
   $sel = (getVARdef($db, 'OVPN_PROTOCOL') === 'udp') ? ' selected="selected"' : '';
   putHtml('<option value="udp"'.$sel.'>UDP</option>');
   $sel = (getVARdef($db, 'OVPN_PROTOCOL') === 'tcp-server') ? ' selected="selected"' : '';
   putHtml('<option value="tcp-server"'.$sel.'>TCP</option>');
   putHtml('</select>');
-  putHtml('</td><td style="text-align: center;" colspan="2">');
+  putHtml('</td><td style="text-align: right;" colspan="1">');
+  putHtml('Port:');
+  putHtml('</td><td style="text-align: left;" colspan="2">');
   if (($value = getVARdef($db, 'OVPN_PORT')) === '') {
     $value = '1194';
   }
-  putHtml('Port:<input type="text" size="8" maxlength="10" value="'.$value.'" name="port" />');
+  putHtml('<input type="text" size="8" maxlength="10" value="'.$value.'" name="port" />');
   putHtml('</td></tr>');
   
-  putHtml('<tr class="dtrow1"><td style="text-align: center;" colspan="3">');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Log Verbosity:');
+  putHtml('</td><td style="text-align: left;" colspan="1">');
   $verbosity = getVARdef($db, 'OVPN_VERBOSITY');
   putHtml('<select name="verbosity">');
   foreach ($verbosity_menu as $key => $value) {
@@ -401,8 +401,9 @@
     putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
   }
   putHtml('</select>');
-  putHtml('</td><td style="text-align: left;" colspan="3">');
+  putHtml('</td><td style="text-align: right;" colspan="1">');
   putHtml('Compression:');
+  putHtml('</td><td style="text-align: left;" colspan="2">');
   putHtml('<select name="compression">');
   $sel = (getVARdef($db, 'OVPN_LZO') === 'yes') ? ' selected="selected"' : '';
   putHtml('<option value="yes"'.$sel.'>Yes</option>');
@@ -410,9 +411,19 @@
   putHtml('<option value="no"'.$sel.'>No</option>');
   putHtml('</select>');
   putHtml('</td></tr>');
+  
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+  putHtml('QoS Passthrough:');
+  putHtml('</td><td style="text-align: left;" colspan="1">');
+  putHtml('<select name="qos_passthrough">');
+  $sel = (getVARdef($db, 'OVPN_QOS') === 'no') ? ' selected="selected"' : '';
+  putHtml('<option value="no"'.$sel.'>No</option>');
+  $sel = (getVARdef($db, 'OVPN_QOS') === 'yes') ? ' selected="selected"' : '';
+  putHtml('<option value="yes"'.$sel.'>Yes</option>');
+  putHtml('</select>');
+  putHtml('</td><td style="text-align: right;" colspan="1">');
   putHtml('Cipher:');
-  putHtml('</td><td style="text-align: left;" colspan="4">');
+  putHtml('</td><td style="text-align: left;" colspan="2">');
   $cipher = getVARdef($db, 'OVPN_CIPHER');
   putHtml('<select name="cipher_menu">');
   foreach ($cipher_menu as $key => $value) {
@@ -421,10 +432,22 @@
   }
   putHtml('</select>');
   putHtml('</td></tr>');
+  
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+  putHtml('Device:');
+  putHtml('</td><td style="text-align: left;" colspan="4">');
+  putHtml('<select name="device">');
+  $sel = (getVARdef($db, 'OVPN_DEV') === 'tun0') ? ' selected="selected"' : '';
+  putHtml('<option value="tun0"'.$sel.'>tun0</option>');
+  $sel = (getVARdef($db, 'OVPN_DEV') === 'tun1') ? ' selected="selected"' : '';
+  putHtml('<option value="tun1"'.$sel.'>tun1</option>');
+  putHtml('</select>');
+  putHtml('</td></tr>');
+  
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Raw Commands:');
   putHtml('</td><td style="text-align: left;" colspan="4">');
-  echo '<textarea name="other" rows="4" cols="36" wrap="off" class="edititemText">';
+  echo '<textarea name="other" rows="4" cols="40" wrap="off" class="edititemText">';
   $var_types = array('OVPN_OTHER1', 'OVPN_OTHER2', 'OVPN_OTHER');
   foreach ($var_types as $var_type) {
     if (($value = getVARdef($db, $var_type)) !== '') {
@@ -451,7 +474,7 @@
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   putHtml('"push":');
   putHtml('</td><td style="text-align: left;" colspan="5">');
-  echo '<textarea name="push" rows="6" cols="50" wrap="off" class="edititemText">';
+  echo '<textarea name="push" rows="6" cols="56" wrap="off" class="edititemText">';
   $var_types = array('OVPN_PUSH1', 'OVPN_PUSH2', 'OVPN_PUSH3', 'OVPN_PUSH4', 'OVPN_PUSH');
   foreach ($var_types as $var_type) {
     if (($value = getVARdef($db, $var_type)) !== '') {

Modified: branches/0.7/package/webinterface/altweb/admin/openvpnclient.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/openvpnclient.php	2010-08-13 16:33:09 UTC (rev 4299)
+++ branches/0.7/package/webinterface/altweb/admin/openvpnclient.php	2010-08-13 16:34:50 UTC (rev 4300)
@@ -8,6 +8,7 @@
 
 // openvpnclient.php for AstLinux
 // 04-15-2009
+// 08-13-2010, Added QoS Passthrough, setting passtos
 //
 // System location of /mnt/kd/rc.conf.d directory
 $OVPNCONFDIR = '/mnt/kd/rc.conf.d';
@@ -72,6 +73,9 @@
   $value = 'OVPNC_LZO="'.$_POST['compression'].'"';
   fwrite($fp, "### Compression\n".$value."\n");
   
+  $value = 'OVPNC_QOS="'.$_POST['qos_passthrough'].'"';
+  fwrite($fp, "### QoS Passthrough\n".$value."\n");
+  
   $value = 'OVPNC_CIPHER="'.$_POST['cipher_menu'].'"';
   fwrite($fp, "### Cipher\n".$value."\n");
   
@@ -241,36 +245,32 @@
   <input type="checkbox" value="restart" name="confirm_restart" />&nbsp;Confirm
   </td></tr></table>
   <table class="stdtable">
-  <tr class="dtrow0"><td width="100">&nbsp;</td><td width="100">&nbsp;</td><td width="100">&nbsp;</td><td>&nbsp;</td><td width="100">&nbsp;</td><td width="100">&nbsp;</td></tr>
+  <tr class="dtrow0"><td width="60">&nbsp;</td><td width="100">&nbsp;</td><td width="100">&nbsp;</td><td>&nbsp;</td><td width="100">&nbsp;</td><td width="60">&nbsp;</td></tr>
 <?php
   putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="6">');
   putHtml('<strong>Tunnel Options:</strong>');
   putHtml('</td></tr>');
-  putHtml('<tr class="dtrow1"><td style="text-align: center;" colspan="2">');
-  putHtml('Device:');
-  putHtml('<select name="device">');
-  $sel = (getVARdef($db, 'OVPNC_DEV') === 'tun2') ? ' selected="selected"' : '';
-  putHtml('<option value="tun2"'.$sel.'>tun2</option>');
-  $sel = (getVARdef($db, 'OVPNC_DEV') === 'tun3') ? ' selected="selected"' : '';
-  putHtml('<option value="tun3"'.$sel.'>tun3</option>');
-  putHtml('</select>');
-  putHtml('</td><td style="text-align: center;" colspan="2">');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Protocol:');
+  putHtml('</td><td style="text-align: left;" colspan="1">');
   putHtml('<select name="protocol">');
   $sel = (getVARdef($db, 'OVPNC_PROTOCOL') === 'udp') ? ' selected="selected"' : '';
   putHtml('<option value="udp"'.$sel.'>UDP</option>');
   $sel = (getVARdef($db, 'OVPNC_PROTOCOL') === 'tcp-client') ? ' selected="selected"' : '';
   putHtml('<option value="tcp-client"'.$sel.'>TCP</option>');
   putHtml('</select>');
-  putHtml('</td><td style="text-align: center;" colspan="2">');
+  putHtml('</td><td style="text-align: right;" colspan="1">');
+  putHtml('Port:');
+  putHtml('</td><td style="text-align: left;" colspan="2">');
   if (($value = getVARdef($db, 'OVPNC_PORT')) === '') {
     $value = '1194';
   }
-  putHtml('Port:<input type="text" size="8" maxlength="10" value="'.$value.'" name="port" />');
+  putHtml('<input type="text" size="8" maxlength="10" value="'.$value.'" name="port" />');
   putHtml('</td></tr>');
   
-  putHtml('<tr class="dtrow1"><td style="text-align: center;" colspan="3">');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Log Verbosity:');
+  putHtml('</td><td style="text-align: left;" colspan="1">');
   $verbosity = getVARdef($db, 'OVPNC_VERBOSITY');
   putHtml('<select name="verbosity">');
   foreach ($verbosity_menu as $key => $value) {
@@ -278,8 +278,9 @@
     putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>');
   }
   putHtml('</select>');
-  putHtml('</td><td style="text-align: left;" colspan="3">');
+  putHtml('</td><td style="text-align: right;" colspan="1">');
   putHtml('Compression:');
+  putHtml('</td><td style="text-align: left;" colspan="2">');
   putHtml('<select name="compression">');
   $sel = (getVARdef($db, 'OVPNC_LZO') === 'yes') ? ' selected="selected"' : '';
   putHtml('<option value="yes"'.$sel.'>Yes</option>');
@@ -287,9 +288,19 @@
   putHtml('<option value="no"'.$sel.'>No</option>');
   putHtml('</select>');
   putHtml('</td></tr>');
+  
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+  putHtml('QoS Passthrough:');
+  putHtml('</td><td style="text-align: left;" colspan="1">');
+  putHtml('<select name="qos_passthrough">');
+  $sel = (getVARdef($db, 'OVPNC_QOS') === 'no') ? ' selected="selected"' : '';
+  putHtml('<option value="no"'.$sel.'>No</option>');
+  $sel = (getVARdef($db, 'OVPNC_QOS') === 'yes') ? ' selected="selected"' : '';
+  putHtml('<option value="yes"'.$sel.'>Yes</option>');
+  putHtml('</select>');
+  putHtml('</td><td style="text-align: right;" colspan="1">');
   putHtml('Cipher:');
-  putHtml('</td><td style="text-align: left;" colspan="4">');
+  putHtml('</td><td style="text-align: left;" colspan="2">');
   $cipher = getVARdef($db, 'OVPNC_CIPHER');
   putHtml('<select name="cipher_menu">');
   foreach ($cipher_menu as $key => $value) {
@@ -298,9 +309,19 @@
   }
   putHtml('</select>');
   putHtml('</td></tr>');
+  
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+  putHtml('Device:');
+  putHtml('</td><td style="text-align: left;" colspan="1">');
+  putHtml('<select name="device">');
+  $sel = (getVARdef($db, 'OVPNC_DEV') === 'tun2') ? ' selected="selected"' : '';
+  putHtml('<option value="tun2"'.$sel.'>tun2</option>');
+  $sel = (getVARdef($db, 'OVPNC_DEV') === 'tun3') ? ' selected="selected"' : '';
+  putHtml('<option value="tun3"'.$sel.'>tun3</option>');
+  putHtml('</select>');
+  putHtml('</td><td style="text-align: right;" colspan="1">');
   putHtml('nsCertType:');
-  putHtml('</td><td style="text-align: left;" colspan="4">');
+  putHtml('</td><td style="text-align: left;" colspan="2">');
   $nscerttype = getVARdef($db, 'OVPNC_NSCERTTYPE');
   putHtml('<select name="nscerttype">');
   foreach ($nscerttype_menu as $key => $value) {
@@ -309,10 +330,11 @@
   }
   putHtml('</select>');
   putHtml('</td></tr>');
+  
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
   putHtml('Raw Commands:');
   putHtml('</td><td style="text-align: left;" colspan="4">');
-  echo '<textarea name="other" rows="4" cols="36" wrap="off" class="edititemText">';
+  echo '<textarea name="other" rows="4" cols="40" wrap="off" class="edititemText">';
   if (($value = getVARdef($db, 'OVPNC_OTHER')) !== '') {
     $value = str_replace(chr(10), chr(13), $value);
     if (($value = trim($value, chr(13))) !== '') {

Modified: branches/0.7/package/webinterface/altweb/common/version.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/version.php	2010-08-13 16:33:09 UTC (rev 4299)
+++ branches/0.7/package/webinterface/altweb/common/version.php	2010-08-13 16:34:50 UTC (rev 4300)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.6.21';
+$GUI_VERSION = '1.6.22';
 
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


