summaryrefslogtreecommitdiff
blob: f64ebb005962d56ac794f1da48e891d6df2bfd86 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
--- 1.58/net/ipv4/igmp.c        2004-11-09 16:44:25 -08:00
+++ edited/net/ipv4/igmp.c      2004-12-10 15:16:17 -08:00
@@ -1778,12 +1778,12 @@ int ip_mc_source(int add, int omode, str
			goto done;
		rv = !0;
		for (i=0; i<psl->sl_count; i++) {
-			rv = memcmp(&psl->sl_addr, &mreqs->imr_multiaddr,
+			rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
				sizeof(__u32));
-			if (rv >= 0)
+			if (rv == 0)
				break;
		}
-		if (!rv)	/* source not found */
+		if (rv)		/* source not found */
			goto done;

		/* update the interface filter */
@@ -1825,9 +1825,9 @@ int ip_mc_source(int add, int omode, str
	}
	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, &mreqs->imr_multiaddr,
+		rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
			sizeof(__u32));
-		if (rv >= 0)
+		if (rv == 0)
			break;
	}
	if (rv == 0)		/* address already there is an error */
--- 1.71/net/ipv6/mcast.c       2004-11-11 15:07:25 -08:00
+++ edited/net/ipv6/mcast.c     2004-12-10 17:20:46 -08:00
@@ -391,12 +391,12 @@ int ip6_mc_source(int add, int omode, st
			goto done;
		rv = !0;
		for (i=0; i<psl->sl_count; i++) {
-			rv = memcmp(&psl->sl_addr, group,
+			rv = memcmp(&psl->sl_addr[i], source,
				sizeof(struct in6_addr));
-			if (rv >= 0)
+			if (rv == 0)
				break;
		}
-		if (!rv)	/* source not found */
+		if (rv)		/* source not found */
			goto done;

		/* update the interface filter */
@@ -437,8 +437,8 @@ int ip6_mc_source(int add, int omode, st
	}
	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, group, sizeof(struct in6_addr));
-		if (rv >= 0)
+		rv = memcmp(&psl->sl_addr[i], source, sizeof(struct in6_addr));
+		if (rv == 0)
			break;
	}
	if (rv == 0)		/* address already there is an error */