Skip to content
Browse files

fixed a bug that MSF advanced-API is rejected in case of IPv4

  • Loading branch information...
1 parent 40d4ded commit 70ce02a084a363e92b22511ec53cfc6bed441de0 suz committed Jul 12, 2006
Showing with 8 additions and 7 deletions.
  1. +6 −1 CHANGELOG
  2. +2 −6 kame/sys/netinet/in_msf.c
View
7 CHANGELOG
@@ -1,5 +1,10 @@
CHANGELOG for KAME kit
-$KAME: CHANGELOG,v 1.2827 2006/06/09 11:29:57 t-momose Exp $
+$KAME: CHANGELOG,v 1.2828 2006/07/12 01:48:43 suz Exp $
+
+<200607>
+2006-07-11 SUZUKI, Shinsuke <suz@alaxala.net>
+ * kame/sys/netinet/in_msf.c: fixed a bug that MSF advanced-API
+ is rejected in case of IPv4
<200606>
2006-06-09 Tsuyoshi MOMOSE <momose@az.jp.nec.com>
View
8 kame/sys/netinet/in_msf.c
@@ -2107,9 +2107,7 @@ ip_setmopt_srcfilter(sop, imsfp)
"the group address is invalid\n"));
return EINVAL;
}
- if (imsf->imsf_numsrc != 0)
- return EINVAL;
- if (!is_igmp_target(&imsf->imsf_multiaddr))
+ if (imsf->imsf_numsrc != 0 && !is_igmp_target(&imsf->imsf_multiaddr))
return EINVAL;
/*
@@ -2705,15 +2703,13 @@ sock_setmopt_srcfilter(sop, grpfp)
return EPFNOSUPPORT;
in_grp = SIN(&grpf->gf_group);
- if ((grpf->gf_numsrc != 0))
- return EINVAL;
#if defined(__NetBSD__) || defined(__OpenBSD__)
if (!IN_MULTICAST(in_grp->sin_addr.s_addr))
#else
if (!IN_MULTICAST(ntohl(in_grp->sin_addr.s_addr)))
#endif
return EINVAL;
- if (!is_igmp_target(&in_grp->sin_addr))
+ if (grpf->gf_numsrc != 0 && !is_igmp_target(&in_grp->sin_addr))
return EINVAL;
/*

0 comments on commit 70ce02a

Please sign in to comment.
Something went wrong with that request. Please try again.