diff options
| author | Daniel Hoffend <dh@dotlan.net> | 2016-06-29 00:46:10 +0200 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-06-28 21:12:52 -0500 |
| commit | 74ed3a16412514328295e3ec55ae3cfa9af6bc8c (patch) | |
| tree | 1982d24e8553b8c641fb29775eac593463fdb72e | |
| parent | fcd9f64cc35efb9d055c432fe805d82153ae37d1 (diff) | |
| download | pfsense-74ed3a16412514328295e3ec55ae3cfa9af6bc8c.zip pfsense-74ed3a16412514328295e3ec55ae3cfa9af6bc8c.tar.gz | |
Use a different delimiter for dpinger socket names
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.
| -rw-r--r-- | src/etc/inc/gwlb.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index cbdceb5..998319d 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -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 */ |
