OpenVPN

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@627 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 1c2d42c822013703123b018c0758e393d53c7cb0..3a97c96af061a3bf2e4f5beedb5f2e12574aa4ae 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -68,19 +68,15 @@ $cgiparams{'DCOMPLZO'} = 'off';
 ###
 sub haveOrangeNet
 {
-       if ($netsettings{'CONFIG_TYPE'} == 1) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 3) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 5) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 7) {return 1;}
+       if ($netsettings{'CONFIG_TYPE'} == 2) {return 1;}
+       if ($netsettings{'CONFIG_TYPE'} == 4) {return 1;}
        return 0;
 }
 
 sub haveBlueNet
 {
+       if ($netsettings{'CONFIG_TYPE'} == 3) {return 1;}
        if ($netsettings{'CONFIG_TYPE'} == 4) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 5) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 6) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 7) {return 1;}
        return 0;
 }
 

diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi
index b1e7ed2525da556eeb9734ee841c575c22bda2ac..3749ade60182e07b4ac651bfeb28474e1645a3cd 100644 (file)
--- a/html/cgi-bin/upnp.cgi
+++ b/html/cgi-bin/upnp.cgi
@@ -79,7 +79,7 @@ xml_document_path = $upnpsettings{'XML'}
 END
 ;
        close FILE;
-       system("/usr/local/bin/upnpctrl upnpxml $upnpsettings{'XML'} $upnpsettings{'DESCRIPTION'} $upnpsettings{'manufacturer'}");
+       system("/usr/local/bin/upnpctrl","upnpxml","$upnpsettings{'friendlyName'}","$upnpsettings{'XML'}","$upnpsettings{'DESCRIPTION'}");
        }
 elsif ($upnpsettings{'ACTION'} eq 'Start')
        {

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index f32f7a7e84d57333476b84f88c3f785e349cd6e5..0de82a11520340469daa09654a5edf4da8b3cb1e 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -248,9 +248,6 @@ case "$1" in
                /sbin/iptables -t nat -A POSTROUTING -m mark --mark 3 -j SNAT --to-source $ORANGE_ADDRESS
        fi
 
-       # run openvpn
-       /usr/local/bin/openvpnctrl --create-chains-and-rules
-
        # run local firewall configuration, if present
        if [ -x /etc/sysconfig/firewall.local ]; then
                /etc/sysconfig/firewall.local start
@@ -260,6 +257,10 @@ case "$1" in
        /sbin/iptables -A INPUT   -m limit --limit 10/minute -j LOG --log-prefix "INPUT "
        /sbin/iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "OUTPUT "
         ;;
+  startovpn)  
+       # run openvpn
+       /usr/local/bin/openvpnctrl --create-chains-and-rules
+        ;;
   stop)
        iptables_init
        # Accept everyting connected
@@ -278,9 +279,6 @@ case "$1" in
                /sbin/iptables -A INPUT -p udp --source-port 67 --destination-port 68 -i $IFACE -j ACCEPT
        fi
 
-       # stop openvpn
-       /usr/local/bin/openvpnctrl --delete-chains-and-rules
-
        # run local firewall configuration, if present
        if [ -x /etc/sysconfig/firewall.local ]; then
                /etc/sysconfig/firewall.local stop
@@ -289,6 +287,10 @@ case "$1" in
        /sbin/iptables -A INPUT   -m limit --limit 10/minute -j LOG --log-prefix "INPUT "
        /sbin/iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "OUTPUT "
         ;;
+  stopovpn)
+       # stop openvpn
+       /usr/local/bin/openvpnctrl --delete-chains-and-rules
+        ;;
   reload)
        iptables_red
 

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index a0d40a6d3720e67090dbca5ada14ce6002654741..acc48d22daecb96a262e2bfa331b78a756a005f3 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -120,6 +120,9 @@ case "${DO}" in
                                fi
                        fi
                fi
+               
+                       boot_mesg "Setting OVPN Rules if enabled"
+                       /etc/rc.d/init.d/firewall startovpn; evaluate_retval                    
                ;;
 
        stop)
@@ -149,6 +152,9 @@ case "${DO}" in
                                name=red /etc/rc.d/init.d/net/ifdown
                        fi
                fi
+               
+                       boot_mesg "Deleting OVPN Rules if enabled"
+                       /etc/rc.d/init.d/firewall stopovpn; evaluate_retval     
                ;;
 
        restart)

diff --git a/src/misc-progs/upnpctrl.c b/src/misc-progs/upnpctrl.c
index bb6c43b3ec93f8d9f13dd3dbec66ea8f5ab9b0e1..f42502dddb94a5d0f2c0895483daf462a5461902 100644 (file)
--- a/src/misc-progs/upnpctrl.c
+++ b/src/misc-progs/upnpctrl.c
@@ -46,9 +46,9 @@ int main(int argc, char *argv[])
         }
         if (strcmp(argv[1], "upnpxml")==0)
         {
-            snprintf(command, BUFFER_SIZE-1, "sed 's/<friendlyName>.*<\/friendlyName>/<friendlyName>%s<\/friendlyName>/gi' %s/%s > tmp && mv tmp %s/%s", argv[2], argv[3], argv[4], argv[3], argv[4]);
+            snprintf(command, BUFFER_SIZE-1, "sed 's/\<friendlyName\>.*\<\/friendlyName\>/\<friendlyName\>%s\<\/friendlyName\>/gi' %s/%s > tmp && mv tmp %s/%s", argv[2], argv[3], argv[4], argv[3], argv[4]);
             safe_system(command);
             printf(command);
             return 0;
         }
-}
\ No newline at end of file
+}