From 5f14ec367a656a3b6eed7580d46447bebeb8eee1 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 7 May 2016 18:37:01 +0200
Subject: [PATCH] firewall: remove schedule expiry override

This is the default for pf(4), we don't need a kernel patch to
override this.
---
 src/etc/inc/filter.inc           |  4 +---
 src/www/system_advanced_misc.php | 20 --------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
index 9c2672718..aaa095598 100644
--- a/src/etc/inc/filter.inc
+++ b/src/etc/inc/filter.inc
@@ -2702,9 +2702,7 @@ function filter_generate_user_rule(&$FilterIflist, $rule)
         foreach ($config['schedules']['schedule'] as $sched) {
             if ($sched['name'] == $rule['sched']) {
                 if (!filter_get_time_based_rule_status($sched)) {
-                    if (!isset($config['system']['schedule_states'])) {
-                        mwexec("/sbin/pfctl -y {$sched['schedlabel']}");
-                    }
+                    /* looks weird but is fine: printed in rules for traceability */
                     return "# schedule finished - {$rule['descr']}";
                 }
                 $aline['schedlabel'] = " schedule \"{$sched['schedlabel']}\" ";
diff --git a/src/www/system_advanced_misc.php b/src/www/system_advanced_misc.php
index ac0dec61f..f543940d4 100644
--- a/src/www/system_advanced_misc.php
+++ b/src/www/system_advanced_misc.php
@@ -85,7 +85,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['crypto_hardware'] = !empty($config['system']['crypto_hardware']) ? $config['system']['crypto_hardware'] : null;
     $pconfig['cryptodev_enable'] = isset($config['system']['cryptodev_enable']);
     $pconfig['thermal_hardware'] = !empty($config['system']['thermal_hardware']) ? $config['system']['thermal_hardware'] : null;
-    $pconfig['schedule_states'] = isset($config['system']['schedule_states']);
     $pconfig['kill_states'] = isset($config['system']['kill_states']);
     $pconfig['skip_rules_gw_down'] = isset($config['system']['skip_rules_gw_down']);
     $pconfig['use_mfs_tmpvar'] = isset($config['system']['use_mfs_tmpvar']);
@@ -164,12 +163,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             unset($config['system']['thermal_hardware']);
         }
 
-        if (!empty($pconfig['schedule_states'])) {
-            $config['system']['schedule_states'] = true;
-        } elseif (isset($config['system']['schedule_states'])) {
-            unset($config['system']['schedule_states']);
-        }
-
         if (!empty($pconfig['kill_states'])) {
             $config['system']['kill_states'] = true;
         } elseif (isset($config['system']['kill_states'])) {
@@ -418,19 +411,6 @@ include("head.inc");
                   </div>
                 </td>
               </tr>
-              <tr>
-                <th colspan="2" valign="top" class="listtopic"><?=gettext("Schedules"); ?></th>
-              </tr>
-              <tr>
-                <td><a id="help_for_schedule_states" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Schedule States"); ?></td>
-                <td>
-                  <input name="schedule_states" type="checkbox" value="yes" <?=!empty($pconfig['schedule_states']) ? "checked=\"checked\"" :"";?> />
-                  <div class="hidden" for="help_for_schedule_states">
-                    <?=gettext("By default schedules clear the states of existing connections when the expiration time has come. ".
-                                        "This option overrides that behavior by not clearing states for existing connections."); ?>
-                  </div>
-                </td>
-              </tr>
               <tr>
                 <th colspan="2" valign="top" class="listtopic"><?=gettext("Gateway Monitoring"); ?></th>
               </tr>