From 4d875b4f189e508f71dda38d5f62b0c56dc8a027 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sun, 21 Nov 2004 19:09:02 +0000 Subject: Update (C) --- usr/local/www/diag_backup.php | 4 ++- usr/local/www/diag_defaults.php | 26 +++++++------- usr/local/www/diag_dhcp_leases.php | 18 +++++----- usr/local/www/diag_ipsec_sad.php | 20 ++++++----- usr/local/www/diag_ipsec_spd.php | 26 +++++++------- usr/local/www/diag_logs_dhcp.php | 26 +++++++------- usr/local/www/diag_logs_settings.php | 62 +++++++++++++++++---------------- usr/local/www/diag_logs_vpn.php | 26 +++++++------- usr/local/www/diag_ping.php | 8 +++-- usr/local/www/diag_resetstate.php | 42 +++++++++++----------- usr/local/www/firewall_aliases.php | 4 ++- usr/local/www/firewall_aliases_edit.php | 1 - 12 files changed, 142 insertions(+), 121 deletions(-) diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index 7b65071..b91cc6b 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -2,8 +2,10 @@ . All rights reserved. diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php index 3ba3ea0..52ff73e 100755 --- a/usr/local/www/diag_defaults.php +++ b/usr/local/www/diag_defaults.php @@ -1,22 +1,24 @@ #!/usr/local/bin/php -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -55,14 +57,14 @@ if ($_POST) {

Diagnostics: Factory defaults

-

If you click "Yes", the firewall will be reset - to factory defaults and will reboot immediately. The entire system - configuration will be overwritten. The LAN IP address will be - reset to 192.168.1.1, the system will be configured as a DHCP +

If you click "Yes", the firewall will be reset + to factory defaults and will reboot immediately. The entire system + configuration will be overwritten. The LAN IP address will be + reset to 192.168.1.1, the system will be configured as a DHCP server, and the password will be set to 'mono'.

Are you sure you want to proceed?

-

+

diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php index 4b730fa..7b84831 100755 --- a/usr/local/www/diag_dhcp_leases.php +++ b/usr/local/www/diag_dhcp_leases.php @@ -1,22 +1,24 @@ #!/usr/local/bin/php - and Manuel Kasper . + Copyright (C) 2004 Scott Ullrich + All rights reserved. + + originially part of m0n0wall (http://m0n0.ch/wall) + Copyright (C) 2003-2004 Manuel Kasper . All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index caba9d1..a8aa0bb 100755 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -1,22 +1,24 @@ #!/usr/local/bin/php -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -49,7 +51,7 @@ require("guiconfig.inc");
  • SPD
    • - + ?> - + diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index 80cd066..dbac72f 100755 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -1,22 +1,24 @@ #!/usr/local/bin/php -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -49,7 +51,7 @@ require("guiconfig.inc");
  • SPD
    • - + ?> - +
    - + - + - + diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 088a02d..499a8ea 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -1,22 +1,24 @@ #!/usr/local/bin/php -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -45,11 +47,11 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); - + foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); echo "\n"; - + if ($withorig) { echo "\n"; echo "\n"; @@ -83,11 +85,11 @@ function dump_clog($logfile, $tail, $withorig = true) {
  • Settings
    • - +
    incoming (as seen by firewall)
    outgoing (as seen by firewall)
    " . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "" . htmlspecialchars($logent[4] . " " . $logent[5]) . "
    - - + diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 740e450..9272b47 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -1,22 +1,24 @@ #!/usr/local/bin/php -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -72,9 +74,9 @@ if ($_POST) { $oldnologdefaultblock = isset($config['syslog']['nologdefaultblock']); $config['syslog']['nologdefaultblock'] = $_POST['logdefaultblock'] ? false : true; $config['syslog']['rawfilter'] = $_POST['rawfilter'] ? true : false; - + write_config(); - + $retval = 0; if (!file_exists($d_sysrebootreqd_path)) { config_lock(); @@ -83,7 +85,7 @@ if ($_POST) { $retval |= filter_configure(); config_unlock(); } - $savemsg = get_std_save_message($retval); + $savemsg = get_std_save_message($retval); } } @@ -134,44 +136,44 @@ function enable_change(enable_over) {
  • Settings
    • - + \n"; echo "\n"; - + if ($llent[0] == "login") echo "\n"; else echo "\n"; - + echo "\n"; echo "\n"; echo "\n"; @@ -90,7 +92,7 @@ function dump_clog($logfile, $tail) {
    +
    Last DHCP service log entries
    - + - + - - + - + - + - - + - - + - - +
      > - Show log entries in reverse order (newest entries + Show log entries in reverse order (newest entries on top)
     Number of log entries to - show: + Number of log entries to + show:
      > Log packets blocked by the default rule
    - Hint: packets that are blocked by the - implicit default block rule will not be logged anymore + Hint: packets that are blocked by the + implicit default block rule will not be logged anymore if you uncheck this option. Per-rule logging options are not affected.
      > Show raw filter logs
    Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information.
      onClick="enable_change(false)"> Enable syslog'ing to remote syslog server
    Remote syslog +
    Remote syslog server +
    IP address of remote syslog server

    > system events
    > @@ -180,17 +182,17 @@ function enable_change(enable_over) { Portal Auth
    > PPTP VPN events
      +
      Note:
    - syslog sends UDP datagrams to port 514 on the specified - remote syslog server. Be sure to set syslogd on the - remote server to accept syslog messages from m0n0wall. + syslog sends UDP datagrams to port 514 on the specified + remote syslog server. Be sure to set syslogd on the + remote server to accept syslog messages from m0n0wall.
    diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 7e315b5..92425da 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -1,22 +1,24 @@ #!/usr/local/bin/php -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -45,19 +47,19 @@ function dump_clog($logfile, $tail) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); - + foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); $llent = explode(",", $logent[5]); - + echo "
    " . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "" . htmlspecialchars($llent[3]) . "" . htmlspecialchars($llent[2]) . " 
    - diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php index 33ad4ac..c35cabe 100755 --- a/usr/local/www/diag_ping.php +++ b/usr/local/www/diag_ping.php @@ -2,8 +2,10 @@ . All rights reserved. @@ -76,7 +78,7 @@ if (!isset($do_ping)) {
    + Last firewall log entries
    - @@ -90,7 +92,7 @@ if (!isset($do_ping)) { - diff --git a/usr/local/www/diag_resetstate.php b/usr/local/www/diag_resetstate.php index 3a7f028..637dd73 100755 --- a/usr/local/www/diag_resetstate.php +++ b/usr/local/www/diag_resetstate.php @@ -1,22 +1,24 @@ #!/usr/local/bin/php -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -61,33 +63,33 @@ if ($_POST) {
    Host +
      +
    - + - - + -
     

    +

    NAT table
    Firewall state table

    - Resetting the state tables will remove all entries from - the corresponding tables. This means that all open connections - will be broken and will have to be re-established. This - may be necessary after making substantial changes to the - firewall and/or NAT rules, especially if there are IP protocol + Resetting the state tables will remove all entries from + the corresponding tables. This means that all open connections + will be broken and will have to be re-established. This + may be necessary after making substantial changes to the + firewall and/or NAT rules, especially if there are IP protocol mappings (e.g. for PPTP or IPv6) with open connections.

    -     The firewall will normally leave + The firewall will normally leave the state tables intact when changing rules.

    - NOTE: If you reset the firewall state table, the browser - session may appear to be hung after clicking "Reset". + NOTE: If you reset the firewall state table, the browser + session may appear to be hung after clicking "Reset". Simply refresh the page to continue.
      - + +
    diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index a987019..aeead84 100755 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -2,8 +2,10 @@ . All rights reserved. diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 1c24150..9d5d457 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -6,7 +6,6 @@ All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2003-2004 Manuel Kasper . All rights reserved. -- cgit v1.1