> I don't think it's wise to make RTNETLINK facilities dependant upon ifdef
Following is the patch without the PREFIXLIST config option. I have remade it against 2.5.73.
We would like to have this functionality in 2.4 kernel, so can I go ahead and send this patch against 2.4.21 too ?
Thanks,
- KK
--------------------------------------------------------------------------------
diff -ruN linux-2.5.73.org/include/linux/ipv6_route.h linux-2.5.73.new/include/linux/ipv6_route.h
--- linux-2.5.73.org/include/linux/ipv6_route.h 2003-06-22 11:32:36.000000000 -0700
+++ linux-2.5.73.new/include/linux/ipv6_route.h 2003-06-26 09:05:01.000000000 -0700
@@ -44,4 +44,16 @@
#define RTMSG_NEWROUTE 0x21
#define RTMSG_DELROUTE 0x22
+/*
+ * Return entire prefix list in array of following structures. Provides the
+ * prefix and prefix length for all devices.
+ */
+
+struct in6_prefix_msg
+{
+ int ifindex;
+ int prefix_len;
+ struct in6_addr prefix;
+};
+
#endif
diff -ruN linux-2.5.73.org/include/linux/rtnetlink.h linux-2.5.73.new/include/linux/rtnetlink.h
--- linux-2.5.73.org/include/linux/rtnetlink.h 2003-06-22 11:33:07.000000000 -0700
+++ linux-2.5.73.new/include/linux/rtnetlink.h 2003-06-26 09:05:01.000000000 -0700
@@ -47,7 +47,11 @@
#define RTM_DELTFILTER (RTM_BASE+29)
#define RTM_GETTFILTER (RTM_BASE+30)
-#define RTM_MAX (RTM_BASE+31) +#define RTM_GETLNKFLAGS (RTM_BASE+34) + +#define RTM_GETPLIST (RTM_BASE+38) + +#define RTM_MAX (RTM_GETPLIST+1)
/*
Generic structure for encapsulation of optional route information.
@@ -61,6 +65,14 @@
unsigned short rta_type;
};+/* Structure to return per interface device flags */
+
+struct ifp_if6info
+{
+ int ifindex;
+ int flags;
+};
+
/* Macros to handle rtattributes */#define RTA_ALIGNTO 4 @@ -201,9 +213,11 @@ RTA_FLOW, RTA_CACHEINFO, RTA_SESSION, + RTA_LINKFLAGS, + RTA_RA6INFO, /* No support yet, send event on new prefix event */ };
-#define RTA_MAX RTA_SESSION +#define RTA_MAX RTA_RA6INFO
#define RTM_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtmsg))))
#define RTM_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtmsg))
diff -ruN linux-2.5.73.org/include/net/if_inet6.h linux-2.5.73.new/include/net/if_inet6.h
--- linux-2.5.73.org/include/net/if_inet6.h 2003-06-22 11:33:32.000000000 -0700
+++ linux-2.5.73.new/include/net/if_inet6.h 2003-06-26 09:05:01.000000000 -0700
@@ -17,6 +17,8 @@
#include <net/snmp.h>
+#define IF_RA_OTHERCONF 0x80 +#define IF_RA_MANAGED 0x40 #define IF_RA_RCVD 0x20 #define IF_RS_SENT 0x10
diff -ruN linux-2.5.73.org/include/net/ip6_route.h linux-2.5.73.new/include/net/ip6_route.h
--- linux-2.5.73.org/include/net/ip6_route.h 2003-06-22 11:32:37.000000000 -0700
+++ linux-2.5.73.new/include/net/ip6_route.h 2003-06-26 09:05:01.000000000 -0700
@@ -87,6 +87,7 @@
struct nlmsghdr;
struct netlink_callback;
extern int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb);
+extern int inet6_dump_prefix(struct sk_buff *skb, struct netlink_callback *cb);
extern int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
extern int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
extern int inet6_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
diff -ruN linux-2.5.73.org/net/ipv6/addrconf.c linux-2.5.73.new/net/ipv6/addrconf.c
--- linux-2.5.73.org/net/ipv6/addrconf.c 2003-06-22 11:33:17.000000000 -0700
+++ linux-2.5.73.new/net/ipv6/addrconf.c 2003-06-26 09:05:01.000000000 -0700
@@ -129,7 +129,7 @@
static int addrconf_ifdown(struct net_device *dev, int how);
-static void addrconf_dad_start(struct inet6_ifaddr *ifp); +static void addrconf_dad_start(struct inet6_ifaddr *ifp, int flags); static void addrconf_dad_timer(unsigned long data); static void addrconf_dad_completed(struct inet6_ifaddr *ifp); static void addrconf_rs_timer(unsigned long data); @@ -715,7 +715,7 @@ ift->prefered_lft = tmp_prefered_lft; ift->tstamp = ifp->tstamp; spin_unlock_bh(&ift->lock); - addrconf_dad_start(ift); + addrconf_dad_start(ift, 0); in6_ifa_put(ift); in6_dev_put(idev); out: @@ -1211,7 +1211,7 @@ rtmsg.rtmsg_dst_len = 8; rtmsg.rtmsg_metric = IP6_RT_PRIO_ADDRCONF; rtmsg.rtmsg_ifindex = dev->ifindex; - rtmsg.rtmsg_flags = RTF_UP|RTF_ADDRCONF; + rtmsg.rtmsg_flags = RTF_UP; rtmsg.rtmsg_type = RTMSG_NEWROUTE; ip6_route_add(&rtmsg, NULL, NULL); } @@ -1238,7 +1238,7 @@ struct in6_addr addr;
ipv6_addr_set(&addr, htonl(0xFE800000), 0, 0, 0); - addrconf_prefix_route(&addr, 64, dev, 0, RTF_ADDRCONF); + addrconf_prefix_route(&addr, 64, dev, 0, 0); }
static struct inet6_dev *addrconf_add_dev(struct net_device *dev) @@ -1378,7 +1378,7 @@ }
create = 1; - addrconf_dad_start(ifp); + addrconf_dad_start(ifp, RTF_ADDRCONF); }
if (ifp && valid_lft == 0) {
@@ -1529,7 +1529,7 @@ ifp = ipv6_add_addr(idev, pfx, plen, scope, IFA_F_PERMANENT);
if (!IS_ERR(ifp)) {
- addrconf_dad_start(ifp);
+ addrconf_dad_start(ifp, 0);
in6_ifa_put(ifp);
return 0;
}
@@ -1704,7 +1704,7 @@ ifp = ipv6_add_addr(idev, addr, 64, IFA_LINK, IFA_F_PERMANENT);
if (!IS_ERR(ifp)) {
- addrconf_dad_start(ifp);
+ addrconf_dad_start(ifp, 0);
in6_ifa_put(ifp);
}
}
@@ -1943,8 +1943,7 @@
memset(&rtmsg, 0, sizeof(struct in6_rtmsg));
rtmsg.rtmsg_type = RTMSG_NEWROUTE;
rtmsg.rtmsg_metric = IP6_RT_PRIO_ADDRCONF;
- rtmsg.rtmsg_flags = (RTF_ALLONLINK | RTF_ADDRCONF |
- RTF_DEFAULT | RTF_UP);
+ rtmsg.rtmsg_flags = (RTF_ALLONLINK | RTF_DEFAULT | RTF_UP);rtmsg.rtmsg_ifindex = ifp->idev->dev->ifindex;
@@ -1958,7 +1957,7 @@
/*
* Duplicate Address Detection
*/
-static void addrconf_dad_start(struct inet6_ifaddr *ifp)
+static void addrconf_dad_start(struct inet6_ifaddr *ifp, int flags)
{
struct net_device *dev;
unsigned long rand_num;
@@ -1968,7 +1967,7 @@
addrconf_join_solict(dev, &ifp->addr);if (ifp->prefix_len != 128 && (ifp->flags&IFA_F_PERMANENT)) - addrconf_prefix_route(&ifp->addr, ifp->prefix_len, dev, 0, RTF_ADDRCONF); + addrconf_prefix_route(&ifp->addr, ifp->prefix_len, dev, 0, flags);
net_srandom(ifp->addr.s6_addr32[3]); rand_num = net_random() % (ifp->idev->cnf.rtr_solicit_delay ? : 1); @@ -2451,6 +2450,42 @@ netlink_broadcast(rtnl, skb, 0, RTMGRP_IPV6_IFADDR, GFP_ATOMIC); }
+int inet6_dump_linkflags(struct sk_buff *skb, struct netlink_callback *cb)
+{
+ int ifindex, flags = 0;
+ struct net_device *dev;
+ struct inet6_dev *idev;
+ struct nlmsghdr *nlh;
+ struct ifp_if6info *ifp = NLMSG_DATA(cb->nlh);
+ unsigned char *org_tail = skb->tail;
+
+ ifindex = ifp->ifindex;
+
+ if ((dev = dev_get_by_index(ifindex)) == NULL)
+ goto out;
+ if ((idev = in6_dev_get(dev)) != NULL) {
+ flags = idev->if_flags;
+ in6_dev_put(idev);
+ }
+ dev_put(dev);
+
+ nlh = NLMSG_PUT(skb, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq,
+ RTA_LINKFLAGS, sizeof(*ifp));
+ ifp = NLMSG_DATA(nlh);
+ ifp->flags = flags;
+ ifp->ifindex = ifindex; /* duplicate information for user to verify */
+
+ nlh->nlmsg_len = skb->tail - org_tail;
+ return skb->len;
+
+nlmsg_failure:
+ printk(KERN_INFO "inet6_dump_linkflags:skb size not enough\n");
+ skb_trim(skb, org_tail - skb->data);
+
+out:
+ return -1;
+}
+
static struct rtnetlink_link inet6_rtnetlink_table[RTM_MAX - RTM_BASE + 1] = {
[RTM_NEWADDR - RTM_BASE] = { .doit = inet6_rtm_newaddr, },
[RTM_DELADDR - RTM_BASE] = { .doit = inet6_rtm_deladdr, },
@@ -2459,6 +2494,8 @@
[RTM_DELROUTE - RTM_BASE] = { .doit = inet6_rtm_delroute, },
[RTM_GETROUTE - RTM_BASE] = { .doit = inet6_rtm_getroute,
.dumpit = inet6_dump_fib, },
+ [RTM_GETLNKFLAGS - RTM_BASE] = { .dumpit = inet6_dump_linkflags, },
+ [RTM_GETPLIST - RTM_BASE] = { .dumpit = inet6_dump_prefix, },
};static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) diff -ruN linux-2.5.73.org/net/ipv6/ndisc.c linux-2.5.73.new/net/ipv6/ndisc.c --- linux-2.5.73.org/net/ipv6/ndisc.c 2003-06-22 11:32:56.000000000 -0700 +++ linux-2.5.73.new/net/ipv6/ndisc.c 2003-06-26 09:05:01.000000000 -0700 @@ -1036,6 +1036,16 @@ */ in6_dev->if_flags |= IF_RA_RCVD; } + /* + * Remember the managed/otherconf flags from most recently + * receieved RA message (RFC 2462) -- yoshfuji + */ + in6_dev->if_flags = (in6_dev->if_flags & ~(IF_RA_MANAGED| + IF_RA_OTHERCONF)) | + (ra_msg->icmph.icmp6_addrconf_managed ? + IF_RA_MANAGED : 0) | + (ra_msg->icmph.icmp6_addrconf_other ? + IF_RA_OTHERCONF : 0);
lifetime = ntohs(ra_msg->icmph.icmp6_rt_lifetime);
diff -ruN linux-2.5.73.org/net/ipv6/route.c linux-2.5.73.new/net/ipv6/route.c --- linux-2.5.73.org/net/ipv6/route.c 2003-06-22 11:33:05.000000000 -0700 +++ linux-2.5.73.new/net/ipv6/route.c 2003-06-26 09:05:01.000000000 -0700 @@ -1511,6 +1511,66 @@ return 0; }
+static int rt6_fill_prefix(struct sk_buff *skb, struct rt6_info *rt,
+ int type, u32 pid, u32 seq)
+{
+ struct in6_prefix_msg *pmsg;
+ struct nlmsghdr *nlh;
+ unsigned char *b = skb->tail;
+
+ nlh = NLMSG_PUT(skb, pid, seq, type, sizeof(*pmsg));
+ pmsg = NLMSG_DATA(nlh);
+ pmsg->ifindex = rt->rt6i_dev->ifindex;
+ pmsg->prefix_len = rt->rt6i_dst.plen;
+ ipv6_addr_copy(&pmsg->prefix, &rt->rt6i_dst.addr);
+ nlh->nlmsg_len = skb->tail - b;
+ return skb->len;
+
+nlmsg_failure:
+ printk(KERN_INFO "rt6_fill_prefix:skb size not enough\n");
+ skb_trim(skb, b - skb->data);
+ return -1;
+}
+
+static int rt6_dump_route_prefix(struct rt6_info *rt, void *p_arg)
+{
+ int addr_type;
+ struct rt6_rtnl_dump_arg *arg = (struct rt6_rtnl_dump_arg *) p_arg;
+
+ /*
+ * Definition of a prefix :
+ * - Should be autoconfigured
+ * - No nexthop
+ * - Not a linklocal, loopback or multicast type.
+ */
+ if (rt->rt6i_nexthop || (rt->rt6i_flags & RTF_ADDRCONF) == 0)
+ return 0;
+ addr_type = ipv6_addr_type(&rt->rt6i_dst.addr);
+ if ((addr_type & (IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK |
+ IPV6_ADDR_MULTICAST)) != 0 ||
+ addr_type == IPV6_ADDR_ANY)
+ return 0;
+ return rt6_fill_prefix(arg->skb, rt, RTM_GETPLIST,
+ NETLINK_CB(arg->cb->skb).pid, arg->cb->nlh->nlmsg_seq);
+}
+
+static int fib6_dump_prefix(struct fib6_walker_t *w)
+{
+ int res;
+ struct rt6_info *rt;
+
+ for (rt = w->leaf; rt; rt = rt->u.next) {
+ res = rt6_dump_route_prefix(rt, w->args);
+ if (res < 0) {
+ /* Frame is full, suspend walking */
+ w->leaf = rt;
+ return 1;
+ }
+ }
+ w->leaf = NULL;
+ return 0;
+}
+
static void fib6_dump_end(struct netlink_callback *cb)
{
struct fib6_walker_t *w = (void*)cb->args[0];
@@ -1532,7 +1592,8 @@
return cb->done(cb);
}-int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
+static int __inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb,
+ int prefix)
{
struct rt6_rtnl_dump_arg arg;
struct fib6_walker_t *w;
@@ -1559,7 +1620,10 @@
RT6_TRACE("dump<%p", w);
memset(w, 0, sizeof(*w));
w->root = &ip6_routing_table;
- w->func = fib6_dump_node;
+ if (prefix)
+ w->func = fib6_dump_prefix;
+ else
+ w->func = fib6_dump_node;
w->args = &arg;
cb->args[0] = (long)w;
read_lock_bh(&rt6_lock);
@@ -1586,6 +1650,16 @@
return res;
}+int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
+{
+ return __inet6_dump_fib(skb, cb, 0);
+}
+
+int inet6_dump_prefix(struct sk_buff *skb, struct netlink_callback *cb)
+{
+ return __inet6_dump_fib(skb, cb, 1);
+}
+
int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg)
{
struct rtattr **rta = arg;
- : send the line "unsubscribe linux-net" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
