qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:01:52 +02:00
Code

add support for -t 0 (infinite retry) in busybox udhcpc and use it in the network scripts

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5493 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-11-09 23:41:50 +00:00
parent 98a5f85b8c
commit a2e6a5c099
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/default/lib/network/config.sh
View File

@ -143,7 +143,7 @@ setup_interface() {
# don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
[ "$proto1" != "$proto" ] && dhcpopts="-n -q"
$DEBUG udhcpc -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
$DEBUG udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
lock -u "/var/lock/dhcp-$iface"
;;
*)

21
package/busybox/patches/240-udhcpc_retries.patch Normal file
View File

@ -0,0 +1,21 @@
diff -ur busybox.old/networking/udhcp/dhcpc.c busybox.dev/networking/udhcp/dhcpc.c
--- busybox.old/networking/udhcp/dhcpc.c 2006-11-10 00:17:26.000000000 +0100
+++ busybox.dev/networking/udhcp/dhcpc.c 2006-11-10 00:17:10.000000000 +0100
@@ -330,7 +330,7 @@
/* timeout dropped to zero */
switch (state) {
case INIT_SELECTING:
- if (packet_num < client_config.retries) {
+ if (!client_config.retries || (packet_num < client_config.retries)) {
if (packet_num == 0)
xid = random_xid();
@@ -355,7 +355,7 @@
break;
case RENEW_REQUESTED:
case REQUESTING:
- if (packet_num < client_config.retries) {
+ if (!client_config.retries || (packet_num < client_config.retries)) {
/* send request packet */
if (state == RENEW_REQUESTED)
send_renew(xid, server_addr, requested_ip); /* unicast */