diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-05-16 21:36:11 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-05-16 21:36:11 +0000 |
| commit | 48ab0cd21c3c8ce35f96678463ddd2f99b0b88a7 (patch) | |
| tree | 8aa78dab864efe1751bcdb91c4b9325188f0e92f /etc/inc/services.inc | |
| parent | 895ecb3525bdfb9f445eba6d73797ce573ada030 (diff) | |
| download | pfsense-48ab0cd21c3c8ce35f96678463ddd2f99b0b88a7.zip pfsense-48ab0cd21c3c8ce35f96678463ddd2f99b0b88a7.tar.gz | |
Latest OLSR changes.
Diffstat (limited to 'etc/inc/services.inc')
| -rw-r--r-- | etc/inc/services.inc | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index b4be112..f2ee8e1 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -39,6 +39,12 @@ function services_dhcpd_configure() { echo "services_dhcpd_configure($if) being called $mt\n"; } + /* if OLSRD is enabled, allow WAN to house DHCP. */ + if($config['installedpackages']['olsrd']) + foreach($config['installedpackages']['olsrd']['config'] as $olsrd) + if($olsrd['enable']) + $is_olsr_enabled = true; + /* configure DHCPD chroot */ $fd = fopen("/tmp/dhcpd.sh","w"); $status = `mount | grep "{$g['dhcpd_chroot_path']}/dev"`; @@ -176,6 +182,10 @@ EOPP; $subnet = gen_subnet($ifcfg['ipaddr'], $ifcfg['subnet']); $subnetmask = gen_subnet_mask($ifcfg['subnet']); + if($is_olsr_enabled == true) + if($dhcpifconf['netmask']) + $subnetmask = $dhcpifconf['netmask']; + $dnscfg = ""; if ($dhcpifconf['domain']) { @@ -889,6 +899,15 @@ function setup_wireless_olsr() { if($olsr_enable <> "on") return; $fd = fopen("{$g['varetc_path']}/olsr.conf", "w"); + + if($olsrd['enableannounce'] == "on") + $enableannounce = "0.0.0.0 0.0.0.0"; + else + $enableannounce = ""; + + if($olsrd['announcedynamicroute'] == "on") + $enableannounce .= "\n{$olsrd['announcedynamicroute']}"; + $olsr .= <<<EODA # # olsr.org OLSR daemon config file @@ -918,7 +937,7 @@ ClearScreen yes Hna4 { - 0.0.0.0 0.0.0.0 + {$enableannounce} } # Should olsrd keep on running even if there are |
