mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make pppoe reset work again with new <if> naming scheme.

Browse Source 
Previous commit also moved pppoe reset functions to interfaces.inc
so we don't have to duplicate in interfaces.php and interfaces_ppps_edit.php

Also, add code so that when ppp config section gets deleted, associated <cron>
item gets deleted for pppoe-reset cron items.
This commit is contained in:
gnhb 2010-06-09 21:40:12 +07:00
parent e5d558bfac
commit 5c8e8a17e3
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
etc/inc/interfaces.inc
View File

@ -885,7 +885,7 @@ function getMPDCRONSettings($pppif_) {
if (is_array($config['cron']['item'])) {
for ($i = 0; $i < count($config['cron']['item']); $i++) {
$item = $config['cron']['item'][$i];
if (strpos($item['command'], CRON_PPPOE_CMD_FILE.$pppif_) !== false) {
if (strpos($item['command'], $pppif_) !== false) {
return array("ID" => $i, "ITEM" => $item);
}
}
@ -896,10 +896,12 @@ function getMPDCRONSettings($pppif_) {
function handle_pppoe_reset($post_array) {
global $config, $g;
$cron_cmd_file = "{$g['varetc_path']}/pppoe_restart_";
$pppif = $post_array['type'].$post_array['ptpid'];
if (!is_array($config['cron']['item']))
$config['cron']['item'] = array();
$itemhash = getMPDCRONSettings($pppif);
$itemhash = getMPDCRONSettings($cron_cmd_file.$pppif);
$item = $itemhash['ITEM'];
// reset cron items if necessary and return
@ -925,7 +927,7 @@ function handle_pppoe_reset($post_array) {
}
$item['wday'] = "*";
$item['who'] = "root";
$item['command'] = CRON_PPPOE_CMD_FILE.$pppif;
$item['command'] = $cron_cmd_file.$pppif;
} else if (isset($post_array['pppoe-reset-type']) && $post_array['pppoe-reset-type'] == "preset") {
switch ($post_array['pppoe_pr_preset_val']) {
case "monthly":
@ -935,7 +937,7 @@ function handle_pppoe_reset($post_array) {
$item['month'] = "*";
$item['wday'] = "*";
$item['who'] = "root";
$item['command'] = CRON_PPPOE_CMD_FILE.$pppif;
$item['command'] = $cron_cmd_file.$pppif;
break;
case "weekly":
$item['minute'] = "0";
@ -944,7 +946,7 @@ function handle_pppoe_reset($post_array) {
$item['month'] = "*";
$item['wday'] = "0";
$item['who'] = "root";
$item['command'] = CRON_PPPOE_CMD_FILE.$pppif;
$item['command'] = $cron_cmd_file.$pppif;
break;
case "daily":
$item['minute'] = "0";
@ -953,7 +955,7 @@ function handle_pppoe_reset($post_array) {
$item['month'] = "*";
$item['wday'] = "*";
$item['who'] = "root";
$item['command'] = CRON_PPPOE_CMD_FILE.$pppif;
$item['command'] = $cron_cmd_file.$pppif;
break;
case "hourly":
$item['minute'] = "0";
@ -962,9 +964,15 @@ function handle_pppoe_reset($post_array) {
$item['month'] = "*";
$item['wday'] = "*";
$item['who'] = "root";
$item['command'] = CRON_PPPOE_CMD_FILE.$pppif;
$item['command'] = $cron_cmd_file.$pppif;
break;
} // end switch
} else {
/* test whether a cron item exists and unset() it if necessary */
$itemhash = getMPDCRONSettings($cron_cmd_file.$pppif);
$item = $itemhash['ITEM'];
if (isset($item))
unset($config['cron']['item'][$itemhash['ID']]);
}// end if
if (isset($itemhash['ID']))
$config['cron']['item'][$itemhash['ID']] = $item;
@ -1359,9 +1367,9 @@ EOD;
// Check for PPPoE periodic reset request
if ($type == "pppoe")
if (isset($ppp['pppoe-reset-type']))
setup_pppoe_reset_file($ppp['ptpid'], $interface);
setup_pppoe_reset_file($ppp['if'], $interface);
else
setup_pppoe_reset_file($ppp['ptpid']);
setup_pppoe_reset_file($ppp['if']);
/* sleep until wan is up - or 30 seconds, whichever comes first */
for ($count = 0; $count < 12; $count++) {
@ -3521,11 +3529,11 @@ function is_jumbo_capable($int) {
return false;
}
function setup_pppoe_reset_file($ptpid, $iface="") {
function setup_pppoe_reset_file($pppif, $iface="") {
global $g;
$cron_file = "{$g['varetc_path']}/pppoe_restart_{$ptpid}";
$cron_file = "{$g['varetc_path']}/pppoe_restart_{$pppif}";
if(!empty($iface) && !empty($ptpid)){
if(!empty($iface) && !empty($pppif)){
$cron_cmd = "#!/bin/sh\necho '<?php require(\"config.inc\"); require(\"interfaces.inc\"); interface_reconfigure({$iface}); log_error(\"PPPoE periodic reset executed on {$iface}\"); ?>' | /usr/local/bin/php -q";
file_put_contents($cron_file, $cron_cmd);
chmod($cron_file, 0700);

2
usr/local/www/interfaces_ppps.php
View File

@ -62,6 +62,8 @@ if ($_GET['act'] == "del") {
if (ppp_inuse($_GET['id'])) {
$input_errors[] = "This point-to-point link cannot be deleted because it is still being used as an interface.";
} else {
unset($a_ppps[$_GET['id']]['pppoe-reset-type']);
handle_pppoe_reset($a_ppps[$_GET['id']]);
unset($a_ppps[$_GET['id']]);
write_config();
header("Location: interfaces_ppps.php");

1
usr/local/www/interfaces_ppps_edit.php
View File

@ -44,7 +44,6 @@
require("guiconfig.inc");
require("functions.inc");
define("CRON_PPPOE_CMD_FILE", "{$g['varetc_path']}/pppoe_restart_");
define("CRON_MONTHLY_PATTERN", "0 0 1 * *");
define("CRON_WEEKLY_PATTERN", "0 0 * * 0");
define("CRON_DAILY_PATTERN", "0 0 * * *");