summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1995-06-04 06:46:05 +0000
committermycroft <mycroft@NetBSD.org>1995-06-04 06:46:05 +0000
commite201372b7dea58bfbb36e80d49e52b69c43f05fd (patch)
tree26ec2fe54b7beb122149236d640dabe552890b81
parent51a0da73db90106dddc51826128f33bee26a29bc (diff)
For consistency, set sin_len for SIOC{ADD,DEL}MULTI.
-rw-r--r--sys/netinet/in.c3
-rw-r--r--sys/netinet/ip_mroute.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 5c3f74d6c6c..4d6f73c58d1 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.22 1995/06/04 05:06:54 mycroft Exp $ */
+/* $NetBSD: in.c,v 1.23 1995/06/04 06:46:05 mycroft Exp $ */
/*
* Copyright (c) 1982, 1986, 1991, 1993
@@ -535,6 +535,7 @@ in_addmulti(ap, ifp)
* Ask the network driver to update its multicast reception
* filter appropriately for the new address.
*/
+ satosin(&ifr.ifr_addr)->sin_len = sizeof(struct sockaddr_in);
satosin(&ifr.ifr_addr)->sin_family = AF_INET;
satosin(&ifr.ifr_addr)->sin_addr = *ap;
if ((ifp->if_ioctl == NULL) ||
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index f8fbb12545c..0465376c3d8 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.c,v 1.18 1995/06/04 05:07:06 mycroft Exp $ */
+/* $NetBSD: ip_mroute.c,v 1.19 1995/06/04 06:46:08 mycroft Exp $ */
/*
* IP multicast forwarding procedures
@@ -567,6 +567,7 @@ add_vif(m)
return (EOPNOTSUPP);
/* Enable promiscuous reception of all IP multicasts. */
+ satosin(&ifr.ifr_addr)->sin_len = sizeof(struct sockaddr_in);
satosin(&ifr.ifr_addr)->sin_family = AF_INET;
satosin(&ifr.ifr_addr)->sin_addr.s_addr = INADDR_ANY;
error = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, (caddr_t)&ifr);
@@ -627,6 +628,7 @@ reset_vif(vifp)
last_encap_src = 0;
}
} else {
+ satosin(&ifr.ifr_addr)->sin_len = sizeof(struct sockaddr_in);
satosin(&ifr.ifr_addr)->sin_family = AF_INET;
satosin(&ifr.ifr_addr)->sin_addr.s_addr = INADDR_ANY;
ifp = vifp->v_ifp;