Allow also ip/netmask for blue access.
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 24 Jun 2010 11:14:05 +0000 (13:14 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 24 Jun 2010 11:14:05 +0000 (13:14 +0200)
config/rootfiles/core/38/filelists/files
html/cgi-bin/wireless.cgi
src/misc-progs/wirelessctrl.c

index 1dccfbc..ee03488 100644 (file)
@@ -39,6 +39,7 @@ srv/web/ipfire/cgi-bin/time.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 srv/web/ipfire/cgi-bin/urlfilter.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/cgi-bin/wireless.cgi
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 srv/web/ipfire/html/themes/maniac/include/functions.pl
 var/ipfire/langs/de.pl
index a1dcf71..ecff179 100644 (file)
@@ -92,7 +92,7 @@ if ($cgiparams{'ACTION'} eq 'add')
        {
                $cgiparams{'SOURCE_IP'} = 'NONE';
        } else {
-               unless(&General::validip($cgiparams{'SOURCE_IP'})) 
+               unless(&General::validipormask($cgiparams{'SOURCE_IP'})) 
                {
                        $errormessage = $Lang::tr{'invalid fixed ip address'}; 
                        goto ADDERROR;
index fbcf90e..12b954b 100644 (file)
@@ -151,7 +151,7 @@ int main(void)
 
                                                        /* both specified, added security */
                                                        if ((strlen(macaddress) == 17) &&
-                                                                       (VALID_IP(ipaddress))) {
+                                                                       (VALID_IP_AND_MASK(ipaddress))) {
                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -m mac --mac-source %s -s %s -i %s -j ACCEPT", macaddress, ipaddress, blue_dev);
                                                                        safe_system(command);
                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -m mac --mac-source %s -s %s -i %s ! -o %s -j ACCEPT", macaddress, ipaddress, blue_dev, green_dev);
@@ -170,7 +170,7 @@ int main(void)
                                                                                                        safe_system(command);
                                                                        }
 
-                                                                       if (VALID_IP(ipaddress)) {
+                                                                       if (VALID_IP_AND_MASK(ipaddress)) {
                                                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -s %s -i %s -j ACCEPT", ipaddress, blue_dev);
                                                                                                        safe_system(command);
                                                                                                        snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -s %s -i %s ! -o %s -j ACCEPT", ipaddress, blue_dev, green_dev);