Changeset 19211

Timestamp:

05/07/12 21:00:27 (14 months ago)

Author:

sash

Message:

ovpn: finish dhcp block

Location:

src/router

Files:

• kromo/dd-wrt/lang_pack/english.js (modified) (1 diff)
• openvpn/config2/openvpn.nvramconfig (modified) (1 diff)
• openvpn/config2/openvpn.webvpn (modified) (1 diff)
• services/services/openvpn.c (modified) (3 diffs)
• services/sysinit/defaults.c (modified) (1 diff)

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

@@ -1374 +1374 @@
 service.vpnd_clcon="Client connect script";
 service.vpnd_ccddef="CCD-Dir DEFAULT file";
+service.vpnd_dhcpbl="Block DHCP accross the tunnel";
 service.vpn_redirgate="Redirect default Gateway";
 service.vpn_legend="OpenVPN Client";

src/router/openvpn/config2/openvpn.nvramconfig

@@ -30 +30 @@
  "openvpn_proxy"   "DHCP-Proxy mode" "CHOICE" "2" "0" "1" "FALSE" "0"
  "openvpn_ccddef"  "OpenVPN ccd dir DEFAULT file"  "NULL"   "FALSE" "0"
+ "openvpn_dhcpbl"       "Block DHCP" "CHOICE" "2" "0" "1" "FALSE" "0"

src/router/openvpn/config2/openvpn.webvpn

@@ -55 +55 @@
                                 <div class="setting">
                                         <div class="label"><% tran("service.vpnd_mask"); %></div>
-                                        <input size="15" maxlength="15" name="openvpn_mask_br" value="<% nvram_get("openvpn_mask"); %>" />
-                                </div>
-                        </div>
-                </div>
-
+                                        <input size="15" maxlength="15" name="openvpn_mask" value="<% nvram_get("openvpn_mask"); %>" />
+                                </div>          
+                                <div class="setting">
+                                        <div class="label"><% tran("service.vpnd_dhcpbl"); %></div>
+                                        <input class="spaceradio" type="radio" name="openvpn_dhcpbl" value="1" <% nvram_checked("openvpn_dhcpbl", "1"); %> /><% tran("share.enable"); %>&nbsp;
+                                        <input class="spaceradio" type="radio" name="openvpn_dhcpbl" value="0" <% nvram_checked("openvpn_dhcpbl", "0"); %> /><% tran("share.disable"); %>
+                                </div>                                          
+                        </div>
+                </div>
                 <div class="setting">
                         <div class="label"><% tran("share.port"); %></div>

src/router/services/services/openvpn.c

@@ -177 +177 @@
                         "ebtables -A OUTPUT -o tap2 --pkttype-type multicast -j DROP\n");
                 //for testing only
-//      if (nvram_match("openvpn_dhcpbl", "1") //block dhcp on bridged vpns
-//              && nvram_match("openvpn_tuntap", "tap")
-//              && nvram_match("openvpn_proxy", "0"))
+        if (nvram_match("openvpn_dhcpbl", "1") //block dhcp on bridged vpns
+                && nvram_match("openvpn_tuntap", "tap")
+                && nvram_match("openvpn_proxy", "0"))
                 fprintf(fp, "insmod ebtables\n"
                         "insmod ebtable_filter\n" "insmod ebt_ip\n"
@@ -199 +199 @@
                 fprintf(fp, "gpio disable %s\n", gpiovpn);
 #endif
-        if (nvram_match("openvpn_tuntap", "tap")) {
+        if (nvram_match("openvpn_tuntap", "tap")) 
                 fprintf(fp, "brctl delif br0 tap2\n" "ifconfig tap2 down\n");
-        }
-        if (nvram_match("block_multicast", "0") //block multicast on bridged vpns
-                && nvram_match("openvpn_tuntap", "tap"))
-                fprintf(fp, 
-                        "ebtables -D FORWARD -o tap2 --pkttype-type multicast -j DROP\n"
-                        "ebtables -D OUTPUT -o tap2 --pkttype-type multicast -j DROP\n");
-        if (nvram_match("openvpn_dhcpbl", "1") //block dhcp on bridged vpns
-                && nvram_match("openvpn_tuntap", "tap")
-                && nvram_match("openvpn_proxy", "0"))
-                fprintf(fp,
-                        "ebtables -D INPUT -i tap2 --protocol IPv4 --ip-proto udp --ip-sport 67:68 -j DROP\n"
-                        "ebtables -D FORWARD -i tap2 --protocol IPv4 --ip-proto udp --ip-sport 67:68 -j DROP\n"
-                        "ebtables -D FORWARD -o tap2 --protocol IPv4 --ip-proto udp --ip-sport 67:68 -j DROP\n");
         fclose(fp);
 
@@ -247 +234 @@
                 eval("stopservice", "wshaper");
                 eval("startservice", "wshaper");
+                //remove btables rules on shutdown      
+                sytem("ebtables -D FORWARD -o tap2 --pkttype-type multicast -j DROP\n");
+                sytem("ebtables -D OUTPUT -o tap2 --pkttype-type multicast -j DROP\n"); 
+                sytem("ebtables -D INPUT -i tap2 --protocol IPv4 --ip-proto udp --ip-sport 67:68 -j DROP\n");
+                sytem("ebtables -D FORWARD -i tap2 --protocol IPv4 --ip-proto udp --ip-sport 67:68 -j DROP\n");
+                sytem("ebtables -D FORWARD -o tap2 --protocol IPv4 --ip-proto udp --ip-sport 67:68 -j DROP\n");
         }
 

src/router/services/sysinit/defaults.c

@@ -2521 +2521 @@
         {"openvpn_proxy", "0", 0},
         {"openvpn_ccddef", "", 0},
+        {"openvpn_dhcpbl", "0", 0},
 
 #endif