Attachment #26775 for bug #63895

View | Details | Raw Unified | Return to bug 63895
Collapse All | Expand All





	psl = pmc->sflist;
	if (!add) {
		if (!psl || !psl->sl_count)
			goto done;
		rv = 1;
		for (i=0; i<psl->sl_count; i++) {
			rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
				sizeof(__u32));
			if (rv >= 0)	/* array is sorted */
				break;
		}
		if (rv)		/* source not found */
			goto done;

		/* update the interface filter */

	}
	rv = 1;	/* > 0 for insert logic below if sl_count is 0 */
	for (i=0; i<psl->sl_count; i++) {
		rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
			sizeof(__u32));
		if (rv >= 0)
			break;





	psl = pmc->sflist;
	if (!add) {
		if (!psl || !psl->sl_count)
			goto done;
		rv = 1;
		for (i=0; i<psl->sl_count; i++) {
			rv = memcmp(&psl->sl_addr[i], source,
				sizeof(struct in6_addr));
			if (rv >= 0)	/* array is sorted */
				break;
		}
		if (rv)		/* source not found */
			goto done;

		/* update the interface filter */

	}
	rv = 1;	/* > 0 for insert logic below if sl_count is 0 */
	for (i=0; i<psl->sl_count; i++) {
		rv = memcmp(&psl->sl_addr[i], source, sizeof(struct in6_addr));
		if (rv >= 0)
			break;
	}

Return to bug 63895

Lines 1774-1789 int ip_mc_source(int add, int omode, str Link Here

(-)1.58/net/ipv4/igmp.c (-6 / +6 lines)
1774		1774
1775	psl = pmc->sflist;	1775	psl = pmc->sflist;
1776	if (!add) {	1776	if (!add) {
1777	if (!psl)	1777	if (!psl \|\| !psl->sl_count)
1778	goto done;	1778	goto done;
1779	rv = !0;	1779	rv = 1;
1780	for (i=0; i<psl->sl_count; i++) {	1780	for (i=0; i<psl->sl_count; i++) {
1781	rv = memcmp(&psl->sl_addr, &mreqs->imr_multiaddr,	1781	rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
1782	sizeof(__u32));	1782	sizeof(__u32));
1783	if (rv >= 0)	1783	if (rv >= 0) /* array is sorted */
1784	break;	1784	break;
1785	}	1785	}
1786	if (!rv) /* source not found */	1786	if (rv) /* source not found */
1787	goto done;	1787	goto done;
1788		1788
1789	/* update the interface filter */	1789	/* update the interface filter */
Lines 1825-1831 int ip_mc_source(int add, int omode, str Link Here
1825	}	1825	}
1826	rv = 1; /* > 0 for insert logic below if sl_count is 0 */	1826	rv = 1; /* > 0 for insert logic below if sl_count is 0 */
1827	for (i=0; i<psl->sl_count; i++) {	1827	for (i=0; i<psl->sl_count; i++) {
1828	rv = memcmp(&psl->sl_addr, &mreqs->imr_multiaddr,	1828	rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
1829	sizeof(__u32));	1829	sizeof(__u32));
1830	if (rv >= 0)	1830	if (rv >= 0)
1831	break;	1831	break;

Lines 387-402 int ip6_mc_source(int add, int omode, st Link Here

(-)1.71/net/ipv6/mcast.c (-6 / +6 lines)
387		387
388	psl = pmc->sflist;	388	psl = pmc->sflist;
389	if (!add) {	389	if (!add) {
390	if (!psl)	390	if (!psl \|\| !psl->sl_count)
391	goto done;	391	goto done;
392	rv = !0;	392	rv = 1;
393	for (i=0; i<psl->sl_count; i++) {	393	for (i=0; i<psl->sl_count; i++) {
394	rv = memcmp(&psl->sl_addr, group,	394	rv = memcmp(&psl->sl_addr[i], source,
395	sizeof(struct in6_addr));	395	sizeof(struct in6_addr));
396	if (rv >= 0)	396	if (rv >= 0) /* array is sorted */
397	break;	397	break;
398	}	398	}
399	if (!rv) /* source not found */	399	if (rv) /* source not found */
400	goto done;	400	goto done;
401		401
402	/* update the interface filter */	402	/* update the interface filter */
Lines 437-443 int ip6_mc_source(int add, int omode, st Link Here
437	}	437	}
438	rv = 1; /* > 0 for insert logic below if sl_count is 0 */	438	rv = 1; /* > 0 for insert logic below if sl_count is 0 */
439	for (i=0; i<psl->sl_count; i++) {	439	for (i=0; i<psl->sl_count; i++) {
440	rv = memcmp(&psl->sl_addr, group, sizeof(struct in6_addr));	440	rv = memcmp(&psl->sl_addr[i], source, sizeof(struct in6_addr));
441	if (rv >= 0)	441	if (rv >= 0)
442	break;	442	break;
443	}	443	}