* remove ridiculous amounts of bloat.
*/
-#include <getopt.h>
#include <net/route.h>
#include <net/if.h>
/* sanity checks.. */
if (mask_in_addr(rt)) {
- unsigned long mask = mask_in_addr(rt);
+ uint32_t mask = mask_in_addr(rt);
mask = ~ntohl(mask);
if ((rt.rt_flags & RTF_HOST) && mask != 0xffffffff) {
bb_error_msg_and_die("bogus netmask %s", netmask);
}
mask = ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr;
- if (mask & ~mask_in_addr(rt)) {
+ if (mask & ~(uint32_t)mask_in_addr(rt)) {
bb_error_msg_and_die("netmask and route address conflict");
}
}
if (devname) {
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name));
+ strncpy_IFNAMSIZ(ifr.ifr_name, devname);
xioctl(skfd, SIOGIFINDEX, &ifr);
rt.rtmsg_ifindex = ifr.ifr_ifindex;
}
}
/* also used in netstat */
-void bb_displayroutes(int noresolve, int netstatfmt)
+void FAST_FUNC bb_displayroutes(int noresolve, int netstatfmt)
{
char devname[64], flags[16], *sdest, *sgw;
unsigned long d, g, m;
struct sockaddr_in s_addr;
struct in_addr mask;
- FILE *fp = xfopen("/proc/net/route", "r");
+ FILE *fp = xfopen_for_read("/proc/net/route");
printf("Kernel IP routing table\n"
"Destination Gateway Genmask Flags %s Iface\n",
#if ENABLE_FEATURE_IPV6
-static void INET6_displayroutes(int noresolve)
+static void INET6_displayroutes(void)
{
char addr6[128], *naddr6;
/* In addr6x, we store both 40-byte ':'-delimited ipv6 addresses.
int iflags, metric, refcnt, use, prefix_len, slen;
struct sockaddr_in6 snaddr6;
- FILE *fp = xfopen("/proc/net/ipv6_route", "r");
+ FILE *fp = xfopen_for_read("/proc/net/ipv6_route");
printf("Kernel IPv6 routing table\n%-44s%-40s"
"Flags Metric Ref Use Iface\n",
while (1) {
int r;
r = fscanf(fp, "%32s%x%*s%x%32s%x%x%x%x%s\n",
- addr6x+14, &prefix_len, &slen, addr6x+40+7,
- &metric, &use, &refcnt, &iflags, iface);
+ addr6x+14, &prefix_len, &slen, addr6x+40+7,
+ &metric, &use, &refcnt, &iflags, iface);
if (r != 9) {
if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
break;
;
int route_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int route_main(int argc, char **argv)
+int route_main(int argc UNUSED_PARAM, char **argv)
{
unsigned opt;
int what;
int noresolve = (opt & ROUTE_OPT_n) ? 0x0fff : 0;
#if ENABLE_FEATURE_IPV6
if (opt & ROUTE_OPT_INET6)
- INET6_displayroutes(noresolve);
+ INET6_displayroutes();
else
#endif
bb_displayroutes(noresolve, opt & ROUTE_OPT_e);