webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 20:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow also ip/netmask for blue access.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-06-24 13:14:05 +02:00
parent 47f651f156
commit 45f2673554
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/38/filelists/files
View 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

2
html/cgi-bin/wireless.cgi
View 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;

4
src/misc-progs/wirelessctrl.c
View 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);