diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-28 13:40:42 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-28 13:54:34 -0200 |
| commit | c607951756335c1e6f7fc79ad795865446510484 (patch) | |
| tree | 94781ce33d0afcb22bd5ca1716ab1d4f344729ba /src | |
| parent | 32f29b1ddd10e878d31d9244214d51f1a5a6848f (diff) | |
| download | pfsense-c607951756335c1e6f7fc79ad795865446510484.zip pfsense-c607951756335c1e6f7fc79ad795865446510484.tar.gz | |
Simplify logic
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/system.inc | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 1a137d1..cb81567 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -238,26 +238,21 @@ function system_resolvconf_generate($dynupdate = false) { /* setup static routes for dns servers */ $dnsgw = "dns{$dnscounter}gw"; if (isset($config['system'][$dnsgw])) { + if (empty($config['system'][$dnsgw]) || + $config['system'][$dnsgw] == "none") { + continue; + } $gwname = $config['system'][$dnsgw]; - if (($gwname <> "") && ($gwname <> "none")) { - $gatewayip = lookup_gateway_ip_by_name($gwname); - if (is_ipaddrv4($gatewayip)) { - /* dns server array starts at 0 */ - $dnscountermo = $dnscounter - 1; - mwexec("/sbin/route change -host " . $syscfg['dnsserver'][$dnscountermo] . " {$gatewayip}"); - if (isset($config['system']['route-debug'])) { - $mt = microtime(); - log_error("ROUTING debug: $mt - route change -host {$syscfg['dnsserver'][$dnscountermo]} $gatewayip "); - } - } - if (is_ipaddrv6($gatewayip)) { - /* dns server array starts at 0 */ - $dnscountermo = $dnscounter - 1; - mwexec("/sbin/route change -host -inet6 " . $syscfg['dnsserver'][$dnscountermo] . " {$gatewayip}"); - if (isset($config['system']['route-debug'])) { - $mt = microtime(); - log_error("ROUTING debug: $mt - route change -host -inet6 {$syscfg['dnsserver'][$dnscountermo]} $gatewayip "); - } + $gatewayip = lookup_gateway_ip_by_name($gwname); + $inet = is_ipaddrv6($gatewayip) ? '-inet6 ' : ''; + + if (is_ipaddr($gatewayip)) { + /* dns server array starts at 0 */ + $dnscountermo = $dnscounter - 1; + mwexec("/sbin/route change -host " . $inet . $syscfg['dnsserver'][$dnscountermo] . " {$gatewayip}"); + if (isset($config['system']['route-debug'])) { + $mt = microtime(); + log_error("ROUTING debug: $mt - route change -host {$inet} {$syscfg['dnsserver'][$dnscountermo]} $gatewayip "); } } } |
