lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 10:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: add note about CGN addresses included in private range; closes #2880

Browse Source
This commit is contained in:
Franco Fichtner 2018-11-24 14:15:41 +01:00
parent 03ef2ff81e
commit c28fb86f37
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opnsense/scripts/filter/update_bogons.sh
View File

@ -56,9 +56,8 @@ ENTRIES_TOT=`pfctl -vvsTables | awk '/Addresses/ {s+=$2}; END {print s}'`
ENTRIES_V4=`pfctl -vvsTables | awk '/-\tbogons$/ {getline; print $2}'`
LINES_V4=`wc -l ${WORKDIR}/fullbogons-ipv4.txt | awk '{ print $1 }'`
if [ $ENTRIES_MAX -gt $((2*ENTRIES_TOT-${ENTRIES_V4:-0}+LINES_V4)) ]; then
# These bogons are removed as they are private. I'm not going
# to question this now, adding a big WARNING instead. Here be
# dragons...
# private and pseudo-private networks will be excluded
# as they are being operated by a separate GUI option
egrep -v "^100.64.0.0/10|^192.168.0.0/16|^172.16.0.0/12|^10.0.0.0/8" ${WORKDIR}/fullbogons-ipv4.txt > ${DESTDIR}/bogons
RESULT=`/sbin/pfctl -t bogons -T replace -f ${DESTDIR}/bogons 2>&1`
echo "$RESULT" | awk '{ print "Bogons V4 file downloaded: " $0 }' | logger

4
src/www/interfaces.php
View File

@ -1838,8 +1838,8 @@ include("head.inc");
<div class="hidden" data-for="help_for_blockpriv">
<?=gettext("When set, this option blocks traffic from IP addresses that are reserved " .
"for private networks as per RFC 1918 (10/8, 172.16/12, 192.168/16) as well as loopback " .
"addresses (127/8). This option should only be set for WAN type interfaces that use " .
"public IP address space.");?>
"addresses (127/8) and Carrier-grade NAT addresses (100.64/10). This option should only " .
"be set for WAN interfaces that use the public IP address space.") ?>
</div>
</td>
</tr>