Skip to content

O
OpnSense
Commit 801f150e authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner
Browse files
Options

(legacy) fix spacing and curly braces in vslb.inc 

(cherry picked from commit 47b56236)
parent 85ebceae
Show whitespace changes
Inline Side-by-side
Showing with 425 additions and 430 deletions
src/etc/inc/vslb.inc
View file @ 801f150e
...@@ -41,8 +41,8 @@ function subnetv4_expand($subnet) { ...@@ -41,8 +41,8 @@ function subnetv4_expand($subnet) {
/* include all configuration functions */ /* include all configuration functions */
class Monitor
class Monitor { {
private $conf = array(); private $conf = array();
function __construct($config) { function __construct($config) {
$this->conf = $config; $this->conf = $config;
...@@ -59,19 +59,23 @@ class Monitor { ...@@ -59,19 +59,23 @@ class Monitor {
} }
} }
class TCPMonitor extends Monitor { class TCPMonitor extends Monitor
{
protected $proto = 'tcp'; protected $proto = 'tcp';
} }
class SSLMonitor extends Monitor { class SSLMonitor extends Monitor
{
protected $proto = 'ssl'; protected $proto = 'ssl';
} }
class ICMPMonitor extends Monitor { class ICMPMonitor extends Monitor
{
protected $proto = 'icmp'; protected $proto = 'icmp';
} }
class HTTPMonitor extends Monitor { class HTTPMonitor extends Monitor
{
protected $proto = 'http'; protected $proto = 'http';
function __construct($config) { function __construct($config) {
parent::__construct($config); parent::__construct($config);
...@@ -98,7 +102,8 @@ class HTTPMonitor extends Monitor { ...@@ -98,7 +102,8 @@ class HTTPMonitor extends Monitor {
} }
} }
class HTTPSMonitor extends HTTPMonitor { class HTTPSMonitor extends HTTPMonitor
{
protected $proto = 'https'; protected $proto = 'https';
} }
...@@ -111,7 +116,6 @@ class SendMonitor extends Monitor { ...@@ -111,7 +116,6 @@ class SendMonitor extends Monitor {
return "check {$this->proto} {$this->data()} expect {$this->pattern()} {$this->ssl()}"; return "check {$this->proto} {$this->data()} expect {$this->pattern()} {$this->ssl()}";
} }
private function data() { private function data() {
return $this->config('send') != "" ? "\"{$this->config('send')}\"" : "\"\""; return $this->config('send') != "" ? "\"{$this->config('send')}\"" : "\"\"";
} }
...@@ -125,11 +129,6 @@ class SendMonitor extends Monitor { ...@@ -125,11 +129,6 @@ class SendMonitor extends Monitor {
} }
} }
function relady_configure_full()
{
relayd_configure(true);
}
function relayd_configure($kill_first = false) function relayd_configure($kill_first = false)
{ {
global $config; global $config;
...@@ -170,7 +169,7 @@ function relayd_configure($kill_first = false) ...@@ -170,7 +169,7 @@ function relayd_configure($kill_first = false)
$mon = new SendMonitor($type['options']); $mon = new SendMonitor($type['options']);
break; break;
} }
if($mon) { if ($mon) {
$check_a[$type['name']] = $mon->p(); $check_a[$type['name']] = $mon->p();
} }
} }
...@@ -200,9 +199,9 @@ function relayd_configure($kill_first = false) ...@@ -200,9 +199,9 @@ function relayd_configure($kill_first = false)
/* reindex pools by name as we loop through the pools array */ /* reindex pools by name as we loop through the pools array */
$pools = array(); $pools = array();
/* Virtual server pools */ /* Virtual server pools */
if(is_array($pool_a)) { if (is_array($pool_a)) {
for ($i = 0; isset($pool_a[$i]); $i++) { for ($i = 0; isset($pool_a[$i]); $i++) {
if(is_array($pool_a[$i]['servers'])) { if (is_array($pool_a[$i]['servers'])) {
if (!empty($pool_a[$i]['retry'])) { if (!empty($pool_a[$i]['retry'])) {
$retrytext = " retry {$pool_a[$i]['retry']}"; $retrytext = " retry {$pool_a[$i]['retry']}";
} else { } else {
...@@ -214,8 +213,7 @@ function relayd_configure($kill_first = false) ...@@ -214,8 +213,7 @@ function relayd_configure($kill_first = false)
foreach (subnetv4_expand($server) as $ip) { foreach (subnetv4_expand($server) as $ip) {
$conf .= "\t{$ip}{$retrytext}\n"; $conf .= "\t{$ip}{$retrytext}\n";
} }
} } else {
else {
$conf .= "\t{$server}{$retrytext}\n"; $conf .= "\t{$server}{$retrytext}\n";
} }
} }
...@@ -230,25 +228,21 @@ function relayd_configure($kill_first = false) ...@@ -230,25 +228,21 @@ function relayd_configure($kill_first = false)
$conf .= "\t" . "tcp { nodelay, sack, socket buffer 1024, backlog 1000 }\n"; $conf .= "\t" . "tcp { nodelay, sack, socket buffer 1024, backlog 1000 }\n";
$conf .= "}\n"; $conf .= "}\n";
if(is_array($vs_a)) { if (is_array($vs_a)) {
for ($i = 0; isset($vs_a[$i]); $i++) { for ($i = 0; isset($vs_a[$i]); $i++) {
$append_port_to_name = false; $append_port_to_name = false;
if (is_alias($pools[$vs_a[$i]['poolname']]['port'])) { if (is_alias($pools[$vs_a[$i]['poolname']]['port'])) {
$dest_port_array = filter_expand_alias_array($pools[$vs_a[$i]['poolname']]['port']); $dest_port_array = filter_expand_alias_array($pools[$vs_a[$i]['poolname']]['port']);
$append_port_to_name = true; $append_port_to_name = true;
} } else {
else {
$dest_port_array = array($pools[$vs_a[$i]['poolname']]['port']); $dest_port_array = array($pools[$vs_a[$i]['poolname']]['port']);
} }
if (is_alias($vs_a[$i]['port'])) { if (is_alias($vs_a[$i]['port'])) {
$src_port_array = filter_expand_alias_array($vs_a[$i]['port']); $src_port_array = filter_expand_alias_array($vs_a[$i]['port']);
$append_port_to_name = true; $append_port_to_name = true;
} } elseif ($vs_a[$i]['port']) {
else if ($vs_a[$i]['port']) {
$src_port_array = array($vs_a[$i]['port']); $src_port_array = array($vs_a[$i]['port']);
} } else {
else {
$src_port_array = $dest_port_array; $src_port_array = $dest_port_array;
} }
...@@ -259,18 +253,15 @@ function relayd_configure($kill_first = false) ...@@ -259,18 +253,15 @@ function relayd_configure($kill_first = false)
log_error("item is $item"); log_error("item is $item");
if (is_subnetv4($item)) { if (is_subnetv4($item)) {
$ip_list = array_merge($ip_list, subnetv4_expand($item)); $ip_list = array_merge($ip_list, subnetv4_expand($item));
} } else {
else {
$ip_list[] = $item; $ip_list[] = $item;
} }
} }
$append_ip_to_name = true; $append_ip_to_name = true;
} } elseif (is_subnetv4($vs_a[$i]['ipaddr'])) {
else if (is_subnetv4($vs_a[$i]['ipaddr'])) {
$ip_list = subnetv4_expand($vs_a[$i]['ipaddr']); $ip_list = subnetv4_expand($vs_a[$i]['ipaddr']);
$append_ip_to_name = true; $append_ip_to_name = true;
} } else {
else {
$ip_list = array($vs_a[$i]['ipaddr']); $ip_list = array($vs_a[$i]['ipaddr']);
} }
...@@ -304,20 +295,23 @@ function relayd_configure($kill_first = false) ...@@ -304,20 +295,23 @@ function relayd_configure($kill_first = false)
$conf .= " forward to <{$vs_a[$i]['poolname']}> port {$dest_port} {$lbmode} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n"; $conf .= " forward to <{$vs_a[$i]['poolname']}> port {$dest_port} {$lbmode} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n";
if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0 && ($vs_a[$i]['relay_protocol'] != 'dns')) if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0 && ($vs_a[$i]['relay_protocol'] != 'dns')) {
$conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$dest_port} {$lbmode} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n"; $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$dest_port} {$lbmode} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n";
}
$conf .= "}\n"; $conf .= "}\n";
} else { } else {
$conf .= "redirect \"{$name}\" {\n"; $conf .= "redirect \"{$name}\" {\n";
$conf .= " listen on {$ip} port {$src_port}\n"; $conf .= " listen on {$ip} port {$src_port}\n";
$conf .= " forward to <{$vs_a[$i]['poolname']}> port {$dest_port} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n"; $conf .= " forward to <{$vs_a[$i]['poolname']}> port {$dest_port} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n";
if (isset($config['system']['lb_use_sticky'])) if (isset($config['system']['lb_use_sticky'])) {
$conf .= " sticky-address\n"; $conf .= " sticky-address\n";
}
/* sitedown MUST use the same port as the primary pool - sucks, but it's a relayd thing */ /* sitedown MUST use the same port as the primary pool - sucks, but it's a relayd thing */
if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0 && ($vs_a[$i]['relay_protocol'] != 'dns')) if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0 && ($vs_a[$i]['relay_protocol'] != 'dns')) {
$conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$dest_port} {$check_a[$pools[$vs_a[$i]['sitedown']]['monitor']]} \n"; $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$dest_port} {$check_a[$pools[$vs_a[$i]['sitedown']]['monitor']]} \n";
}
$conf .= "}\n"; $conf .= "}\n";
} }
...@@ -351,17 +345,16 @@ function relayd_configure($kill_first = false) ...@@ -351,17 +345,16 @@ function relayd_configure($kill_first = false)
/* Remove all active relayd anchors now that relayd is no longer running. */ /* Remove all active relayd anchors now that relayd is no longer running. */
cleanup_lb_anchor("*"); cleanup_lb_anchor("*");
} }
} else { } elseif (!empty($vs_a)) {
if (! empty($vs_a)) {
// not running and there is a config, start it // not running and there is a config, start it
/* Remove all active relayd anchors so it can start fresh. */ /* Remove all active relayd anchors so it can start fresh. */
cleanup_lb_anchor('*'); cleanup_lb_anchor('*');
mwexec('/usr/local/sbin/relayd -f /var/etc/relayd.conf'); mwexec('/usr/local/sbin/relayd -f /var/etc/relayd.conf');
} }
}
} }
function get_lb_redirects() { function get_lb_redirects()
{
/* /*
# relayctl show summary # relayctl show summary
Id Type Name Avlblty Status Id Type Name Avlblty Status
...@@ -401,7 +394,7 @@ Id Type Name Avlblty Status ...@@ -401,7 +394,7 @@ Id Type Name Avlblty Status
$line = $rdr_a[$i]; $line = $rdr_a[$i];
if (preg_match("/^[0-9]+/", $line)) { if (preg_match("/^[0-9]+/", $line)) {
$regs = array(); $regs = array();
if($x = preg_match("/^[0-9]+\s+redirect\s+([^\s]+)\s+([^\s]+)/", $line, $regs)) { if ($x = preg_match("/^[0-9]+\s+redirect\s+([^\s]+)\s+([^\s]+)/", $line, $regs)) {
$cur_entry = trim($regs[1]); $cur_entry = trim($regs[1]);
$vs[trim($regs[1])] = array(); $vs[trim($regs[1])] = array();
$vs[trim($regs[1])]['status'] = trim($regs[2]); $vs[trim($regs[1])]['status'] = trim($regs[2]);
...@@ -419,7 +412,7 @@ Id Type Name Avlblty Status ...@@ -419,7 +412,7 @@ Id Type Name Avlblty Status
$line = $relay_a[$i]; $line = $relay_a[$i];
if (preg_match("/^[0-9]+/", $line)) { if (preg_match("/^[0-9]+/", $line)) {
$regs = array(); $regs = array();
if($x = preg_match("/^[0-9]+\s+relay\s+([^\s]+)\s+([^\s]+)/", $line, $regs)) { if ($x = preg_match("/^[0-9]+\s+relay\s+([^\s]+)\s+([^\s]+)/", $line, $regs)) {
$cur_entry = trim($regs[1]); $cur_entry = trim($regs[1]);
$vs[trim($regs[1])] = array(); $vs[trim($regs[1])] = array();
$vs[trim($regs[1])]['status'] = trim($regs[2]); $vs[trim($regs[1])]['status'] = trim($regs[2]);
...@@ -435,7 +428,8 @@ Id Type Name Avlblty Status ...@@ -435,7 +428,8 @@ Id Type Name Avlblty Status
return $vs; return $vs;
} }
function get_lb_summary() { function get_lb_summary()
{
$relayctl = array(); $relayctl = array();
exec('/usr/local/sbin/relayctl show summary 2>&1', $relayctl); exec('/usr/local/sbin/relayctl show summary 2>&1', $relayctl);
$relay_hosts=Array(); $relay_hosts=Array();
...@@ -471,7 +465,8 @@ function get_lb_anchors() { ...@@ -471,7 +465,8 @@ function get_lb_anchors() {
/* Remove NAT rules from a relayd anchor that is no longer in use. /* Remove NAT rules from a relayd anchor that is no longer in use.
$anchorname can either be * to clear all anchors or a specific anchor name.*/ $anchorname can either be * to clear all anchors or a specific anchor name.*/
function cleanup_lb_anchor($anchorname = "*") { function cleanup_lb_anchor($anchorname = "*")
{
$lbanchors = get_lb_anchors(); $lbanchors = get_lb_anchors();
foreach ($lbanchors as $lba) { foreach ($lbanchors as $lba) {
if (($anchorname == "*") || ($lba == "relayd/{$anchorname}")) { if (($anchorname == "*") || ($lba == "relayd/{$anchorname}")) {
......
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

Technounit-GROUP 2023