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

Use a different delimiter for dpinger socket names

Browse Source 
Currently underscores are used to seperate gwifip, monitorip, etc, but
underscors are also used in vlan subinterfaces like em0_vlan10 and
therefore can't be used because the interface scope is appended to IPv6
link-local addresses.
This commit is contained in:
Daniel Hoffend 2016-06-29 00:46:10 +02:00 committed by Chris Buechler
parent ba2c8ed46b
commit dca9eafb0e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/etc/inc/gwlb.inc
View File

@ -79,7 +79,7 @@ function running_dpinger_processes() {
}
foreach ($pidfiles as $pidfile) {
if (preg_match('/^dpinger_(.+)_([^_]+)_([^_]+)\.pid$/',
if (preg_match('/^dpinger_(.+)~([^~]+)~([^~]+)\.pid$/',
basename($pidfile), $matches)) {
$socket_file = preg_replace('/\.pid$/', '.sock',
$pidfile);
@ -128,10 +128,10 @@ function start_dpinger($gateway) {
$dpinger_defaults = return_dpinger_defaults();
$pidfile = "{$g['varrun_path']}/dpinger_{$gateway['name']}_" .
"{$gateway['gwifip']}_{$gateway['monitor']}.pid";
$socket = "{$g['varrun_path']}/dpinger_{$gateway['name']}_" .
"{$gateway['gwifip']}_{$gateway['monitor']}.sock";
$pidfile = "{$g['varrun_path']}/dpinger_{$gateway['name']}~" .
"{$gateway['gwifip']}~{$gateway['monitor']}.pid";
$socket = "{$g['varrun_path']}/dpinger_{$gateway['name']}~" .
"{$gateway['gwifip']}~{$gateway['monitor']}.sock";
$alarm_cmd = "{$g['etc_path']}/rc.gateway_alarm";
$params = "-S "; /* Log warnings via syslog */