Changeset 11064

Timestamp:

12/04/08 12:14:17 (4 years ago)

Author:

BrainSlayer

Message:

make vpn device selectable (tun/tap)

Location:

src/router

Files:

• kromo/dd-wrt/lang_pack/english.js (modified) (1 diff)
• kromo/dd-wrt/lang_pack/german.js (modified) (1 diff)
• openvpn/config/openvpncl.nvramconfig (modified) (1 diff)
• openvpn/config/openvpncl.webvpn (modified) (1 diff)
• services/services/openvpn.c (modified) (1 diff)
• services/sysinit/defaults.c (modified) (1 diff)

src/router/kromo/dd-wrt/lang_pack/english.js

@@ -1205 +1205 @@
 service.vpn_compress="Use LZO Compression";
 service.vpn_tunnel="Tunnel Protocol";
+service.vpn_tuntap="Tunnel Device";
 service.vpn_srvcert="Public Server Cert";
 service.vpn_clicert="Public Client Cert";

src/router/kromo/dd-wrt/lang_pack/german.js

@@ -1130 +1130 @@
 service.vpn_compress="Nutze LZO-Compression";
 service.vpn_tunnel="Tunnel-Protokoll";
+service.vpn_tuntap="Tunnel-Device";
 service.vpn_srvcert="Öffentliches Server-Zertifikat";
 service.vpn_clicert="Öffentliches Client-Zertifikat";

src/router/openvpn/config/openvpncl.nvramconfig

@@ -8 +8 @@
  "openvpncl_proto" "Tunnel Protocol" "CHOICE" "2" "udp" "tcp" "FALSE" "0"
  "openvpncl_mtu" "TUN MTU" "NULL" "FALSE" "0"
+ "openvpncl_tuntap" "TUN DEV" "NULL" "FALSE" "0"
  "openvpncl_extramtu" "TUN EXTRA" "NULL" "FALSE" "0"
  "openvpncl_mssfix" "TCP MSS" "NULL" "FALSE" "0"

src/router/openvpn/config/openvpncl.webvpn

@@ -41 +41 @@
                 </div>
                 <div class="setting">
+                        <div class="label"><% tran("service.vpn_tuntap"); %></div>
+                        <select name="openvpncl_tuntap">
+                            <option value="tun" <% nvram_selected("openvpncl_proto","tun"); %>>TUN</option>
+                            <option value="tap" <% nvram_selected("openvpncl_proto","tap"); %>>TAP</option>
+                        </select>
+                </div>
+                <div class="setting">
                         <div class="label"><% tran("service.vpn_certtype"); %></div>
                         <input class="spaceradio" type="checkbox" value="1" name="_openvpncl_certtype" <% nvram_checked("openvpncl_certtype","1"); %> />

src/router/services/services/openvpn.c

@@ -117 +117 @@
         return;
     fprintf( fp, "client\n" );
-    fprintf( fp, "dev tun\n" );
+    if( nvram_match( "openvpncl_tuntap", "tap" ) )
+        fprintf( fp, "dev tap\n" );
+    else
+        fprintf( fp, "dev tun\n" );
     fprintf( fp, "proto %s\n", nvram_safe_get( "openvpncl_proto" ) );
     fprintf( fp, "remote %s %s\n", nvram_safe_get( "openvpncl_remoteip" ),

src/router/services/sysinit/defaults.c

@@ -2177 +2177 @@
     {"openvpncl_mssfix", "1450", 0},
     {"openvpncl_certtype", "0", 0},
+    {"openvpncl_tuntap", "tun", 0},
 
     {"openvpn_enable", "0", 0},