mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-21 13:02:24 +03:00
291a485ace
65e9b62d4503849b10bedfc29bff0473760cc597 ipv6: add special mode accept_ra=2 to accept RA while configured as router c3bccac2fa76f1619dfe4fb7b9bee69de7f066d8 ipv6: add special mode forwarding=2 to send RS while configured as router git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24195 3c298f89-4303-0410-b956-a3cf2f4a3e73
31 lines
789 B
Diff
31 lines
789 B
Diff
--- a/net/ipv6/ndisc.c
|
|
+++ b/net/ipv6/ndisc.c
|
|
@@ -1106,6 +1106,18 @@ errout:
|
|
rtnl_set_sk_err(net, RTNLGRP_ND_USEROPT, err);
|
|
}
|
|
|
|
+static inline int accept_ra(struct inet6_dev *in6_dev)
|
|
+{
|
|
+ /*
|
|
+ * If forwarding is enabled, RA are not accepted unless the special
|
|
+ * hybrid mode (accept_ra=2) is enabled.
|
|
+ */
|
|
+ if (in6_dev->cnf.forwarding && in6_dev->cnf.accept_ra < 2)
|
|
+ return 0;
|
|
+
|
|
+ return in6_dev->cnf.accept_ra;
|
|
+}
|
|
+
|
|
static void ndisc_router_discovery(struct sk_buff *skb)
|
|
{
|
|
struct ra_msg *ra_msg = (struct ra_msg *)skb_transport_header(skb);
|
|
@@ -1151,7 +1163,7 @@ static void ndisc_router_discovery(struc
|
|
skb->dev->name);
|
|
return;
|
|
}
|
|
- if (in6_dev->cnf.forwarding || !in6_dev->cnf.accept_ra) {
|
|
+ if (!accept_ra(in6_dev)) {
|
|
in6_dev_put(in6_dev);
|
|
return;
|
|
}
|