aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRenato Botelho <garga@pfSense.org>2013-06-28 03:07:31 -0700
committerRenato Botelho <garga@pfSense.org>2013-06-28 03:07:31 -0700
commit060c0a4da594994fc78865afa72f3550e1e83c18 (patch)
treee339d554b6ee4436ea07f20ff9e3367a116a4179 /config
parent1884e31c8e974a06fedd10f583612447d22fe879 (diff)
parent9a30b5aad010249050fe5216044beb5dea026367 (diff)
downloadpfsense-packages-060c0a4da594994fc78865afa72f3550e1e83c18.tar.gz
pfsense-packages-060c0a4da594994fc78865afa72f3550e1e83c18.tar.bz2
pfsense-packages-060c0a4da594994fc78865afa72f3550e1e83c18.zip
Merge pull request #466 from plinss/master
Added support for DHCPv6 reservations and /etc/hosts entries
Diffstat (limited to 'config')
-rw-r--r--config/unbound/unbound.inc59
1 files changed, 46 insertions, 13 deletions
diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc
index c3ac495f..e53168eb 100644
--- a/config/unbound/unbound.inc
+++ b/config/unbound/unbound.inc
@@ -847,7 +847,7 @@ function unbound_add_host_entries() {
// DNSMasq entries static host entries
if (isset($dnsmasqcfg['hosts'])) {
$hosts = $dnsmasqcfg['hosts'];
- $host_entries = "";
+ $host_entries = "# DNSMasq Host overrides\n";
$added_item = array();
foreach ($hosts as $host) {
$current_host = ($host['host'] != "") ? $host['host'].".".$host['domain'] : $host['domain'];
@@ -895,8 +895,9 @@ function unbound_add_host_entries() {
}
$unbound_entries .= $host_entries;
}
+
// Static DHCP entries
- $host_entries = "";
+ $host_entries = "# DHCP Reservations\n";
if (isset($unboundcfg['regdhcpstatic']) && is_array($config['dhcpd'])) {
foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf)
if(is_array($dhcpifconf['staticmap']) && isset($dhcpifconf['enable']))
@@ -915,29 +916,61 @@ function unbound_add_host_entries() {
}
$unbound_entries .= $host_entries;
}
+
+ // Static DHCPv6 entries
+ $host_entries = "# DHCPv6 reservations\n";
+ if (isset($unboundcfg['regdhcpstatic']) && is_array($config['dhcpdv6'])) {
+ foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf)
+ if(is_array($dhcpifconf['staticmap']) && isset($dhcpifconf['enable']))
+ foreach ($dhcpifconf['staticmap'] as $host)
+ if ($host['ipaddrv6'] && $host['hostname']) {
+ $current_host = $host['hostname'].".".$syscfg['domain'];
+ if (!$added_item_v6[$current_host]) {
+ $host_entries .= "local-data-ptr: \"{$host['ipaddrv6']} {$current_host}\"\n";
+ $host_entries .= "local-data: \"{$current_host} IN AAAA {$host['ipaddrv6']}\"\n";
+ $added_item_v6[$current_host] = true;
+ if ((!$added_item[$current_host]) && (!empty($host['descr'])) && ($unboundcfg['txtsupport'] == 'on')) {
+ $host_entries .= "local-data: '{$host['hostname']}.{$syscfg['domain']} TXT \"".addslashes($host['descr'])."\"'\n";
+ $added_item[$current_host] = true;
+ }
+ }
+ }
+ $unbound_entries .= $host_entries;
+ }
// Handle DHCPLeases added host entries
$dhcplcfg = read_hosts();
- $host_entries = "";
+ $host_entries = "# /etc/hosts entries\n";
if(is_array($dhcplcfg)) {
foreach($dhcplcfg as $key=>$host) {
$current_host = $host['fqdn'];
- if (!$added_item_v4[$current_host]) {
- $host_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['fqdn']}\"\n";
- $host_entries .= "local-data: \"{$host['fqdn']} IN A {$host['ipaddr']}\"\n";
- $added_item_v4[$current_host] = true;
- if ((!empty($host['name'])) && (!$added_item_v4[$host['name']])) {
- $host_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['name']}\"\n";
- $host_entries .= "local-data: \"{$host['name']} IN A {$host['ipaddr']}\"\n";
- $added_item_v4[$host['name']] = true;
+ if (function_exists("is_ipaddrv6") && is_ipaddrv6($host['ipaddr'])) {
+ if (!$added_item_v6[$current_host]) {
+ $host_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['fqdn']}\"\n";
+ $host_entries .= "local-data: \"{$host['fqdn']} IN AAAA {$host['ipaddr']}\"\n";
+ $added_item_v6[$current_host] = true;
+ if ((!empty($host['name'])) && (!$added_item_v6[$host['name']])) {
+ $host_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['name']}\"\n";
+ $host_entries .= "local-data: \"{$host['name']} IN AAAA {$host['ipaddr']}\"\n";
+ $added_item_v6[$host['name']] = true;
+ }
+ }
+ } else {
+ if (!$added_item_v4[$current_host]) {
+ $host_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['fqdn']}\"\n";
+ $host_entries .= "local-data: \"{$host['fqdn']} IN A {$host['ipaddr']}\"\n";
+ $added_item_v4[$current_host] = true;
+ if ((!empty($host['name'])) && (!$added_item_v4[$host['name']])) {
+ $host_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['name']}\"\n";
+ $host_entries .= "local-data: \"{$host['name']} IN A {$host['ipaddr']}\"\n";
+ $added_item_v4[$host['name']] = true;
+ }
}
}
}
$unbound_entries .= $host_entries;
}
- // Need to handle DHCPv6 entries and leases too...
-
return $unbound_entries;
}