On Mon, 29 Jun 2020 19:18:17 +0200
Klemens Nanni <k...@openbsd.org> wrote:
> On Mon, Jun 29, 2020 at 11:55:10PM +0900, YASUOKA Masahiko wrote:
>> The function mask_addr() doesn't mask address for IPv4 and IPv6. Does
>> any address family other than IPv4 or IPv6 require #1142:1148? The
>> function seems to just trim the trailing zero. Is it neccesaary? And
>> it causes the confusion on the kernel. How about deleting
>> mask_addr()?
>>
>> The diff following also fixes the problem.
> Removing it breaks IPv4 default routes:
>
> # ifconfig lo1 rdomain 1 127.1.1.1
> # ./obj/route -nT1 add 0.0.0.0/0 127.1.1.1
> add net 0.0.0.0/0: gateway 127.1.1.1: Invalid argument
> # route -nT1 add 0.0.0.0/0 127.1.1.1
> add net 0.0.0.0/0: gateway 127.1.1.1
Thanks,
inet_makenetandmask() had required another treatment.
Also -prefixlen 0 for -inet has a bug
% doas ./obj/route -T100 add -inet 0.0.0.0 -prefixlen 0 127.0.0.1
add net 0.0.0.0: gateway 127.0.0.1
% netstat -nrf inet -T 100
Routing tables
Internet:
Destination Gateway Flags Refs Use Mtu Prio Iface
0.0.0.0/32 127.0.0.1 UGS 0 0 32768 8 lo100
/0 becomes /32. The diff following also fixes the problem.
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 9e43d8e89b6..532a918148d 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -107,7 +107,6 @@ void print_rtmsg(struct rt_msghdr *, int);
void pmsg_common(struct rt_msghdr *);
void pmsg_addrs(char *, int);
void bprintf(FILE *, int, char *);
-void mask_addr(union sockunion *, union sockunion *, int);
int getaddr(int, int, char *, struct hostent **);
void getmplslabel(char *, int);
int rtmsg(int, int, int, uint8_t);
@@ -781,12 +780,9 @@ inet_makenetandmask(u_int32_t net, struct sockaddr_in
*sin, int bits)
sin->sin_addr.s_addr = htonl(net);
sin = &so_mask.sin;
sin->sin_addr.s_addr = htonl(mask);
- sin->sin_len = 0;
- sin->sin_family = 0;
+ sin->sin_family = AF_INET;
cp = (char *)(&sin->sin_addr + 1);
- while (*--cp == '\0' && cp > (char *)sin)
- continue;
- sin->sin_len = 1 + cp - (char *)sin;
+ sin->sin_len = sizeof(struct sockaddr_in);
}
/*
@@ -1001,7 +997,8 @@ prefixlen(int af, char *s)
memset(&so_mask, 0, sizeof(so_mask));
so_mask.sin.sin_family = AF_INET;
so_mask.sin.sin_len = sizeof(struct sockaddr_in);
- so_mask.sin.sin_addr.s_addr = htonl(0xffffffff << (32 - len));
+ if (len != 0)
+ so_mask.sin.sin_addr.s_addr = htonl(0xffffffff << (32 -
len));
break;
case AF_INET6:
so_mask.sin6.sin6_family = AF_INET6;
@@ -1088,8 +1085,6 @@ rtmsg(int cmd, int flags, int fmask, uint8_t prio)
rtm.rtm_mpls = mpls_flags;
rtm.rtm_hdrlen = sizeof(rtm);
- if (rtm_addrs & RTA_NETMASK)
- mask_addr(&so_dst, &so_mask, RTA_DST);
/* store addresses in ascending order of RTA values */
NEXTADDR(RTA_DST, so_dst);
NEXTADDR(RTA_GATEWAY, so_gate);
@@ -1120,34 +1115,6 @@ rtmsg(int cmd, int flags, int fmask, uint8_t prio)
return (0);
}
-void
-mask_addr(union sockunion *addr, union sockunion *mask, int which)
-{
- int olen = mask->sa.sa_len;
- char *cp1 = olen + (char *)mask, *cp2;
-
- for (mask->sa.sa_len = 0; cp1 > (char *)mask; )
- if (*--cp1 != '\0') {
- mask->sa.sa_len = 1 + cp1 - (char *)mask;
- break;
- }
- if ((rtm_addrs & which) == 0)
- return;
- switch (addr->sa.sa_family) {
- case AF_INET:
- case AF_INET6:
- case AF_UNSPEC:
- return;
- }
- cp1 = mask->sa.sa_len + 1 + (char *)addr;
- cp2 = addr->sa.sa_len + 1 + (char *)addr;
- while (cp2 > cp1)
- *--cp2 = '\0';
- cp2 = mask->sa.sa_len + 1 + (char *)mask;
- while (cp1 > addr->sa.sa_data)
- *--cp1 &= *--cp2;
-}
-
char *msgtypes[] = {
"",
"RTM_ADD: Add Route",
