aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
Diffstat (limited to 'networking')
-rw-r--r--networking/ifplugd.c6
-rw-r--r--networking/route.c71
2 files changed, 41 insertions, 36 deletions
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 3b59a63ff..8dd0a5bd8 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -133,7 +133,8 @@ static smallint detect_link_mii(void)
{
/* char buffer instead of bona-fide struct avoids aliasing warning */
char buf[sizeof(struct ifreq)];
- struct ifreq *ifreq = (void *)buf;
+ struct ifreq *const ifreq = (void *)buf;
+
struct mii_ioctl_data *mii = (void *)&ifreq->ifr_data;
set_ifreq_to_ifname(ifreq);
@@ -155,7 +156,8 @@ static smallint detect_link_priv(void)
{
/* char buffer instead of bona-fide struct avoids aliasing warning */
char buf[sizeof(struct ifreq)];
- struct ifreq *ifreq = (void *)buf;
+ struct ifreq *const ifreq = (void *)buf;
+
struct mii_ioctl_data *mii = (void *)&ifreq->ifr_data;
set_ifreq_to_ifname(ifreq);
diff --git a/networking/route.c b/networking/route.c
index 98567aaee..b7d08dd63 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -153,7 +153,10 @@ static int kw_lookup(const char *kwtbl, char ***pargs)
static NOINLINE void INET_setroute(int action, char **args)
{
- struct rtentry rt;
+ /* char buffer instead of bona-fide struct avoids aliasing warning */
+ char rt_buf[sizeof(struct rtentry)];
+ struct rtentry *const rt = (void *)rt_buf;
+
const char *netmask = NULL;
int skfd, isnet, xflag;
@@ -166,7 +169,7 @@ static NOINLINE void INET_setroute(int action, char **args)
}
/* Clean out the RTREQ structure. */
- memset(&rt, 0, sizeof(rt));
+ memset(rt, 0, sizeof(*rt));
{
const char *target = *args++;
@@ -178,17 +181,17 @@ static NOINLINE void INET_setroute(int action, char **args)
int prefix_len;
prefix_len = xatoul_range(prefix+1, 0, 32);
- mask_in_addr(rt) = htonl( ~(0xffffffffUL >> prefix_len));
+ mask_in_addr(*rt) = htonl( ~(0xffffffffUL >> prefix_len));
*prefix = '\0';
#if HAVE_NEW_ADDRT
- rt.rt_genmask.sa_family = AF_INET;
+ rt->rt_genmask.sa_family = AF_INET;
#endif
} else {
/* Default netmask. */
netmask = "default";
}
/* Prefer hostname lookup is -host flag (xflag==1) was given. */
- isnet = INET_resolve(target, (struct sockaddr_in *) &rt.rt_dst,
+ isnet = INET_resolve(target, (struct sockaddr_in *) &rt->rt_dst,
(xflag & HOST_FLAG));
if (isnet < 0) {
bb_error_msg_and_die("resolving %s", target);
@@ -204,20 +207,20 @@ static NOINLINE void INET_setroute(int action, char **args)
}
/* Fill in the other fields. */
- rt.rt_flags = ((isnet) ? RTF_UP : (RTF_UP | RTF_HOST));
+ rt->rt_flags = ((isnet) ? RTF_UP : (RTF_UP | RTF_HOST));
while (*args) {
int k = kw_lookup(tbl_ipvx, &args);
const char *args_m1 = args[-1];
if (k & KW_IPVx_FLAG_ONLY) {
- rt.rt_flags |= flags_ipvx[k & 3];
+ rt->rt_flags |= flags_ipvx[k & 3];
continue;
}
#if HAVE_NEW_ADDRT
if (k == KW_IPVx_METRIC) {
- rt.rt_metric = xatoul(args_m1) + 1;
+ rt->rt_metric = xatoul(args_m1) + 1;
continue;
}
#endif
@@ -225,7 +228,7 @@ static NOINLINE void INET_setroute(int action, char **args)
if (k == KW_IPVx_NETMASK) {
struct sockaddr mask;
- if (mask_in_addr(rt)) {
+ if (mask_in_addr(*rt)) {
bb_show_usage();
}
@@ -234,18 +237,18 @@ static NOINLINE void INET_setroute(int action, char **args)
if (isnet < 0) {
bb_error_msg_and_die("resolving %s", netmask);
}
- rt.rt_genmask = full_mask(mask);
+ rt->rt_genmask = full_mask(mask);
continue;
}
if (k == KW_IPVx_GATEWAY) {
- if (rt.rt_flags & RTF_GATEWAY) {
+ if (rt->rt_flags & RTF_GATEWAY) {
bb_show_usage();
}
isnet = INET_resolve(args_m1,
- (struct sockaddr_in *) &rt.rt_gateway, 1);
- rt.rt_flags |= RTF_GATEWAY;
+ (struct sockaddr_in *) &rt->rt_gateway, 1);
+ rt->rt_flags |= RTF_GATEWAY;
if (isnet) {
if (isnet < 0) {
@@ -257,24 +260,24 @@ static NOINLINE void INET_setroute(int action, char **args)
}
if (k == KW_IPVx_MSS) { /* Check valid MSS bounds. */
- rt.rt_flags |= RTF_MSS;
- rt.rt_mss = xatoul_range(args_m1, 64, 32768);
+ rt->rt_flags |= RTF_MSS;
+ rt->rt_mss = xatoul_range(args_m1, 64, 32768);
continue;
}
if (k == KW_IPVx_WINDOW) { /* Check valid window bounds. */
- rt.rt_flags |= RTF_WINDOW;
- rt.rt_window = xatoul_range(args_m1, 128, INT_MAX);
+ rt->rt_flags |= RTF_WINDOW;
+ rt->rt_window = xatoul_range(args_m1, 128, INT_MAX);
continue;
}
#ifdef RTF_IRTT
if (k == KW_IPVx_IRTT) {
- rt.rt_flags |= RTF_IRTT;
- rt.rt_irtt = xatoul(args_m1);
- rt.rt_irtt *= (sysconf(_SC_CLK_TCK) / 100); /* FIXME */
+ rt->rt_flags |= RTF_IRTT;
+ rt->rt_irtt = xatoul(args_m1);
+ rt->rt_irtt *= (sysconf(_SC_CLK_TCK) / 100); /* FIXME */
#if 0 /* FIXME: do we need to check anything of this? */
- if (rt.rt_irtt < 1 || rt.rt_irtt > (120 * HZ)) {
+ if (rt->rt_irtt < 1 || rt->rt_irtt > (120 * HZ)) {
bb_error_msg_and_die("bad irtt");
}
#endif
@@ -284,9 +287,9 @@ static NOINLINE void INET_setroute(int action, char **args)
/* Device is special in that it can be the last arg specified
* and doesn't requre the dev/device keyword in that case. */
- if (!rt.rt_dev && ((k == KW_IPVx_DEVICE) || (!k && !*++args))) {
+ if (!rt->rt_dev && ((k == KW_IPVx_DEVICE) || (!k && !*++args))) {
/* Don't use args_m1 here since args may have changed! */
- rt.rt_dev = args[-1];
+ rt->rt_dev = args[-1];
continue;
}
@@ -295,41 +298,41 @@ static NOINLINE void INET_setroute(int action, char **args)
}
#ifdef RTF_REJECT
- if ((rt.rt_flags & RTF_REJECT) && !rt.rt_dev) {
- rt.rt_dev = (char*)"lo";
+ if ((rt->rt_flags & RTF_REJECT) && !rt->rt_dev) {
+ rt->rt_dev = (char*)"lo";
}
#endif
/* sanity checks.. */
- if (mask_in_addr(rt)) {
- uint32_t mask = mask_in_addr(rt);
+ if (mask_in_addr(*rt)) {
+ uint32_t mask = mask_in_addr(*rt);
mask = ~ntohl(mask);
- if ((rt.rt_flags & RTF_HOST) && mask != 0xffffffff) {
+ if ((rt->rt_flags & RTF_HOST) && mask != 0xffffffff) {
bb_error_msg_and_die("netmask %.8x and host route conflict",
(unsigned int) mask);
}
if (mask & (mask + 1)) {
bb_error_msg_and_die("bogus netmask %s", netmask);
}
- mask = ((struct sockaddr_in *) &rt.rt_dst)->sin_addr.s_addr;
- if (mask & ~(uint32_t)mask_in_addr(rt)) {
+ mask = ((struct sockaddr_in *) &rt->rt_dst)->sin_addr.s_addr;
+ if (mask & ~(uint32_t)mask_in_addr(*rt)) {
bb_error_msg_and_die("netmask and route address conflict");
}
}
/* Fill out netmask if still unset */
- if ((action == RTACTION_ADD) && (rt.rt_flags & RTF_HOST)) {
- mask_in_addr(rt) = 0xffffffff;
+ if ((action == RTACTION_ADD) && (rt->rt_flags & RTF_HOST)) {
+ mask_in_addr(*rt) = 0xffffffff;
}
/* Create a socket to the INET kernel. */
skfd = xsocket(AF_INET, SOCK_DGRAM, 0);
if (action == RTACTION_ADD)
- xioctl(skfd, SIOCADDRT, &rt);
+ xioctl(skfd, SIOCADDRT, rt);
else
- xioctl(skfd, SIOCDELRT, &rt);
+ xioctl(skfd, SIOCDELRT, rt);
if (ENABLE_FEATURE_CLEAN_UP) close(skfd);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 22:37:23 +0000