qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

make dnsmasq probe for dhcp servers before starting a dhcp server

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1110 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm
2005-05-30 09:09:58 +00:00
parent 64caeb211d
commit 19a1490f40
4 changed files with 144 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
target/default/target_skeleton/etc/functions.sh
View File

@@ -12,7 +12,7 @@ nvram () {
. /etc/nvram.overrides
# valid interface?
if_valid () {
if_valid () (
ifconfig "$1" >&- 2>&- ||
[ "${1%%[0-9]}" = "br" ] ||
{
@@ -29,5 +29,29 @@ if_valid () {
$DEBUG vconfig add $vif $i 2>&-
)
} ||
{ debug "# missing interface '$if' ignored"; false; }
{ debug "# missing interface '$1' ignored"; false; }
)
bitcount () {
local c=$1
echo $((
c=((c>> 1)&0x55555555)+(c&0x55555555),
c=((c>> 2)&0x33333333)+(c&0x33333333),
c=((c>> 4)&0x0f0f0f0f)+(c&0x0f0f0f0f),
c=((c>> 8)&0x00ff00ff)+(c&0x00ff00ff),
c=((c>>16)&0x0000ffff)+(c&0x0000ffff)
))
}
valid_netmask () {
return $((-($1)&~$1))
}
ip2int () (
set $(echo $1 | tr '\.' ' ')
echo $(($1<<24|$2<<16|$3<<8|$4))
)
int2ip () {
echo $(($1>>24&255)).$(($1>>16&255)).$(($1>>8&255)).$(($1&255))
}

25
target/default/target_skeleton/etc/init.d/S50dnsmasq
View File

@@ -1,2 +1,25 @@
#!/bin/sh
/usr/sbin/dnsmasq
. /etc/functions.sh
# interface to use for DHCP
iface=lan
ifname=$(nvram get ${iface}_ifname)
ipaddr=$(nvram get ${iface}_ipaddr)
netmask=$(nvram get ${iface}_netmask)
# check for existing DHCP server
udhcpc -n -q -R -s /dev/zero -i $ifname >&- || {
ipaddr=$(ip2int $ipaddr)
netmask=$(ip2int ${netmask:-255.255.255.0})
network=$((ipaddr&netmask))
start=$(nvram get dhcp_start)
start=$((network+${start:-100}))
end=$(nvram get dhcp_num)
end=$((start+${end:-150}))
args="-K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h"
}
/usr/sbin/dnsmasq ${args}

8
target/default/target_skeleton/sbin/ifup
View File

@@ -10,6 +10,7 @@
if_valid $if || return
mac=$(nvram get ${type}_hwaddr)
$DEBUG ifconfig $if down 2>&-
if [ "${if%%[0-9]}" = "br" ]; then
stp=$(nvram get ${type}_stp)
@@ -19,13 +20,14 @@
$DEBUG brctl stp $if ${stp:-0}
for sif in $(nvram get ${type}_ifnames); do {
if_valid $sif || continue
${mac:+$DEBUG ifconfig $sif down hw ether $mac}
$DEBUG ifconfig $sif 0.0.0.0 up
$DEBUG brctl addif $if $sif
} done
else
${mac:+$DEBUG ifconfig $if down hw ether $mac}
fi
mac=$(nvram get ${type}_hwaddr)
${mac:+$DEBUG ifconfig $if hw ether $mac}
if_proto=$(nvram get ${type}_proto)
case "$if_proto" in
@@ -50,7 +52,7 @@
if [ -f $pidfile ]; then
$DEBUG kill $(cat $pidfile)
fi
${DEBUG:-eval} "udhcpc -i $if ${ip:+-r $ip} -b -p $pidfile &"
${DEBUG:-eval} "udhcpc -R -i $if ${ip:+-r $ip} -b -p $pidfile &"
;;
none|"")
# pppoe is handled by /etc/init.d/S50pppoe