webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next

Browse Source
This commit is contained in:
Michael Tremer
2015-10-21 13:50:07 +01:00
parent 4e8949e817 5fd7e84c49
commit 364452506f
14 changed files with 208 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/language_issues.de
View File

@@ -82,6 +82,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute

1
doc/language_issues.en
View File

@@ -100,6 +100,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute

7
doc/language_issues.es
View File

@@ -95,6 +95,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
@@ -668,6 +669,11 @@ WARNING: untranslated string: dh key move failed
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
WARNING: untranslated string: dhcp dns enable update
WARNING: untranslated string: dhcp dns key name
WARNING: untranslated string: dhcp dns update
WARNING: untranslated string: dhcp dns update algo
WARNING: untranslated string: dhcp dns update secret
WARNING: untranslated string: dnat address
WARNING: untranslated string: dns servers
WARNING: untranslated string: dnsforward
@@ -989,6 +995,7 @@ WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

7
doc/language_issues.fr
View File

@@ -95,6 +95,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
@@ -675,6 +676,11 @@ WARNING: untranslated string: dh key move failed
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
WARNING: untranslated string: dhcp dns enable update
WARNING: untranslated string: dhcp dns key name
WARNING: untranslated string: dhcp dns update
WARNING: untranslated string: dhcp dns update algo
WARNING: untranslated string: dhcp dns update secret
WARNING: untranslated string: dnat address
WARNING: untranslated string: dns address deleted txt
WARNING: untranslated string: dns servers
@@ -1000,6 +1006,7 @@ WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

7
doc/language_issues.it
View File

@@ -99,6 +99,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute
@@ -674,6 +675,11 @@ WARNING: untranslated string: advproxy group access control
WARNING: untranslated string: advproxy group required
WARNING: untranslated string: bytes
WARNING: untranslated string: check all
WARNING: untranslated string: dhcp dns enable update
WARNING: untranslated string: dhcp dns key name
WARNING: untranslated string: dhcp dns update
WARNING: untranslated string: dhcp dns update algo
WARNING: untranslated string: dhcp dns update secret
WARNING: untranslated string: email config
WARNING: untranslated string: email empty field
WARNING: untranslated string: email invalid
@@ -729,6 +735,7 @@ WARNING: untranslated string: ovpn add conf
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

7
doc/language_issues.nl
View File

@@ -99,6 +99,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute
@@ -679,6 +680,11 @@ WARNING: untranslated string: dh key move failed
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
WARNING: untranslated string: dhcp dns enable update
WARNING: untranslated string: dhcp dns key name
WARNING: untranslated string: dhcp dns update
WARNING: untranslated string: dhcp dns update algo
WARNING: untranslated string: dhcp dns update secret
WARNING: untranslated string: dns servers
WARNING: untranslated string: dnssec aware
WARNING: untranslated string: dnssec information
@@ -771,6 +777,7 @@ WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

7
doc/language_issues.pl
View File

@@ -95,6 +95,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
@@ -668,6 +669,11 @@ WARNING: untranslated string: dh key move failed
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
WARNING: untranslated string: dhcp dns enable update
WARNING: untranslated string: dhcp dns key name
WARNING: untranslated string: dhcp dns update
WARNING: untranslated string: dhcp dns update algo
WARNING: untranslated string: dhcp dns update secret
WARNING: untranslated string: dnat address
WARNING: untranslated string: dns servers
WARNING: untranslated string: dnsforward
@@ -989,6 +995,7 @@ WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

7
doc/language_issues.ru
View File

@@ -95,6 +95,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
@@ -669,6 +670,11 @@ WARNING: untranslated string: dh key move failed
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
WARNING: untranslated string: dhcp dns enable update
WARNING: untranslated string: dhcp dns key name
WARNING: untranslated string: dhcp dns update
WARNING: untranslated string: dhcp dns update algo
WARNING: untranslated string: dhcp dns update secret
WARNING: untranslated string: disk access per
WARNING: untranslated string: dnat address
WARNING: untranslated string: dns servers
@@ -983,6 +989,7 @@ WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: red1
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

7
doc/language_issues.tr
View File

@@ -99,6 +99,7 @@ WARNING: translation string unused: cache management
WARNING: translation string unused: cache size
WARNING: translation string unused: calamaris report interval (in minutes)
WARNING: translation string unused: calc traffic all x minutes
WARNING: translation string unused: cannot enable both nat traversal and compression
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute
@@ -666,6 +667,11 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
WARNING: untranslated string: check all
WARNING: untranslated string: dhcp dns enable update
WARNING: untranslated string: dhcp dns key name
WARNING: untranslated string: dhcp dns update
WARNING: untranslated string: dhcp dns update algo
WARNING: untranslated string: dhcp dns update secret
WARNING: untranslated string: email config
WARNING: untranslated string: email empty field
WARNING: untranslated string: email invalid
@@ -708,6 +714,7 @@ WARNING: untranslated string: ovpn add conf
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: required field
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

24
doc/language_missings
View File

@@ -85,6 +85,11 @@
< deprecated fs warn
< details
< dh
< dhcp dns enable update
< dhcp dns key name
< dhcp dns update
< dhcp dns update algo
< dhcp dns update secret
< dh key move failed
< dh key warn
< dh key warn1
@@ -468,6 +473,7 @@
< qos enter bandwidths
< random number generator daemon
< red1
< required field
< samba join a domain
< samba join domain
< search
@@ -689,6 +695,11 @@
< deprecated fs warn
< details
< dh
< dhcp dns enable update
< dhcp dns key name
< dhcp dns update
< dhcp dns update algo
< dhcp dns update secret
< dh key move failed
< dh key warn
< dh key warn1
@@ -1077,6 +1088,7 @@
< qos enter bandwidths
< random number generator daemon
< red1
< required field
< samba join a domain
< samba join domain
< search
@@ -1274,6 +1286,11 @@
< deprecated fs warn
< details
< dh
< dhcp dns enable update
< dhcp dns key name
< dhcp dns update
< dhcp dns update algo
< dhcp dns update secret
< dh key move failed
< dh key warn
< dh key warn1
@@ -1650,6 +1667,7 @@
< qos enter bandwidths
< random number generator daemon
< red1
< required field
< samba join a domain
< samba join domain
< search
@@ -1847,6 +1865,11 @@
< deprecated fs warn
< details
< dh
< dhcp dns enable update
< dhcp dns key name
< dhcp dns update
< dhcp dns update algo
< dhcp dns update secret
< dh key move failed
< dh key warn
< dh key warn1
@@ -2226,6 +2249,7 @@
< qos enter bandwidths
< random number generator daemon
< red1
< required field
< samba join a domain
< samba join domain
< search

106
html/cgi-bin/dhcp.cgi
View File

@@ -70,11 +70,17 @@ foreach my $itf (@ITFs) {
$dhcpsettings{"NTP2_${itf}"} = '';
$dhcpsettings{"NEXT_${itf}"} = '';
$dhcpsettings{"FILE_${itf}"} = '';
$dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"} = '';
$dhcpsettings{"DNS_UPDATE_KEY_SECRET_${itf}"} = '';
$dhcpsettings{"DNS_UPDATE_KEY_ALGO_${itf}"} = '';
}
$dhcpsettings{'SORT_FLEASELIST'} = 'FIPADDR';
$dhcpsettings{'SORT_LEASELIST'} = 'IPADDR';
# DNS Update settings
$dhcpsettings{'DNS_UPDATE_ENABLED'} = 'off';
#Settings2 for editing the multi-line list
#Must not be saved with writehash !
$dhcpsettings{'FIX_MAC'} = '';
@@ -596,6 +602,78 @@ print <<END
<td width='40%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
END
;
&Header::closebox();
# DHCP DNS update support (RFC2136)
&Header::openbox('100%', 'left', $Lang::tr{'dhcp dns update'});
my %checked = ();
$checked{'DNS_UPDATE_ENABLED'}{'on'} = ( $dhcpsettings{'DNS_UPDATE_ENABLED'} ne 'on') ? '' : "checked='checked'";
print <<END
<table width='100%'>
<tr>
<td width='25%' class='boldbase'>$Lang::tr{'dhcp dns enable update'}</td>
<td class='base'><input type='checkbox' name='DNS_UPDATE_ENABLED' $checked{'DNS_UPDATE_ENABLED'}{'on'}>
</td>
<tr>
</table>
<table width='100%'>
END
;
my @domains = ();
# Print options for each interface.
foreach my $itf (@ITFs) {
# Check if DHCP for this interface is enabled.
if ($dhcpsettings{"ENABLE_${itf}"} eq 'on') {
# Check for same domain name.
next if ($dhcpsettings{"DOMAIN_NAME_${itf}"} ~~ @domains);
my $lc_itf = lc($itf);
# Select previously configured update algorithm.
my %selected = ();
$selected{'DNS_UPDATE_ALGO_${inf}'}{$dhcpsettings{'DNS_UPDATE_ALGO_${inf}'}} = 'selected';
print <<END
<tr>
<td colspan='6'>&nbsp;</td>
</tr>
<tr>
<td colspan='6' class='boldbase'><b>$dhcpsettings{"DOMAIN_NAME_${itf}"}</b></td>
</tr>
<tr>
<td width='10%' class='boldbase'>$Lang::tr{'dhcp dns key name'}:</td>
<td width='20%'><input type='text' name='DNS_UPDATE_KEY_NAME_${itf}' value='$dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"}'></td>
<td width='10%' class='boldbase' align='right'>$Lang::tr{'dhcp dns update secret'}:&nbsp;&nbsp;</td>
<td width='20%'><input type='password' name='DNS_UPDATE_KEY_SECRET_${itf}' value='$dhcpsettings{"DNS_UPDATE_KEY_SECRET_${itf}"}'></td>
<td width='10%' class='boldbase' align='right'>$Lang::tr{'dhcp dns update algo'}:&nbsp;&nbsp;</td>
<td width='20%'>
<select name='DNS_UPDATE_KEY_ALGO_${itf}'>
<option value='hmac-sha1' $selected{'DNS_UPDATE_KEY_ALGO_${itf}'}{'hmac-sha1'}>HMAC-SHA1</option>
<option value='hmac-md5' $selected{'DNS_UPDATE_KEY_ALGO_${itf}'}{'hmac-md5'}>HMAC-MD5</option>
</select>
</td>
</tr>
END
;
}
# Store configured domain based on the interface
# in the temporary variable.
push(@domains, $dhcpsettings{"DOMAIN_NAME_${itf}"});
}
print <<END
</table>
<hr>
<table width='100%'>
<tr>
<td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
</form>
END
;
@@ -1131,9 +1209,19 @@ sub buildconf {
flock(FILE, 2);
# Global settings
print FILE "ddns-update-style none;\n";
print FILE "deny bootp; #default\n";
print FILE "authoritative;\n";
# DNS Update settings
if ($dhcpsettings{'DNS_UPDATE_ENABLED'} eq 'on') {
print FILE "ddns-updates on;\n";
print FILE "ddns-update-style interim;\n";
print FILE "ddns-ttl 60; # 1 min\n";
print FILE "ignore client-updates;\n";
print FILE "update-static-leases on;\n";
} else {
print FILE "ddns-update-style none;\n";
}
# Write first new option definition
foreach my $line (@current1) {
@@ -1162,12 +1250,13 @@ sub buildconf {
}
}# on
}# foreach line
print FILE "\n";
#Subnet range definition
foreach my $itf (@ITFs) {
my $lc_itf=lc($itf);
if ($dhcpsettings{"ENABLE_${itf}"} eq 'on' ){
print FILE "\nsubnet " . $netsettings{"${itf}_NETADDRESS"} . " netmask ". $netsettings{"${itf}_NETMASK"} . " #$itf\n";
print FILE "subnet " . $netsettings{"${itf}_NETADDRESS"} . " netmask ". $netsettings{"${itf}_NETMASK"} . " #$itf\n";
print FILE "{\n";
print FILE "\trange " . $dhcpsettings{"START_ADDR_${itf}"} . ' ' . $dhcpsettings{"END_ADDR_${itf}"}.";\n" if ($dhcpsettings{"START_ADDR_${itf}"});
print FILE "\toption subnet-mask " . $netsettings{"${itf}_NETMASK"} . ";\n";
@@ -1204,7 +1293,18 @@ sub buildconf {
}
}# on
}# foreach line
print FILE "} #$itf\n";
print FILE "} #$itf\n\n";
if (($dhcpsettings{"DNS_UPDATE_ENABLED"} eq "on") && ($dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"} ne "")) {
print FILE "key " . $dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"} . " {\n";
print FILE "\talgorithm " . $dhcpsettings{"DNS_UPDATE_KEY_ALGO_${itf}"} . ";\n";
print FILE "\tsecret \"" . $dhcpsettings{"DNS_UPDATE_KEY_SECRET_${itf}"} . "\";\n";
print FILE "};\n\n";
print FILE "zone " . $dhcpsettings{"DOMAIN_NAME_${itf}"} . ". {\n";
print FILE "\tkey " . $dhcpsettings{"DNS_UPDATE_KEY_NAME_${itf}"} . ";\n";
print FILE "}\n\n";
}
system ('/usr/bin/touch', "${General::swroot}/dhcp/enable_${lc_itf}");
&General::log("DHCP on ${itf}: " . $Lang::tr{'dhcp server enabled'})

5
langs/de/cgi-bin/de.pl
View File

@@ -699,6 +699,11 @@
'dhcp bootp pxe data' => 'Geben Sie optionale BOOTP PXE-Daten für diese feste Zuordnung ein',
'dhcp configuration' => 'DHCP-Konfiguration',
'dhcp create fixed leases' => 'Feste Zuordnungen erzeugen',
'dhcp dns enable update' => 'DNS-Update (RFC2136) aktivieren:',
'dhcp dns key name' => 'Schlüsselname:',
'dhcp dns update' => 'DNS-Update',
'dhcp dns update algo' => 'Algorithmus:',
'dhcp dns update secret' => 'Schlüssel:',
'dhcp fixed lease err1' => 'Für eine feste Zuordnung müssen entweder die Hardware Adresse (MAC-Adresse) oder der Hostname oder beide eingetragen werden.',
'dhcp fixed lease help1' => 'IP Adressen können als FQDN angegeben werden.',
'dhcp mode' => 'DHCP',

5
langs/en/cgi-bin/en.pl
View File

@@ -722,6 +722,11 @@
'dhcp bootp pxe data' => 'Enter optional bootp pxe data for this fixed lease',
'dhcp configuration' => 'DHCP configuration',
'dhcp create fixed leases' => 'Create fixed leases',
'dhcp dns enable update' => 'Enable DNS Update (RFC2136):',
'dhcp dns key name' => 'Key Name:',
'dhcp dns update' => 'DNS Update',
'dhcp dns update algo' => 'Algorithm:',
'dhcp dns update secret' => 'Secret:',
'dhcp fixed lease err1' => 'For a fix lease you have to enter the MAC address or the hostname, or you enter both.',
'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN',
'dhcp mode' => 'DHCP',

22
src/initscripts/init.d/dnsmasq
View File

@@ -55,6 +55,21 @@ function dns_forward_args() {
echo "${cmdline}"
}
function dns_leases_args() {
eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings)
# If the DHCP server is enabled and DNS Update (RFC2136) is
# enabled, too, we won't overlay the internal domain with
# the dynamic/static leases.
if ([ "${ENABLE_GREEN}" = "on" ] || [ "${ENABLE_BLUE}" = "on" ]) \
&& [ "${DNS_UPDATE_ENABLED}" = "on" ]; then
return
fi
echo "-l /var/state/dhcp/dhcpd.leases"
}
case "${1}" in
start)
# kill already running copy of dnsmasq...
@@ -65,7 +80,10 @@ case "${1}" in
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
ARGS="$CUSTOM_ARGS"
[ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN"
# DHCP configuration
ARGS="${ARGS} $(dns_leases_args)"
echo > /var/ipfire/red/resolv.conf # Clear it
if [ -e "/var/ipfire/red/dns1" ]; then
DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null)
@@ -95,7 +113,7 @@ case "${1}" in
ARGS="${ARGS} --cache-size=${CACHE_SIZE}"
fi
loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
loadproc /usr/sbin/dnsmasq ${ARGS}
if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then
boot_mesg "Using DNS server(s): ${DNS1} ${DNS2}"