webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix webif dhcp display.

Browse Source 
Fix dhcpd.exe if no lease get.
This commit is contained in:
Arne Fitzenreiter
2009-12-23 10:13:57 +01:00
parent 8d48e8ea48
commit 21d1c72efc
2 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
html/cgi-bin/netexternal.cgi
View File

@@ -83,13 +83,13 @@ if ( $querry[0] ne~ ""){
&General::readhash("${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info", \%dhcpinfo); &General::readhash("${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info", \%dhcpinfo);
my $DNS1=`echo $dhcpinfo{'DNS'} | cut -f 1 -d ,`; my $DNS1=`echo $dhcpinfo{'domain_name_servers'} | cut -f 1 -d ,`;
my $DNS2=`echo $dhcpinfo{'DNS'} | cut -f 2 -d ,`; my $DNS2=`echo $dhcpinfo{'domain_name_servers'} | cut -f 2 -d ,`;
my $lsetme=0; my $lsetme=0;
my $leasetime=""; my $leasetime="";
if ($dhcpinfo{'LEASETIME'} ne "") { if ($dhcpinfo{'dhcp_lease_time'} ne "") {
$lsetme=$dhcpinfo{'LEASETIME'}; $lsetme=$dhcpinfo{'dhcp_lease_time'};
$lsetme=($lsetme/60); $lsetme=($lsetme/60);
if ($lsetme > 59) { if ($lsetme > 59) {
@@ -106,8 +106,8 @@ if ( $querry[0] ne~ ""){
my $rentme=0; my $rentme=0;
my $rnwltime=""; my $rnwltime="";
if ($dhcpinfo{'RENEWALTIME'} ne "") { if ($dhcpinfo{'dhcp_renewal_time'} ne "") {
$rentme=$dhcpinfo{'RENEWALTIME'}; $rentme=$dhcpinfo{'dhcp_renewal_time'};
$rentme=($rentme/60); $rentme=($rentme/60);
if ($rentme > 59){ if ($rentme > 59){
@@ -124,8 +124,8 @@ if ( $querry[0] ne~ ""){
my $maxtme=0; my $maxtme=0;
my $maxtime=""; my $maxtime="";
if ($dhcpinfo{'REBINDTIME'} ne "") { if ($dhcpinfo{'dhcp_rebinding_time'} ne "") {
$maxtme=$dhcpinfo{'REBINDTIME'}; $maxtme=$dhcpinfo{'dhcp_rebinding_time'};
$maxtme=($maxtme/60); $maxtme=($maxtme/60);
if ($maxtme > 59){ if ($maxtme > 59){
@@ -139,19 +139,14 @@ if ( $querry[0] ne~ ""){
} }
} }
print "<table width='100%'>";
if ($dhcpinfo{'HOSTNAME'}) {
print "<tr><td width='30%'>$Lang::tr{'hostname'}</td><td>$dhcpinfo{'HOSTNAME'}.$dhcpinfo{'DOMAIN'}</td></tr>\n";
} else {
print "<tr><td width='30%'>$Lang::tr{'domain'}</td><td>$dhcpinfo{'DOMAIN'}</td></tr>\n";
}
print <<END print <<END
<tr><td>$Lang::tr{'gateway'}</td><td>$dhcpinfo{'GATEWAY'}</td></tr> <table width='100%'>
<tr><td width='30%'>$Lang::tr{'domain'}</td><td>$dhcpinfo{'domain_name'}</td></tr>
<tr><td>$Lang::tr{'gateway'}</td><td>$dhcpinfo{'routers'}</td></tr>
<tr><td>$Lang::tr{'primary dns'}</td><td>$DNS1</td></tr> <tr><td>$Lang::tr{'primary dns'}</td><td>$DNS1</td></tr>
<tr><td>$Lang::tr{'secondary dns'}</td><td>$DNS2</td></tr> <tr><td>$Lang::tr{'secondary dns'}</td><td>$DNS2</td></tr>
<tr><td>$Lang::tr{'dhcp server'}</td><td>$dhcpinfo{'DHCPSIADDR'}</td></tr> <tr><td>$Lang::tr{'dhcp server'}</td><td>$dhcpinfo{'dhcp_server_identifier'}</td></tr>
<tr><td>$Lang::tr{'def lease time'}</td><td>$leasetime</td></tr> <tr><td>$Lang::tr{'def lease time'}</td><td>$leasetime</td></tr>
<tr><td>$Lang::tr{'default renewal time'}</td><td>$rnwltime</td></tr> <tr><td>$Lang::tr{'default renewal time'}</td><td>$rnwltime</td></tr>
<tr><td>$Lang::tr{'max renewal time'}</td><td>$maxtime</td></tr> <tr><td>$Lang::tr{'max renewal time'}</td><td>$maxtime</td></tr>

19
src/initscripts/init.d/networking/dhcpcd.exe
View File

@@ -16,7 +16,7 @@
eval $(/usr/local/bin/readhash /var/ipfire/dns/settings) eval $(/usr/local/bin/readhash /var/ipfire/dns/settings)
create_dhcpcd_info() dhcpcd_up()
{ {
set | grep "^new_" | sed "s|^new_||g" | \ set | grep "^new_" | sed "s|^new_||g" | \
sort > /var/ipfire/dhcpc/dhcpcd-$interface.info sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
@@ -64,15 +64,18 @@ create_dhcpcd_info()
fi fi
} }
remove_dhcpcd_info() dhcpcd_down()
{ {
rm -f /var/ipfire/dhcpc/dhcpcd-$interface.info set | grep "^new_" | sed "s|^new_||g" | \
logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down" sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
rm -f /var/ipfire/red/active if [ "$interface" != "red0.8" ]; then
run_subdir ${rc_base}/init.d/networking/red.down/ logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down"
rm -f /var/ipfire/red/active
run_subdir ${rc_base}/init.d/networking/red.down/
fi
} }
case "$reason" in case "$reason" in
BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC) create_dhcpcd_info;; BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC) dhcpcd_up;;
PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP) remove_dhcpcd_info;; PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP) dhcpcd_down;;
esac esac