From 1cb0b40a2d2ae2b31c999015f04a5f1b530e8531 Mon Sep 17 00:00:00 2001
From: Matthew Grooms <mgrooms@pfsense.org>
Date: Wed, 3 Sep 2008 04:13:02 +0000
Subject: Correct problems with OpenVPN that prevented the lzo compression and
 pass tos options from being set correctly in configuration files.

---
 etc/inc/openvpn.inc                  | 2 +-
 usr/local/www/vpn_openvpn_client.php | 6 +++---
 usr/local/www/vpn_openvpn_server.php | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 151b1ec..12da61b 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -400,7 +400,7 @@ EOD;
 			openvpn_add_keyfile($settings['tls'], $conf, $mode_id, "tls-auth");
 	}
 
-	if ($settings['compress'])
+	if ($settings['compression'])
 		$conf .= "comp-lzo\n";
 
 	if ($settings['passtos'])
diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index db38295..c3fbcb5 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -97,7 +97,7 @@ if($_GET['act']=="edit"){
 		$pconfig['tunnel_network'] = $a_client[$id]['tunnel_network'];
 		$pconfig['remote_network'] = $a_client[$id]['remote_network'];
 		$pconfig['compression'] = $a_client[$id]['compression'];
-		$pconfig['settos'] = $a_client[$id]['settos'];
+		$pconfig['passtos'] = $a_client[$id]['passtos'];
 	}
 }
 
@@ -526,8 +526,8 @@ function method_change() {
 							<table border="0" cellpadding="2" cellspacing="0">
 								<tr>
 									<td>
-										<?php set_checked($pconfig['settos'],$chk); ?>
-										<input name="settos" type="checkbox" value="yes" <?=$chk;?>>
+										<?php set_checked($pconfig['passtos'],$chk); ?>
+										<input name="passtos" type="checkbox" value="yes" <?=$chk;?>>
 									</td>
 									<td>
 										<span class="vexpl">
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index dab3706..41ec000 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -96,7 +96,7 @@ if($_GET['act']=="edit"){
 		$pconfig['local_network'] = $a_server[$id]['local_network'];
 		$pconfig['maxclients'] = $a_server[$id]['maxclients'];
 		$pconfig['compression'] = $a_server[$id]['compression'];
-		$pconfig['settos'] = $a_server[$id]['settos'];
+		$pconfig['passtos'] = $a_server[$id]['passtos'];
 		$pconfig['client2client'] = $a_server[$id]['client2client'];
 
 		$pconfig['pool_enable'] = $a_server[$id]['pool_enable'];
@@ -248,6 +248,7 @@ if ($_POST) {
 		$server['local_network'] = $pconfig['local_network'];
 		$server['maxclients'] = $pconfig['maxclients'];
 		$server['compression'] = $pconfig['compression'];
+		$server['passtos'] = $pconfig['passtos'];
 		$server['client2client'] = $pconfig['client2client'];
 
 		$server['pool_enable'] = $pconfig['pool_enable'];
@@ -647,8 +648,8 @@ function netbios_change() {
 							<table border="0" cellpadding="2" cellspacing="0">
 								<tr>
 									<td>
-										<?php set_checked($pconfig['settos'],$chk); ?>
-										<input name="settos" type="checkbox" value="yes" <?=$chk;?>>
+										<?php set_checked($pconfig['passtos'],$chk); ?>
+										<input name="passtos" type="checkbox" value="yes" <?=$chk;?>>
 									</td>
 									<td>
 										<span class="vexpl">
-- 
cgit v1.1