Added

1) Binding of tinyDNS to LAN with auto registration of DNS ans rDNS
2) Auto DHCP server Static registration
3) Auto DHCP server Active lease registration.
4)Tab page that displays ALL registered leases.

Open items
1)Unable to change the displayed IP in settings even when it says "config_rw"?
2) DNS pages have to be active in order for the DNS to be updated with new DHCP leases.

What do you suggest is the best way to implement DNS forarding?

The diff files and a new file tinydns_dhcp_filter.php

6 files changed, 277 insertions, 46 deletions

diff --git a/packages/tinydns/tinydns.inc b/packages/tinydns/tinydns.inc
index 4cae65d4..6636f411 100644
--- a/packages/tinydns/tinydns.inc
+++ b/packages/tinydns/tinydns.inc
@@ -4,6 +4,7 @@
 /*
 	tinydns.inc
 	Copyright (C) 2006 Scott Ullrich
+	Parts Copyright (C) 2007 Goffredo Andreone
 	part of pfSense
 	All rights reserved.
 
@@ -40,6 +41,9 @@ function tinydns_custom_php_install_command() {
 		return;
 	}
 
+	if($config['installedpackages']['tinydns']['config'][0]['bind2lan'])
+		$ip = $config['interfaces']['lan']['ipaddr'];
+	else
 	$ip = $config['installedpackages']['tinydns']['config'][0]['ipaddress'];
 
 	$minsegment = "10240";
@@ -132,6 +136,12 @@ function tinydns_custom_php_deinstall_command() {
 function tinydns_custom_php_changeip_command() {
 	global $g, $config;
 	conf_mount_rw();
+	if($config['installedpackages']['tinydns']['config'][0]['bind2lan'])
+		{
+		$ip = $config['interfaces']['lan']['ipaddr'];
+/* Does not work??		$config['installedpackages']['tinydns']['config'][0]['ipaddress'] = $ip; */
+		}
+	else
 	$ip = $config['installedpackages']['tinydns']['config'][0]['ipaddress'];
 	$updatecron = $config['installedpackages']['tinydns']['config'][0]['updatecron'];
 	/* setup daemon tools service area */
@@ -267,6 +277,43 @@ function tinydns_create_zone_file() {
 		log_error("Could not open /service/tinydns/root/data for writing.");
 		return;
 	}
+	
+	/* Bind TinyDNS to LAN IP and register SOA for Forward and Reverse DNS */
+	if($config['installedpackages']['tinydns']['config'][0]['bind2lan']) {
+		if($config['system']['hostname']['domain']) {
+			$dhcpdhostname = $config['system']['hostname'];		
+			if($config['dhcpd']['lan'])$dhcpddomain = $config['system']['domain'];
+			$dhcpdlanip = $config['interfaces']['lan']['ipaddr'];		
+			$dhcpdipmask = $config['interfaces']['lan']['subnet'];		
+			$dhcpdfqdn = "{$dhcpdhostname}.{$dhcpddomain}";
+			tinydns_complete_soa_record($fd, $dhcpdlanip, $dhcpdipmask, $dhcpdhostname, $dhcpddomain);
+		}
+	}
+
+	/* Register Static IPs */
+	if($config['installedpackages']['tinydns']['config'][0]['regdhcpstatic']) {
+		if(is_array($config['dhcpd']['lan']['staticmap'])) {
+			foreach($config['dhcpd']['lan']['staticmap'] as $dhcpdstatic){
+				$dhcpdhostname = $dhcpdstatic['hostname'];
+				$dhcpdfqdn = "{$dhcpdhostname}.{$dhcpddomain}";
+				$dhcpdlanip = $dhcpdstatic['ipaddr'];
+				$dhcpda = "={$dhcpdfqdn}:{$dhcpdlanip}";
+				if($dhcpdhostname)fwrite($fd, $dhcpda . "\n");
+			}
+		}
+	}
+
+	/* Register Dynamic IPs */
+	if($config['installedpackages']['tinydns']['config'][0]['regdhcp']) {
+		$leasesfile = "{$g['dhcpd_chroot_path']}/var/db/dhcpd.leases";
+		$fl = fopen($leasesfile, "r");
+		if(!$fl) {
+			log_error("Could not open {$leasesfile} for reading.");
+			return;
+		}
+		tinydns_add_active_leases($fl,$fd, $dhcpddomain);
+	}
+	
 	if($config['installedpackages']['tinydnsdomains']) {
 		foreach($config['installedpackages']['tinydnsdomains']['config'] as $domain) {
 			$record_data = "";
@@ -321,46 +368,6 @@ function tinydns_create_zone_file() {
 	conf_mount_ro();
 }
 
-/* formats data as a tinydns data row item */
-/* A full description of the data format is available at 'man tinydns-data' */
-function tinydns_get_rowline_data($recordip, $recordtype, $ttl, $hostname,$rdns) {
-		if($ttl)
-			$ttl_string = ":{$ttl}";
-		else
-			$ttl_string = "";
-		switch ($recordtype) {
-			case "SOA":
-				$record_data = ".{$hostname}::{$recordip}{$ttl_string}";
-				break;
-			case "NS":
-				$record_data = "&{$hostname}:{$recordip}{$ttl_string}";
-				break;
-			case "MX":
-				$record_data = "@{$hostname}:{$recordip}::{$ttl_string}";
-				break;
-			case "PTR":
-				/* "^" creates "PTR" record only to allow reverse DNS */
-				$record_data = "^{$hostname}:{$recordip}{$ttl_string}";
-				break;
-			case "A":
-				/* "=" creates both "A" and "PTR" records to allow both forward and reverse DNS */
-				if($rdns)
-					$record_data = "={$hostname}:{$recordip}{$ttl_string}";
-				else
-					/* "+" creates "A" records only to allow forward DNS */
-					$record_data = "+{$hostname}:{$recordip}{$ttl_string}";
-				break;
-			case "CNAME":
-				$record_data = "C{$hostname}:{$recordip}{$ttl_string}";
-				break;
-			case "TXT":
-				/* "'" creates "TXT" record that can be used for SPF */
-				$record_data = "'{$hostname}:{$recordip}{$ttl_string}";
-				break;
-		}
-		return $record_data;
-}
-
 function tinydns_do_xmlrpc_sync($sync_to_ip, $password) {
 	global $config, $g;
 
@@ -423,5 +430,187 @@ function tinydns_do_xmlrpc_sync($sync_to_ip, $password) {
 	}
 	log_error("[tinydns] tinydns_xmlrpc_sync.php is ending.");
 }
+/* formats data as a tinydns data row item */
+/* A full description of the data format is available at 'man tinydns-data' */
+function tinydns_get_rowline_data($recordip, $recordtype, $ttl, $hostname, $rdns) {
+		if($ttl)
+			$ttl_string = ":{$ttl}";
+		else
+			$ttl_string = "";
+		switch ($recordtype) {
+			case "SOA":
+				$record_data = ".{$hostname}::{$recordip}{$ttl_string}";
+				break;
+			case "NS":
+				$record_data = "&{$hostname}:{$recordip}{$ttl_string}";
+				break;
+			case "MX":
+				$record_data = "@{$hostname}:{$recordip}::{$ttl_string}";
+				break;
+			case "PTR":
+				/* "^" creates "PTR" record only to allow reverse DNS */
+				$record_data = "^{$hostname}:{$recordip}{$ttl_string}";
+				break;
+			case "A":
+				/* "=" creates both "A" and "PTR" records to allow both forward and reverse DNS */
+				if($rdns)
+					$record_data = "={$hostname}:{$recordip}{$ttl_string}";
+				else
+				/* "+" creates "A" records only to allow forward DNS */
+					$record_data = "+{$hostname}:{$recordip}{$ttl_string}";					
+				break;
+			case "CNAME":
+				$record_data = "C{$hostname}:{$recordip}{$ttl_string}";
+				break;
+			case "TXT":
+				/* "'" creates "TXT" record that can be used for SPF */
+				$record_data = "'{$hostname}:{$recordip}{$ttl_string}";
+				break;
+		}
+		return $record_data;
+}
+/* Returns the last IP byte and the Trimmed IP*/
+function tinydns_get_lastip_byte($ipsub){
+	$len= strlen($ipsub); 	
+	$pos = strrpos($ipsub, ".");
+	$last_byte = "";
+	if ($pos === false){ $last_byte = $ipsub; return array ($last_byte,$ipsub); } 
+	$last_byte = substr($ipsub,$pos + 1);
+	$ipsub = substr($ipsub,0,$pos);
+	return array ($last_byte,$ipsub);
+}
+
+/* in-add.arpa IP calculated from D.C.B.A and Mask to A.B.C.D.in-addr.arpa */
+function tinydns_get_arpa_ip($ip, $ipmask){
+	$ipsub = $ip;	
+	$arpaip = "";	
+	$array = tinydns_get_lastip_byte($ipsub);
+	$a = $array[0];
+	$ipsub = $array[1];
+	$array = tinydns_get_lastip_byte($ipsub);
+	$b = $array[0];
+	$ipsub = $array[1];
+	$array = tinydns_get_lastip_byte($ipsub);
+	$c = $array[0];
+	$ipsub = $array[1];
+	$array = tinydns_get_lastip_byte($ipsub);
+	$d = $array[0];
+	$ipsub = $array[1];
+	switch ($ipmask){
+		case ($ipmask <= 32 AND $ipmask > 24):
+			$s = 32 - $ipmask;
+			$a >> $s;
+			$arpaip = "{$a}.{$b}.{$c}.{$d}.in-addr.arpa";
+			break;
+		case ($ipmask <= 24 AND $ipmask > 16):
+			$s = 24 - $ipmask;
+			$b >> $s;
+			$arpaip = "{$b}.{$c}.{$d}.in-addr.arpa";
+			break;
+		case ($ipmask <= 16 AND $ipmask > 8):
+			$s = 16 - $ipmask;
+			$c >> $s;
+			$arpaip = "{$c}.{$d}.in-addr.arpa";
+			break;
+		case ($ipmask <= 8 AND $ipmask > 0):
+			$s = 8 - $ipmask;
+			$d >> $s;
+			$arpaip = "{$d}.in-addr.arpa";
+			break;
+		}
+	return 	$arpaip;
+}
+
+/* Create a Forward and a Reverse DNS (SOA, A, PTR) records for Fully Qualififed Domain Name*/
+function tinydns_complete_soa_record($fd, $ip, $ipmask, $nsname, $domain){
+	$fqdn = "{$nsname}.{$domain}";
+	$rip = tinydns_get_arpa_ip($ip, $ipmask);
+	$soa = ".{$domain}::{$fqdn}";
+	$rsoa = ".{$rip}::{$fqdn}";
+	$a = "={$fqdn}:{$ip}";
+	if($fqdn)fwrite($fd, $soa . "\n");
+	if($rip)fwrite($fd, $rsoa . "\n");
+	if($nsname)fwrite($fd, $a . "\n");
+}
 
+/* Search for active leases in the dhcpd.leases file and add them to tinyDNS */
+function tinydns_add_active_leases($fl,$fd, $leasedomain){
+	$i = 0;
+	$lip = strlen("lease") + 1;
+	$lis = strlen("binding state active");
+	$lic = strlen("client-hostname");
+	while (!feof($fl)) {
+		$leases = fgets($fl, 4096);
+		$discard = ($leases[0] == "#") OR ($leases[0] == "\n"); 
+		if(!$discard){
+			if($leaseip == ""){
+				if ($leaseip = strstr($leases,"lease")){
+					$leaseip = substr($leaseip,$lip,strpos($leases,"{") - $lip - 1);
+				}
+			}
+			elseif($leasestatus == FALSE){
+				if (stristr($leases,"binding state active")){
+					$leasestatus = TRUE;
+				}
+			}
+			elseif($leasestatus == TRUE AND $leasehostname == ""){
+				if($leasehostname = stristr($leases,"client-hostname")){
+					$qstrt = strpos($leasehostname,'"') + 1;
+					$qlen  = strrpos($leasehostname,'"') - $qstrt;
+					$leasehostname = substr($leasehostname,$qstrt,$qlen);
+				}
+			}
+			if($leases[0] == "}"){
+				$leasefqdn = "{$leasehostname}.{$leasedomain}";
+				$leasea = "={$leasefqdn}:{$leaseip}";
+				if($leasehostname AND $leasestatus)fwrite($fd, $leasea . "\n");
+				$leaseip = "";
+				$leasehostname = "";
+				$leasestatus = FALSE;
+			}
+			$i = $i + 1;
+		}
+	}
+	fclose($fl);
+	$leaselines = $i;
+}
+function tinydns_get_dns_record_type($tinydnsrecord){
+	$rtype = ""; $rtyte2 = ""; $rdns = "";
+	switch ($tinydnsrecord) {
+		case($tinydnsrecord[0] == "."):
+			$rtype = "SOA";
+			$rtype2 = "NS";
+			break;
+		case($tinydnsrecord[0] == "="):
+			$rtype = "A";
+			$rtype2 = "PTR";
+			$rdns = "on";
+			break;
+		case($tinydnsrecord[0] == "+"):
+			$rtype = "A";
+			break;
+		case($tinydnsrecord[0] == "@"):
+			$rtype = "MX";
+			break;
+		case($tinydnsrecord[0] == "^"):
+			$rtype = "PTR";
+			$rdns = "on";
+			break;
+		case($tinydnsrecord[0] == "&"):
+			$rtype = "NS";
+			break;
+		case($tinydnsrecord[0] == "'"):
+			$rtype = "TXT";
+			break;
+		case($tinydnsrecord[0] == "C"):
+			$rtype = "CNAME";
+			break;
+		case($tinydnsrecord[0] == "Z"):
+			$rtype = "SOA";
+			break;
+		default:
+			$rtype = "";
+	}
+	return array ($rtype, $rtype2, $rdns);
+}
 ?>
\ No newline at end of file
diff --git a/packages/tinydns/tinydns.xml b/packages/tinydns/tinydns.xml
index 18454b07..948b7637 100644
--- a/packages/tinydns/tinydns.xml
+++ b/packages/tinydns/tinydns.xml
@@ -17,7 +17,11 @@
 			<active/>
 		</tab>
 		<tab>
-			<text>Domains</text>
+			<text>Registered Domains</text>
+			<url>/tinydns_dhcp_filter.php</url>
+		</tab>
+		<tab>
+			<text>Add Domains</text>
 			<url>/tinydns_filter.php</url>
 		</tab>
 		<tab>
@@ -52,11 +56,21 @@
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
+	<item>http://www.pfsense.com/packages/config/tinydns/tinydns_dhcp_domains.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/</prefix>
+		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/tinydns/tinydns_status.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
+		<item>http://www.pfsense.com/packages/config/tinydns/tinydns_dhcp_filter.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/tinydns/tinydns_filter.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
@@ -99,9 +113,27 @@
 	<include_file>/usr/local/pkg/tinydns.inc</include_file>
 	<fields>
 		<field>
+		 	<fielddescr>Bind TinyDNS to LAN</fielddescr>
+			<fieldname>bind2lan</fieldname>
+			<description>Set this option to bind TinyDNS to the LAN IP and sets up the LAN with SOA, NS, A, and PTR Records.</description>
+			<type>checkbox</type>
+		</field>		
+		<field>
+		 	<fielddescr>Register DHCP static mappings with TinyDNS</fielddescr>
+			<fieldname>regdhcpstatic</fieldname>
+			<description>Register DHCP static IPs with TinyDNS using the Fully Qualified Domain Name specified in System: General.</description>
+			<type>checkbox</type>
+		</field>		
+		<field>
+		 	<fielddescr>Register DHCP leases with TinyDNS</fielddescr>
+			<fieldname>regdhcp</fieldname>
+			<description>Register a valid DHCP hostname with TinyDNS using the Fully Qualified Domain Name specified in System: General.</description>
+			<type>checkbox</type>
+		</field>		
+		<field>
 			<fieldname>ipaddress</fieldname>
 			<fielddescr>IP Address</fielddescr>
-			<description>The IP address that TinyDNS will bind to.</description>
+			<description>TinyDNS is bound to this IP address if Bind TinyDNS to LAN is not set.</description>
 			<type>input</type>
 		</field>
 		<field>
diff --git a/packages/tinydns/tinydns_domains.xml b/packages/tinydns/tinydns_domains.xml
index 972cfd90..66e9e812 100644
--- a/packages/tinydns/tinydns_domains.xml
+++ b/packages/tinydns/tinydns_domains.xml
@@ -10,7 +10,11 @@
 			<url>/pkg_edit.php?xml=tinydns.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Domains</text>
+			<text>Registered Domains</text>
+			<url>/tinydns_dhcp_filter.php</url>
+		</tab>
+		<tab>
+			<text>Add Domains</text>
 			<url>/tinydns_filter.php</url>
 			<active/>
 		</tab>
diff --git a/packages/tinydns/tinydns_status.php b/packages/tinydns/tinydns_status.php
index b82b5835..1bbca610 100644
--- a/packages/tinydns/tinydns_status.php
+++ b/packages/tinydns/tinydns_status.php
@@ -49,7 +49,8 @@ include("head.inc");
 <?php
 	$tab_array = array();
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=tinydns.xml&id=0");
-	$tab_array[] = array(gettext("Domains"), false, "/tinydns_filter.php");
+	$tab_array[] = array(gettext("Registered Domains"), false, "/tinydns_dhcp_filter.php");
+	$tab_array[] = array(gettext("Add Domains"), false, "/tinydns_filter.php");
 	$tab_array[] = array(gettext("Status"), true, "/tinydns_status.php");
 	$tab_array[] = array(gettext("Logs"), false, "/tinydns_view_logs.php");
 	$tab_array[] = array(gettext("Logs"), false, "/pkg_edit.php?xml=tinydns_sync.xml&id=0");
diff --git a/packages/tinydns/tinydns_sync.xml b/packages/tinydns/tinydns_sync.xml
index 37a06c68..ac353a9f 100644
--- a/packages/tinydns/tinydns_sync.xml
+++ b/packages/tinydns/tinydns_sync.xml
@@ -14,7 +14,11 @@
 			<url>/pkg_edit.php?xml=tinydns.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Domains</text>
+			<text>Registered Domains</text>
+			<url>/tinydns_dhcp_filter.php</url>
+		</tab>
+		<tab>
+			<text>Add Domains</text>
 			<url>/tinydns_filter.php</url>
 		</tab>
 		<tab>
diff --git a/packages/tinydns/tinydns_view_logs.php b/packages/tinydns/tinydns_view_logs.php
index 04bc44e3..dda0ac4e 100644
--- a/packages/tinydns/tinydns_view_logs.php
+++ b/packages/tinydns/tinydns_view_logs.php
@@ -51,7 +51,8 @@ $tinydnslogs = `cat /etc/tinydns/log/main/current | /usr/local/bin/tai64nlocal |
 <?php
 	$tab_array = array();
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=tinydns.xml&id=0");
-	$tab_array[] = array(gettext("Domains"), false, "/tinydns_filter.php");
+	$tab_array[] = array(gettext("Registered Domains"), false, "/tinydns_dhcp_filter.php");
+	$tab_array[] = array(gettext("Add Domains"), false, "/tinydns_filter.php");
 	$tab_array[] = array(gettext("Status"), false, "/tinydns_status.php");
 	$tab_array[] = array(gettext("Logs"), true, "/tinydns_view_logs.php");
 	$tab_array[] = array(gettext("Sync"), false, "/pkg_edit.php?xml=tinydns_sync.xml&id=0");