emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ifupdown: fixes for shutdown of DHCP-managed interfaces

Browse Source 
from Wade Berrier <wberrier AT gmail.com>
This commit is contained in:
Denis Vlasenko 2008-08-19 23:02:23 +00:00
parent 625ed8e027
commit 6c4eb44113
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
networking/ifupdown.c
View File

@ -456,7 +456,10 @@ static int static_down(struct interface_defn_t *ifd, execfn *exec)
result = execute("ip addr flush dev %iface%", ifd, exec); result = execute("ip addr flush dev %iface%", ifd, exec);
result += execute("ip link set %iface% down", ifd, exec); result += execute("ip link set %iface% down", ifd, exec);
#else #else
result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec); /* result = execute("[[route del default gw %gateway% %iface%]]", ifd, exec); */
/* Bringing the interface down deletes the routes in itself.
Otherwise this fails if we reference 'gateway' when using this from dhcp_down */
result = 1;
result += execute("ifconfig %iface% down", ifd, exec); result += execute("ifconfig %iface% down", ifd, exec);
#endif #endif
return ((result == 2) ? 2 : 0); return ((result == 2) ? 2 : 0);
@ -538,19 +541,40 @@ static int dhcp_up(struct interface_defn_t *ifd UNUSED_PARAM,
#if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP #if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP
static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
{ {
int result = 0;
unsigned i; unsigned i;
for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) { for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) {
if (exists_execable(ext_dhcp_clients[i].name)) if (exists_execable(ext_dhcp_clients[i].name)) {
return execute(ext_dhcp_clients[i].stopcmd, ifd, exec); result += execute(ext_dhcp_clients[i].stopcmd, ifd, exec);
if (result)
break;
}
} }
bb_error_msg("no dhcp clients found, using static interface shutdown");
return static_down(ifd, exec); if (!result)
bb_error_msg("warning: no dhcp clients found and stopped");
/* Sleep a bit, otherwise static_down tries to bring down interface too soon,
and it may come back up because udhcpc is still shutting down */
usleep(100000);
result += static_down(ifd, exec);
return ((result == 3) ? 3 : 0);
} }
#elif ENABLE_APP_UDHCPC #elif ENABLE_APP_UDHCPC
static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
{ {
return execute("kill " int result;
result = execute("kill "
"`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
/* Also bring the hardware interface down since
killing the dhcp client alone doesn't do it.
This enables consecutive ifup->ifdown->ifup */
/* Sleep a bit, otherwise static_down tries to bring down interface too soon,
and it may come back up because udhcpc is still shutting down */
usleep(100000);
result += static_down(ifd, exec);
return ((result == 3) ? 3 : 0);
} }
#else #else
static int dhcp_down(struct interface_defn_t *ifd UNUSED_PARAM, static int dhcp_down(struct interface_defn_t *ifd UNUSED_PARAM,