Add OpenVPN CSC-DHCP Options (override per Client), add TLS-Authentication, add connection-limit for server

3 files changed, 101 insertions, 2 deletions

diff --git a/usr/local/pkg/openvpn.xml b/usr/local/pkg/openvpn.xml
index 23bfad0..ab90599 100644
--- a/usr/local/pkg/openvpn.xml
+++ b/usr/local/pkg/openvpn.xml
@@ -193,6 +193,15 @@
 			<cols>40</cols>
 		</field>
 		<field>
+			<fieldname>tls</fieldname>
+			<fielddescr>TLS</fielddescr>
+			<description>Paste your HMAC signature (TLS) here (optional).</description>
+			<type>textarea</type>
+			<encoding>base64</encoding>
+			<rows>8</rows>
+			<cols>40</cols>
+		</field>
+		<field>
 			<fieldname>dhcp_domainname</fieldname>
 			<fielddescr>DHCP-Opt.: DNS-Domainname</fielddescr>
 			<description>Set connection-specific DNS Suffix.</description>
@@ -270,6 +279,12 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fieldname>maxclients</fieldname>
+			<fielddescr>Maximum clients</fielddescr>
+			<description>The maximum number of concurrently connected clients we want to allow.</description>
+			<type>input</type>
+		</field>
+		<field>
 			<fieldname>custom_options</fieldname>
 			<fielddescr>Custom options</fielddescr>
 			<description>You can put your own custom options here, separated by semi-colons (;). They'll be added to the server configuration.</description>
diff --git a/usr/local/pkg/openvpn_cli.xml b/usr/local/pkg/openvpn_cli.xml
index e05bacf..d199a77 100644
--- a/usr/local/pkg/openvpn_cli.xml
+++ b/usr/local/pkg/openvpn_cli.xml
@@ -169,6 +169,15 @@
 			<cols>40</cols>
 		</field>
 		<field>
+			<fieldname>tls</fieldname>
+			<fielddescr>TLS</fielddescr>
+			<description>Paste your HMAC signature (TLS) here (optional).</description>
+			<type>textarea</type>
+			<encoding>base64</encoding>
+			<rows>8</rows>
+			<cols>40</cols>
+		</field>
+		<field>
 			<fieldname>use_lzo</fieldname>
 			<fielddescr>LZO compression</fielddescr>
 			<description>Checking this will compress the packets using the LZO algorithm before sending them.</description>
@@ -216,4 +225,4 @@
 	<custom_php_resync_config_command>
 		openvpn_resync('client', $id);
 	</custom_php_resync_config_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/usr/local/pkg/openvpn_csc.xml b/usr/local/pkg/openvpn_csc.xml
index 93e0fb8..c962b50 100644
--- a/usr/local/pkg/openvpn_csc.xml
+++ b/usr/local/pkg/openvpn_csc.xml
@@ -67,11 +67,86 @@
 			<description>Set this option to push an IP to the client's interface. Expressed as a CIDR range (e.g. 10.5.0.0/16). The first IP in the range will be used as the remote IP of the interface, and the second IP will be used as the local IP of the interface.</description>
 			<type>input</type>
 		</field>
+		
+		<field>
+			<fieldname>dhcp_domainname</fieldname>
+			<fielddescr>DHCP-Opt.: DNS-Domainname</fielddescr>
+			<description>Set connection-specific DNS Suffix.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fieldname>dhcp_dns</fieldname>
+			<fielddescr>DHCP-Opt.: DNS-Server</fielddescr>
+			<description>Set domain name server addressses, separated by semi-colons (;).</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fieldname>dhcp_wins</fieldname>
+			<fielddescr>DHCP-Opt.: WINS-Server</fielddescr>
+			<description>Set WINS server addressses (NetBIOS over TCP/IP Name Server), separated by semi-colons (;).</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fieldname>dhcp_nbdd</fieldname>
+			<fielddescr>DHCP-Opt.: NBDD-Server</fielddescr>
+			<description>Set NBDD server addresses (NetBIOS over TCP/IP Datagram Distribution Server), separated by semi-colons (;).</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fieldname>dhcp_ntp</fieldname>
+			<fielddescr>DHCP-Opt.: NTP-Server</fielddescr>
+			<description>Set NTP server addresses (Network Time Protocol), separated by semi-colons (;).</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fieldname>dhcp_nbttype</fieldname>
+			<fielddescr>DHCP-Opt.: NetBIOS node type</fielddescr>
+			<description>Set NetBIOS over TCP/IP Node type. Possible options: b-node (broadcasts), p-node (point-to-point name queries to a WINS server), m-node (broadcast then query name server), and h-node (query name server, then broadcast).</description>
+			<type>select</type>
+			<options>
+				<option>
+					<value>0</value>
+					<name>none</name>
+				</option>
+				<option>
+				<value>1</value>
+					<name>b-node</name>
+				</option>
+				<option>
+					<value>2</value>
+					<name>p-node</name>
+				</option>
+				<option>
+					<value>4</value>
+					<name>m-node</name>
+				</option>
+				<option>
+					<value>8</value>
+					<name>h-node</name>
+				</option>
+			</options>
+			<default_value>0</default_value>
+		</field>
+		<field>
+			<fieldname>dhcp_nbtscope</fieldname>
+			<fielddescr>DHCP-Opt.: NetBIOS Scope</fielddescr>
+			<description>Set NetBIOS over TCP/IP Scope. A NetBIOS Scope ID provides an extended naming service for NetBIOS over TCP/IP. The NetBIOS scope ID isolates NetBIOS traffic on a single network to only those nodes with the same NetBIOS scope ID.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fieldname>dhcp_nbtdisable</fieldname>
+			<fielddescr>DHCP-Opt.: Disable NetBIOS</fielddescr>
+			<description>If this option is set, Netbios-over-TCP/IP will be disabled.</description>
+			<type>checkbox</type>
+		</field>
+		
 		<field>
 			<fieldname>custom_options</fieldname>
 			<fielddescr>Custom options</fielddescr>
 			<description>You can put your own custom options here, separated by semi-colons (;). They'll be added to the client-specific configuration.</description>
-			<type>input</type>
+			<type>textarea</type>
+			<cols>65</cols>
+			<rows>5</rows>
 		</field>
 		<field>
 			<fieldname>description</fieldname>