diff options
| author | Chris Buechler <cmb@pfsense.org> | 2009-08-20 17:41:34 -0400 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2009-08-20 17:41:34 -0400 |
| commit | e49dc1bd4ba698bb8e898eb92d79722b973e682e (patch) | |
| tree | 5d5e7a79dd5e9ebb9e0c6f940d823fbe8667c77d /usr/local/www/diag_showbogons.php | |
| parent | 9dbb93ba9de282429f35d82f052624e79c6e49c8 (diff) | |
| parent | acf23e63aceb182a748f1f618bf87957747d7886 (diff) | |
| download | pfsense-e49dc1bd4ba698bb8e898eb92d79722b973e682e.zip pfsense-e49dc1bd4ba698bb8e898eb92d79722b973e682e.tar.gz | |
Merge branch 'master' of rcs.pfsense.org:pfsense/mainline
Conflicts:
usr/local/www/diag_showbogons.php
Diffstat (limited to 'usr/local/www/diag_showbogons.php')
| -rw-r--r-- | usr/local/www/diag_showbogons.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/usr/local/www/diag_showbogons.php b/usr/local/www/diag_showbogons.php index c3ee290..738122e 100644 --- a/usr/local/www/diag_showbogons.php +++ b/usr/local/www/diag_showbogons.php @@ -37,7 +37,18 @@ require("guiconfig.inc"); if($_POST['Download']) { +<<<<<<< HEAD mwexec_bg("/etc/rc.update_bogons.sh now"); +======= + exec("touch /var/run/donotsleep_bogons"); + conf_mount_rw(); + exec("/usr/bin/fetch -q -o /tmp/bogons 'http://files.pfsense.org/bogon-bn-nonagg.txt'"); + if(file_exists("/tmp/bogons")) { + $savemsg = "The bogons database has been updated."; + exec("egrep -v '^192.168.0.0/16|^172.16.0.0/12|^10.0.0.0/8' /tmp/bogons > /etc/bogons"); + exec("rm /tmp/bogons"); + } +>>>>>>> acf23e63aceb182a748f1f618bf87957747d7886 } $bogons = `cat /etc/bogons`; @@ -52,6 +63,8 @@ include("fbegin.inc"); body { font-family: Verdana; font-size: 100%; } pre { font-size: 1.15em; } </style> +<?php if ($input_errors) print_input_errors($input_errors); ?> +<?php if ($savemsg) print_info_box($savemsg); ?> <form method="post" action="diag_showbogons.php"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> |
