Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed an IPv6 per-interface MSF calculation failure when MSF is in EX…

…CLUDE mode
  • Loading branch information...
commit d9061a34b9d8cab010d7dbc97a17c78da495297f 1 parent 4f076e6
suz authored
Showing with 12 additions and 4 deletions.
  1. +5 −1 CHANGELOG
  2. +7 −3 kame/sys/netinet6/in6_msf.c
View
6 CHANGELOG
@@ -1,7 +1,11 @@
CHANGELOG for KAME kit
-$KAME: CHANGELOG,v 1.2598 2004/04/22 02:44:27 suz Exp $
+$KAME: CHANGELOG,v 1.2599 2004/04/27 11:45:06 suz Exp $
<200404>
+2004-04-27 SUZUKI, Shinsuke <suz@crl.hitachi.co.jp>
+ * kame/sys/netinet6/in6_msf.c: fixed an IPv6 per-interface MSF
+ calculation failure when MSF is in EXCLUDE mode
+
2004-04-22 SUZUKI, Shinsuke <suz@crl.hitachi.co.jp>
* kame/sys/netinet/in_msf.c, kame/sys/netinet6/in6_msf.c: silently
ignore an advanced MSF-API call (instead of returning EINVAL) when
View
10 kame/sys/netinet6/in6_msf.c
@@ -1,4 +1,4 @@
-/* $KAME: in6_msf.c,v 1.30 2004/04/22 02:44:28 suz Exp $ */
+/* $KAME: in6_msf.c,v 1.31 2004/04/27 11:45:06 suz Exp $ */
/*
* Copyright (c) 2002 INRIA. All rights reserved.
@@ -2714,8 +2714,12 @@ match_msf6_per_if(in6m, src, dst)
mldlog((LOG_DEBUG, "grp found, but src is NULL. impossible"));
return 0;
}
- if (in6ms->i6ms_grpjoin > 0)
- return 1;
+ if (in6ms->i6ms_grpjoin != 0) {
+ if (in6ms->i6ms_mode != MCAST_EXCLUDE)
+ return 0; /* XXX: impossible */
+ if (in6ms->i6ms_cur == NULL || in6ms->i6ms_cur->numsrc == 0)
+ return 1;
+ }
if (in6ms->i6ms_cur == NULL || in6ms->i6ms_cur->head == NULL)
return 0;
Please sign in to comment.
Something went wrong with that request. Please try again.