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

As noted by Eric Spakman, calling static_down() and then calling

Browse Source 
bootp_down() seems redundant, esp since bootp_down was a subset
of static_down, so just use that...
This commit is contained in:
Eric Andersen 2004-07-30 14:31:01 +00:00
parent 413db4d583
commit 373bc1eaee
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
networking/ifupdown.c
View File

@ -551,21 +551,12 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
return(0); return(0);
} }
static int bootp_down(struct interface_defn_t *ifd, execfn *exec)
{
#ifdef CONFIG_FEATURE_IFUPDOWN_IP
return(execute("ip link set %iface% down", ifd, exec));
#else
return(execute("ifconfig %iface% down", ifd, exec));
#endif
}
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; int result = 0;
if (execable("/sbin/udhcpc")) { if (execable("/sbin/udhcpc")) {
execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
execute("kill -9 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); result += execute("kill -9 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
} else if (execable("/sbin/pump")) { } else if (execable("/sbin/pump")) {
result = execute("pump -i %iface% -k", ifd, exec); result = execute("pump -i %iface% -k", ifd, exec);
} else if (execable("/sbin/dhclient")) { } else if (execable("/sbin/dhclient")) {
@ -573,8 +564,7 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
} else if (execable("/sbin/dhcpcd")) { } else if (execable("/sbin/dhcpcd")) {
result = execute("dhcpcd -k %iface%", ifd, exec); result = execute("dhcpcd -k %iface%", ifd, exec);
} }
static_down(ifd, exec); return (result || static_down(ifd, exec));
return (result || bootp_down(ifd, exec));
} }
static int bootp_up(struct interface_defn_t *ifd, execfn *exec) static int bootp_up(struct interface_defn_t *ifd, execfn *exec)
@ -611,7 +601,7 @@ static struct method_t methods[] =
{ "wvdial", wvdial_up, wvdial_down, }, { "wvdial", wvdial_up, wvdial_down, },
{ "ppp", ppp_up, ppp_down, }, { "ppp", ppp_up, ppp_down, },
{ "static", static_up, static_down, }, { "static", static_up, static_down, },
{ "bootp", bootp_up, bootp_down, }, { "bootp", bootp_up, static_down, },
{ "dhcp", dhcp_up, dhcp_down, }, { "dhcp", dhcp_up, dhcp_down, },
{ "loopback", loopback_up, loopback_down, }, { "loopback", loopback_up, loopback_down, },
}; };