Commit 6f29ede3 authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner

(legacy) whitespace rc.update_urltables

(cherry picked from commit 6b18b3ec)
parent 07a1ac20
...@@ -6,53 +6,55 @@ require_once("util.inc"); ...@@ -6,53 +6,55 @@ require_once("util.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
if (!isset($config['aliases']['alias'])) { if (!isset($config['aliases']['alias'])) {
// No aliases // No aliases
exit; exit;
} }
// Gather list of urltable aliases // Gather list of urltable aliases
$todo = array(); $todo = array();
foreach ($config['aliases']['alias'] as $alias) { foreach ($config['aliases']['alias'] as $alias) {
if (preg_match('/urltable/i', $alias['type'])) { if (preg_match('/urltable/i', $alias['type'])) {
$tmp = array(); $tmp = array();
$tmp['type'] = $alias['type']; $tmp['type'] = $alias['type'];
$tmp['name'] = $alias['name']; $tmp['name'] = $alias['name'];
$tmp['url'] = $alias['url']; $tmp['url'] = $alias['url'];
$tmp['freq'] = $alias['updatefreq']; $tmp['freq'] = $alias['updatefreq'];
$todo[] = $tmp; $todo[] = $tmp;
} }
} }
if (count($todo) > 0) { if (count($todo) > 0) {
log_error("{$argv[0]}: Starting up."); log_error("{$argv[0]}: Starting up.");
if ($argv[1] != "now") { if ($argv[1] != "now") {
// Wait a little before updating. // Wait a little before updating.
$wait = mt_rand(5, 60); $wait = mt_rand(5, 60);
log_error("{$argv[0]}: Sleeping for {$wait} seconds."); log_error("{$argv[0]}: Sleeping for {$wait} seconds.");
sleep($wait); sleep($wait);
} }
log_error("{$argv[0]}: Starting URL table alias updates"); log_error("{$argv[0]}: Starting URL table alias updates");
$filter_reload = false; $filter_reload = false;
foreach ($todo as $t) { foreach ($todo as $t) {
$r = process_alias_urltable($t['name'], $t['url'], $t['freq']); $r = process_alias_urltable($t['name'], $t['url'], $t['freq']);
if ($r == 1) { if ($r == 1) {
$result = ""; $result = "";
// TODO: Change it when pf supports tables with ports // TODO: Change it when pf supports tables with ports
if ($t['type'] == "urltable") if ($t['type'] == "urltable") {
exec("/sbin/pfctl -t " . escapeshellarg($t['name']) . " -T replace -f /var/db/aliastables/" . escapeshellarg($t['name']) . ".txt 2>&1", $result); exec("/sbin/pfctl -t " . escapeshellarg($t['name']) . " -T replace -f /var/db/aliastables/" . escapeshellarg($t['name']) . ".txt 2>&1", $result);
else } else {
$filter_reload = true; $filter_reload = true;
log_error("{$argv[0]}: Updated {$t['name']} content from {$t['url']}: {$result[0]}"); }
} elseif ($r == -1) { log_error("{$argv[0]}: Updated {$t['name']} content from {$t['url']}: {$result[0]}");
log_error("{$argv[0]}: {$t['name']} does not need updating."); } elseif ($r == -1) {
} else { log_error("{$argv[0]}: {$t['name']} does not need updating.");
log_error("{$argv[0]}: ERROR: could not update {$t['name']} content from {$t['url']}"); } else {
} log_error("{$argv[0]}: ERROR: could not update {$t['name']} content from {$t['url']}");
} }
}
if ($filter_reload)
configd_run("filter reload"); if ($filter_reload) {
configd_run("filter reload");
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment