projects / openwrt / openwrt.git / blob
? search:


1e070d9d9c27fa01293ba000e120da6fc40e98a8
[openwrt/openwrt.git] / target / linux / generic / patches-3.18 / 645-bridge_multicast_to_unicast.patch
1 --- a/net/bridge/br_multicast.c
2 +++ b/net/bridge/br_multicast.c
3 @@ -635,7 +635,8 @@ struct net_bridge_port_group *br_multica
4 struct net_bridge_port *port,
5 struct br_ip *group,
6 struct net_bridge_port_group __rcu *next,
7 - unsigned char state)
8 + unsigned char state,
9 + const unsigned char *src)
10 {
11 struct net_bridge_port_group *p;
12
13 @@ -650,12 +651,33 @@ struct net_bridge_port_group *br_multica
14 hlist_add_head(&p->mglist, &port->mglist);
15 setup_timer(&p->timer, br_multicast_port_group_expired,
16 (unsigned long)p);
17 + if ((port->flags & BR_MULTICAST_TO_UCAST) && src) {
18 + memcpy(p->eth_addr, src, ETH_ALEN);
19 + p->unicast = true;
20 + }
21 return p;
22 }
23
24 +static bool br_port_group_equal(struct net_bridge_port_group *p,
25 + struct net_bridge_port *port,
26 + const unsigned char *src)
27 +{
28 + if (p->port != port)
29 + return false;
30 +
31 + if (!p->unicast)
32 + return true;
33 +
34 + if (!src)
35 + return false;
36 +
37 + return ether_addr_equal(src, p->eth_addr);
38 +}
39 +
40 static int br_multicast_add_group(struct net_bridge *br,
41 struct net_bridge_port *port,
42 - struct br_ip *group)
43 + struct br_ip *group,
44 + const unsigned char *src)
45 {
46 struct net_bridge_mdb_entry *mp;
47 struct net_bridge_port_group *p;
48 @@ -682,13 +704,13 @@ static int br_multicast_add_group(struct
49 for (pp = &mp->ports;
50 (p = mlock_dereference(*pp, br)) != NULL;
51 pp = &p->next) {
52 - if (p->port == port)
53 + if (br_port_group_equal(p, port, src))
54 goto found;
55 if ((unsigned long)p->port < (unsigned long)port)
56 break;
57 }
58
59 - p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY);
60 + p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY, src);
61 if (unlikely(!p))
62 goto err;
63 rcu_assign_pointer(*pp, p);
64 @@ -707,7 +729,7 @@ err:
65 static int br_ip4_multicast_add_group(struct net_bridge *br,
66 struct net_bridge_port *port,
67 __be32 group,
68 - __u16 vid)
69 + __u16 vid, const unsigned char *src)
70 {
71 struct br_ip br_group;
72
73 @@ -718,14 +740,14 @@ static int br_ip4_multicast_add_group(st
74 br_group.proto = htons(ETH_P_IP);
75 br_group.vid = vid;
76
77 - return br_multicast_add_group(br, port, &br_group);
78 + return br_multicast_add_group(br, port, &br_group, src);
79 }
80
81 #if IS_ENABLED(CONFIG_IPV6)
82 static int br_ip6_multicast_add_group(struct net_bridge *br,
83 struct net_bridge_port *port,
84 const struct in6_addr *group,
85 - __u16 vid)
86 + __u16 vid, const unsigned char *src)
87 {
88 struct br_ip br_group;
89
90 @@ -736,7 +758,7 @@ static int br_ip6_multicast_add_group(st
91 br_group.proto = htons(ETH_P_IPV6);
92 br_group.vid = vid;
93
94 - return br_multicast_add_group(br, port, &br_group);
95 + return br_multicast_add_group(br, port, &br_group, src);
96 }
97 #endif
98
99 @@ -965,6 +987,7 @@ static int br_ip4_multicast_igmp3_report
100 struct sk_buff *skb,
101 u16 vid)
102 {
103 + const unsigned char *src;
104 struct igmpv3_report *ih;
105 struct igmpv3_grec *grec;
106 int i;
107 @@ -1008,7 +1031,8 @@ static int br_ip4_multicast_igmp3_report
108 continue;
109 }
110
111 - err = br_ip4_multicast_add_group(br, port, group, vid);
112 + src = eth_hdr(skb)->h_source;
113 + err = br_ip4_multicast_add_group(br, port, group, vid, src);
114 if (err)
115 break;
116 }
117 @@ -1022,6 +1046,7 @@ static int br_ip6_multicast_mld2_report(
118 struct sk_buff *skb,
119 u16 vid)
120 {
121 + const unsigned char *src;
122 struct icmp6hdr *icmp6h;
123 struct mld2_grec *grec;
124 int i;
125 @@ -1069,8 +1094,9 @@ static int br_ip6_multicast_mld2_report(
126 continue;
127 }
128
129 + src = eth_hdr(skb)->h_source;
130 err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
131 - vid);
132 + vid, src);
133 if (err)
134 break;
135 }
136 @@ -1407,7 +1433,8 @@ br_multicast_leave_group(struct net_brid
137 struct net_bridge_port *port,
138 struct br_ip *group,
139 struct bridge_mcast_other_query *other_query,
140 - struct bridge_mcast_own_query *own_query)
141 + struct bridge_mcast_own_query *own_query,
142 + const unsigned char *src)
143 {
144 struct net_bridge_mdb_htable *mdb;
145 struct net_bridge_mdb_entry *mp;
146 @@ -1457,7 +1484,7 @@ br_multicast_leave_group(struct net_brid
147 for (pp = &mp->ports;
148 (p = mlock_dereference(*pp, br)) != NULL;
149 pp = &p->next) {
150 - if (p->port != port)
151 + if (!br_port_group_equal(p, port, src))
152 continue;
153
154 rcu_assign_pointer(*pp, p->next);
155 @@ -1491,7 +1518,7 @@ br_multicast_leave_group(struct net_brid
156 for (p = mlock_dereference(mp->ports, br);
157 p != NULL;
158 p = mlock_dereference(p->next, br)) {
159 - if (p->port != port)
160 + if (!br_port_group_equal(p, port, src))
161 continue;
162
163 if (!hlist_unhashed(&p->mglist) &&
164 @@ -1509,8 +1536,8 @@ out:
165
166 static void br_ip4_multicast_leave_group(struct net_bridge *br,
167 struct net_bridge_port *port,
168 - __be32 group,
169 - __u16 vid)
170 + __be32 group, __u16 vid,
171 + const unsigned char *src)
172 {
173 struct br_ip br_group;
174 struct bridge_mcast_own_query *own_query;
175 @@ -1525,14 +1552,14 @@ static void br_ip4_multicast_leave_group
176 br_group.vid = vid;
177
178 br_multicast_leave_group(br, port, &br_group, &br->ip4_other_query,
179 - own_query);
180 + own_query, src);
181 }
182
183 #if IS_ENABLED(CONFIG_IPV6)
184 static void br_ip6_multicast_leave_group(struct net_bridge *br,
185 struct net_bridge_port *port,
186 const struct in6_addr *group,
187 - __u16 vid)
188 + __u16 vid, const unsigned char *src)
189 {
190 struct br_ip br_group;
191 struct bridge_mcast_own_query *own_query;
192 @@ -1547,7 +1574,7 @@ static void br_ip6_multicast_leave_group
193 br_group.vid = vid;
194
195 br_multicast_leave_group(br, port, &br_group, &br->ip6_other_query,
196 - own_query);
197 + own_query, src);
198 }
199 #endif
200
201 @@ -1556,6 +1583,7 @@ static int br_multicast_ipv4_rcv(struct
202 struct sk_buff *skb,
203 u16 vid)
204 {
205 + const unsigned char *src;
206 struct sk_buff *skb2 = skb;
207 const struct iphdr *iph;
208 struct igmphdr *ih;
209 @@ -1629,7 +1657,8 @@ static int br_multicast_ipv4_rcv(struct
210 case IGMP_HOST_MEMBERSHIP_REPORT:
211 case IGMPV2_HOST_MEMBERSHIP_REPORT:
212 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
213 - err = br_ip4_multicast_add_group(br, port, ih->group, vid);
214 + src = eth_hdr(skb)->h_source;
215 + err = br_ip4_multicast_add_group(br, port, ih->group, vid, src);
216 break;
217 case IGMPV3_HOST_MEMBERSHIP_REPORT:
218 err = br_ip4_multicast_igmp3_report(br, port, skb2, vid);
219 @@ -1638,7 +1667,8 @@ static int br_multicast_ipv4_rcv(struct
220 err = br_ip4_multicast_query(br, port, skb2, vid);
221 break;
222 case IGMP_HOST_LEAVE_MESSAGE:
223 - br_ip4_multicast_leave_group(br, port, ih->group, vid);
224 + src = eth_hdr(skb)->h_source;
225 + br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
226 break;
227 }
228
229 @@ -1656,6 +1686,7 @@ static int br_multicast_ipv6_rcv(struct
230 struct sk_buff *skb,
231 u16 vid)
232 {
233 + const unsigned char *src;
234 struct sk_buff *skb2;
235 const struct ipv6hdr *ip6h;
236 u8 icmp6_type;
237 @@ -1765,7 +1796,9 @@ static int br_multicast_ipv6_rcv(struct
238 }
239 mld = (struct mld_msg *)skb_transport_header(skb2);
240 BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
241 - err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid);
242 + src = eth_hdr(skb)->h_source;
243 + err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid,
244 + src);
245 break;
246 }
247 case ICMPV6_MLD2_REPORT:
248 @@ -1782,7 +1815,8 @@ static int br_multicast_ipv6_rcv(struct
249 goto out;
250 }
251 mld = (struct mld_msg *)skb_transport_header(skb2);
252 - br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid);
253 + src = eth_hdr(skb)->h_source;
254 + br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid, src);
255 }
256 }
257
258 --- a/net/bridge/br_private.h
259 +++ b/net/bridge/br_private.h
260 @@ -112,6 +112,9 @@ struct net_bridge_port_group {
261 struct timer_list timer;
262 struct br_ip addr;
263 unsigned char state;
264 +
265 + unsigned char eth_addr[ETH_ALEN];
266 + bool unicast;
267 };
268
269 struct net_bridge_mdb_entry
270 @@ -173,6 +176,7 @@ struct net_bridge_port
271 #define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING)
272 #define BR_PROMISC 0x00000080
273 #define BR_ISOLATE_MODE 0x00000100
274 +#define BR_MULTICAST_TO_UCAST 0x00000200
275
276 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
277 struct bridge_mcast_own_query ip4_own_query;
278 @@ -485,7 +489,8 @@ void br_multicast_free_pg(struct rcu_hea
279 struct net_bridge_port_group *
280 br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
281 struct net_bridge_port_group __rcu *next,
282 - unsigned char state);
283 + unsigned char state,
284 + const unsigned char *src);
285 void br_mdb_init(void);
286 void br_mdb_uninit(void);
287 void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
288 --- a/net/bridge/br_mdb.c
289 +++ b/net/bridge/br_mdb.c
290 @@ -342,7 +342,7 @@ static int br_mdb_add_group(struct net_b
291 break;
292 }
293
294 - p = br_multicast_new_port_group(port, group, *pp, state);
295 + p = br_multicast_new_port_group(port, group, *pp, state, NULL);
296 if (unlikely(!p))
297 return -ENOMEM;
298 rcu_assign_pointer(*pp, p);
299 --- a/net/bridge/br_forward.c
300 +++ b/net/bridge/br_forward.c
301 @@ -168,6 +168,29 @@ out:
302 return p;
303 }
304
305 +static struct net_bridge_port *maybe_deliver_addr(
306 + struct net_bridge_port *prev, struct net_bridge_port *p,
307 + struct sk_buff *skb, const unsigned char *addr,
308 + void (*__packet_hook)(const struct net_bridge_port *p,
309 + struct sk_buff *skb))
310 +{
311 + struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
312 +
313 + if (!should_deliver(p, skb))
314 + return prev;
315 +
316 + skb = skb_copy(skb, GFP_ATOMIC);
317 + if (!skb) {
318 + dev->stats.tx_dropped++;
319 + return prev;
320 + }
321 +
322 + memcpy(eth_hdr(skb)->h_dest, addr, ETH_ALEN);
323 + __packet_hook(p, skb);
324 +
325 + return prev;
326 +}
327 +
328 /* called under bridge lock */
329 static void br_flood(struct net_bridge *br, struct sk_buff *skb,
330 struct sk_buff *skb0,
331 @@ -232,6 +255,7 @@ static void br_multicast_flood(struct ne
332 struct net_bridge_port *prev = NULL;
333 struct net_bridge_port_group *p;
334 struct hlist_node *rp;
335 + const unsigned char *addr;
336
337 rp = rcu_dereference(hlist_first_rcu(&br->router_list));
338 p = mdst ? rcu_dereference(mdst->ports) : NULL;
339 @@ -242,10 +266,19 @@ static void br_multicast_flood(struct ne
340 rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
341 NULL;
342
343 - port = (unsigned long)lport > (unsigned long)rport ?
344 - lport : rport;
345 -
346 - prev = maybe_deliver(prev, port, skb, __packet_hook);
347 + if ((unsigned long)lport > (unsigned long)rport) {
348 + port = lport;
349 + addr = p->unicast ? p->eth_addr : NULL;
350 + } else {
351 + port = rport;
352 + addr = NULL;
353 + }
354 +
355 + if (addr)
356 + prev = maybe_deliver_addr(prev, port, skb, addr,
357 + __packet_hook);
358 + else
359 + prev = maybe_deliver(prev, port, skb, __packet_hook);
360 if (IS_ERR(prev))
361 goto out;
362
363 --- a/net/bridge/br_sysfs_if.c
364 +++ b/net/bridge/br_sysfs_if.c
365 @@ -202,6 +202,7 @@ static BRPORT_ATTR(multicast_router, S_I
366 store_multicast_router);
367
368 BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE);
369 +BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UCAST);
370 #endif
371
372 static const struct brport_attribute *brport_attrs[] = {
373 @@ -228,6 +229,7 @@ static const struct brport_attribute *br
374 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
375 &brport_attr_multicast_router,
376 &brport_attr_multicast_fast_leave,
377 + &brport_attr_multicast_to_unicast,
378 #endif
379 &brport_attr_isolate_mode,
380 NULL
OpenWrt Source Repository