diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-03-30 00:37:45 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-03-30 00:38:36 +0000 |
| commit | a55e9c701c2fc8914e0aebf12e37038f59b07cf8 (patch) | |
| tree | 05b5a1bc85f8742706649429ec164f576d240975 /etc/rc.dhclient_cron | |
| parent | cc460ee980e427bf4acdb8a4903e3278df59ea94 (diff) | |
| download | pfsense-a55e9c701c2fc8914e0aebf12e37038f59b07cf8.zip pfsense-a55e9c701c2fc8914e0aebf12e37038f59b07cf8.tar.gz | |
* Hide interfaces internals to other code and use the propper interfaces.
Basically use get_interface*() functions instead of accessing fields like 'ipaddr'/'descr' etc...
* Make get_interfaces_with_gateway less heavyweight by getting information from the configuration stored in config.xml
* Some other missed custom interface list building and substituing with propper get_configured_interface*()
NOTE: This should give indipendce on dynamic interfaces on some services that before could not be used on top of this type of interfaces.
Diffstat (limited to 'etc/rc.dhclient_cron')
| -rw-r--r-- | etc/rc.dhclient_cron | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/etc/rc.dhclient_cron b/etc/rc.dhclient_cron index 77254ec..c57b15b 100644 --- a/etc/rc.dhclient_cron +++ b/etc/rc.dhclient_cron @@ -31,17 +31,16 @@ require_once("config.inc"); require_once("functions.inc"); -require_once("filter.inc"); -require_once("interfaces.inc"); /* invalidate cache */ vc_invalidate(); unlink_if_exists("/tmp/config.cache"); -foreach($config['interfaces'] as $interface) { - $real_interface = $interface['if']; - if($interface['ipaddr'] == "dhcp") { +$iflist = get_configured_interface_with_descr(); +foreach($iflist as $ifname => $interface) { + $real_interface = get_real_interface($ifname); + if($config['interfaces'][$ifname]['ipaddr'] == "dhcp") { $pid = find_dhclient_process($real_interface); if($pid == 0 or !$pid) { /* dhclient is not running for interface, kick it */ @@ -51,4 +50,4 @@ foreach($config['interfaces'] as $interface) { } } -?>
\ No newline at end of file +?> |
