firewall: Allow to disable masquerading.

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 11768836294b2167012d2adf4eb55b7d20eaebee..a00298336abb4d004d768c5e59fa0657ebe4c92c 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -860,6 +860,12 @@ WARNING: untranslated string: last
 WARNING: untranslated string: least preferred
 WARNING: untranslated string: lifetime
 WARNING: untranslated string: mac filter
+WARNING: untranslated string: masquerade blue
+WARNING: untranslated string: masquerade green
+WARNING: untranslated string: masquerade orange
+WARNING: untranslated string: masquerading
+WARNING: untranslated string: masquerading disabled
+WARNING: untranslated string: masquerading enabled
 WARNING: untranslated string: maximum
 WARNING: untranslated string: minimum
 WARNING: untranslated string: minute

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index beca0080bf8b804dd5cfc62e9ed4898752c7af70..de6dc8ac732496975d87519c7e34ec007819c435 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -871,6 +871,12 @@ WARNING: untranslated string: last
 WARNING: untranslated string: least preferred
 WARNING: untranslated string: lifetime
 WARNING: untranslated string: mac filter
+WARNING: untranslated string: masquerade blue
+WARNING: untranslated string: masquerade green
+WARNING: untranslated string: masquerade orange
+WARNING: untranslated string: masquerading
+WARNING: untranslated string: masquerading disabled
+WARNING: untranslated string: masquerading enabled
 WARNING: untranslated string: maximum
 WARNING: untranslated string: minimum
 WARNING: untranslated string: minute

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 6162636f61cbb207b1a255e817d2bd48a35ba70f..ee7096f521c570dc3bd91bf040da5b5c3d5ace07 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -683,6 +683,12 @@ WARNING: untranslated string: gen dh
 WARNING: untranslated string: generate dh key
 WARNING: untranslated string: imei
 WARNING: untranslated string: imsi
+WARNING: untranslated string: masquerade blue
+WARNING: untranslated string: masquerade green
+WARNING: untranslated string: masquerade orange
+WARNING: untranslated string: masquerading
+WARNING: untranslated string: masquerading disabled
+WARNING: untranslated string: masquerading enabled
 WARNING: untranslated string: model
 WARNING: untranslated string: modem hardware details
 WARNING: untranslated string: modem information

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 11768836294b2167012d2adf4eb55b7d20eaebee..a00298336abb4d004d768c5e59fa0657ebe4c92c 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -860,6 +860,12 @@ WARNING: untranslated string: last
 WARNING: untranslated string: least preferred
 WARNING: untranslated string: lifetime
 WARNING: untranslated string: mac filter
+WARNING: untranslated string: masquerade blue
+WARNING: untranslated string: masquerade green
+WARNING: untranslated string: masquerade orange
+WARNING: untranslated string: masquerading
+WARNING: untranslated string: masquerading disabled
+WARNING: untranslated string: masquerading enabled
 WARNING: untranslated string: maximum
 WARNING: untranslated string: minimum
 WARNING: untranslated string: minute

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 547e1d4062a7ab7e0c3f4ba2ecc362d5cb6f94b3..f7a84280cf940e27a075b94e53818d0ab29bceb2 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -856,6 +856,12 @@ WARNING: untranslated string: last
 WARNING: untranslated string: least preferred
 WARNING: untranslated string: lifetime
 WARNING: untranslated string: mac filter
+WARNING: untranslated string: masquerade blue
+WARNING: untranslated string: masquerade green
+WARNING: untranslated string: masquerade orange
+WARNING: untranslated string: masquerading
+WARNING: untranslated string: masquerading disabled
+WARNING: untranslated string: masquerading enabled
 WARNING: untranslated string: maximum
 WARNING: untranslated string: minimum
 WARNING: untranslated string: minute

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index cc40178b83556187a219796829e6051c9ea8a858..9e6d3d5577563ebf797da5981344e8351a4b3bd9 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -683,6 +683,12 @@ WARNING: untranslated string: gen dh
 WARNING: untranslated string: generate dh key
 WARNING: untranslated string: imei
 WARNING: untranslated string: imsi
+WARNING: untranslated string: masquerade blue
+WARNING: untranslated string: masquerade green
+WARNING: untranslated string: masquerade orange
+WARNING: untranslated string: masquerading
+WARNING: untranslated string: masquerading disabled
+WARNING: untranslated string: masquerading enabled
 WARNING: untranslated string: model
 WARNING: untranslated string: modem hardware details
 WARNING: untranslated string: modem information

diff --git a/doc/language_missings b/doc/language_missings
index 4699f1276d5814939a253766a643a8104158e689..27f9b964f709b48459921e4481b1ebe181c8e3b1 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -334,6 +334,12 @@
 < least preferred
 < lifetime
 < mac filter
+< masquerade blue
+< masquerade green
+< masquerade orange
+< masquerading
+< masquerading disabled
+< masquerading enabled
 < maximum
 < MB read
 < MB written
@@ -865,6 +871,12 @@
 < least preferred
 < lifetime
 < mac filter
+< masquerade blue
+< masquerade green
+< masquerade orange
+< masquerading
+< masquerading disabled
+< masquerading enabled
 < maximum
 < MB read
 < MB written
@@ -1380,6 +1392,12 @@
 < least preferred
 < lifetime
 < mac filter
+< masquerade blue
+< masquerade green
+< masquerade orange
+< masquerading
+< masquerading disabled
+< masquerading enabled
 < maximum
 < MB read
 < MB written
@@ -1886,6 +1904,12 @@
 < least preferred
 < lifetime
 < mac filter
+< masquerade blue
+< masquerade green
+< masquerade orange
+< masquerading
+< masquerading disabled
+< masquerading enabled
 < maximum
 < MB read
 < MB written

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 00fa1b45a253c7637805b357e9314e7d184ff2b0..34e0cdcabac6a8bb037faa65441f6d36226034a5 100644 (file)
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -70,6 +70,17 @@ if ($errormessage) {
         &Header::closebox();
 }
 
+# Set new defaults
+if (!$settings{'MASQUERADE_GREEN'}) {
+       $settings{'MASQUERADE_GREEN'} = 'on';
+}
+if (!$settings{'MASQUERADE_ORANGE'}) {
+       $settings{'MASQUERADE_ORANGE'} = 'on';
+}
+if (!$settings{'MASQUERADE_BLUE'}) {
+       $settings{'MASQUERADE_BLUE'} = 'on';
+}
+
 $checked{'DROPNEWNOTSYN'}{'off'} = '';
 $checked{'DROPNEWNOTSYN'}{'on'} = '';
 $checked{'DROPNEWNOTSYN'}{$settings{'DROPNEWNOTSYN'}} = "checked='checked'";
@@ -112,12 +123,69 @@ $checked{'SHOWDROPDOWN'}{$settings{'SHOWDROPDOWN'}} = "checked='checked'";
 $selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected';
 $selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected';
 $selected{'FWPOLICY2'}{$settings{'FWPOLICY2'}}= 'selected';
+$selected{'MASQUERADE_GREEN'}{'off'} = '';
+$selected{'MASQUERADE_GREEN'}{'on'} = '';
+$selected{'MASQUERADE_GREEN'}{$settings{'MASQUERADE_GREEN'}} = 'selected="selected"';
+$selected{'MASQUERADE_ORANGE'}{'off'} = '';
+$selected{'MASQUERADE_ORANGE'}{'on'} = '';
+$selected{'MASQUERADE_ORANGE'}{$settings{'MASQUERADE_ORANGE'}} = 'selected="selected"';
+$selected{'MASQUERADE_BLUE'}{'off'} = '';
+$selected{'MASQUERADE_BLUE'}{'on'} = '';
+$selected{'MASQUERADE_BLUE'}{$settings{'MASQUERADE_BLUE'}} = 'selected="selected"';
 
 &Header::openbox('100%', 'center',);
 print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
 
-print <<END
+print <<END;
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='95%' cellspacing='0'>
+               <tr bgcolor='$color{'color20'}'>
+                       <td colspan='2' align='left'><b>$Lang::tr{'masquerading'}</b></td>
+               </tr>
+               <tr>
+                       <td align='left' width='60%'>$Lang::tr{'masquerade green'}</td>
+                       <td>
+                               <select name='MASQUERADE_GREEN'>
+                                       <option value='on' $selected{'MASQUERADE_GREEN'}{'on'}>$Lang::tr{'masquerading enabled'}</option>
+                                       <option value='off' $selected{'MASQUERADE_GREEN'}{'off'}>$Lang::tr{'masquerading disabled'}</option>
+                               </select>
+                       </td>
+               </tr>
+END
+
+       if (&Header::orange_used()) {
+               print <<END;
+                       <tr>
+                               <td align='left' width='60%'>$Lang::tr{'masquerade orange'}</td>
+                               <td>
+                                       <select name='MASQUERADE_ORANGE'>
+                                               <option value='on' $selected{'MASQUERADE_ORANGE'}{'on'}>$Lang::tr{'masquerading enabled'}</option>
+                                               <option value='off' $selected{'MASQUERADE_ORANGE'}{'off'}>$Lang::tr{'masquerading disabled'}</option>
+                                       </select>
+                               </td>
+                       </tr>
+END
+       }
+
+       if (&Header::blue_used()) {
+               print <<END;
+                       <tr>
+                               <td align='left' width='60%'>$Lang::tr{'masquerade blue'}</td>
+                               <td>
+                                       <select name='MASQUERADE_BLUE'>
+                                               <option value='on' $selected{'MASQUERADE_BLUE'}{'on'}>$Lang::tr{'masquerading enabled'}</option>
+                                               <option value='off' $selected{'MASQUERADE_BLUE'}{'off'}>$Lang::tr{'masquerading disabled'}</option>
+                                       </select>
+                               </td>
+                       </tr>
+END
+       }
+
+       print <<END
+       </table>
+
+       <br>
+
 <table width='95%' cellspacing='0'>
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw logging'}</b></td></tr>
 <tr><td align='left' width='60%'>$Lang::tr{'drop newnotsyn'}</td><td align='left'>on <input type='radio' name='DROPNEWNOTSYN' value='on' $checked{'DROPNEWNOTSYN'}{'on'} />/

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 556e65cfd3db0ab1884a3bd1d1164f9f0ca77f13..1f0a639422b4e021047c503f43f6bff38871a7cb 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1432,6 +1432,12 @@
 'map to guest' => 'Map to Guest',
 'march' => 'März',
 'marked' => 'Markiert',
+'masquerade blue' => 'NAT auf BLAU',
+'masquerade green' => 'NAT auf GREEN',
+'masquerade orange' => 'NAT auf ORANGE',
+'masquerading' => 'Masquerading/NAT',
+'masquerading disabled' => 'NAT ausgeschaltet',
+'masquerading enabled' => 'NAT eingeschaltet',
 'max bandwith' => 'Maximale Bandbreite',
 'max incoming size' => 'Max. eingehende Größe (kB):',
 'max lease time' => 'Max. Haltezeit in min:',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f4fafca0801b1bf271781c7d9f2f6734e8d4c90c..3266190f3903d08bbddffc7204020519eddbc8a7 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1462,6 +1462,12 @@
 'map to guest' => 'Map to Guest',
 'march' => 'March',
 'marked' => 'Marked',
+'masquerade blue' => 'Masquerade BLUE',
+'masquerade green' => 'Masquerade GREEN',
+'masquerade orange' => 'Masquerade ORANGE',
+'masquerading' => 'Masquerading',
+'masquerading disabled' => 'Masquerading disabled',
+'masquerading enabled' => 'Masquerading enabled',
 'max bandwith' => 'Maximum bandwith',
 'max incoming size' => 'Max incoming size (KB):',
 'max lease time' => 'Max lease time (mins):',

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 7a18502bfa728743bc951fef3ccbce84389a57f4..a49dcdee6d23adb147b210216972dc07a24047f6 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -336,10 +336,31 @@ iptables_red() {
                # Outgoing masquerading (don't masqerade IPSEC (mark 50))
                iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN
 
-               if [ "$IFACE" != "$GREEN_DEV" ]; then
-                       iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE
+               if [ "$IFACE" = "$GREEN_DEV" ]; then
+                       MASQUERADE_GREEN="off"
                fi
 
+               local NO_MASQ_DEVICES
+
+               if [ "${MASQUERADE_GREEN}" = "off" ]; then
+                       NO_MASQ_DEVICES="${NO_MASQ_DEVICES} ${GREEN_DEV}"
+               fi
+
+               if [ "${MASQUERADE_BLUE}" = "off" ]; then
+                       NO_MASQ_DEVICES="${NO_MASQ_DEVICES} ${BLUE_DEV}"
+               fi
+
+               if [ "${MASQUERADE_ORANGE}" = "off" ]; then
+                       NO_MASQ_DEVICES="${NO_MASQ_DEVICES} ${ORANGE_DEV}"
+               fi
+
+               local device
+               for device in ${NO_MASQ_DEVICES}; do
+                       iptables -t nat -A REDNAT -i "${device}" -o "${IFACE}" -j RETURN
+               done
+
+               # Masquerade everything else
+               iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE
        fi
 
        # Reload all rules.