genl: ctrl: print op -> policy idx mapping

Newer kernels can dump per-op policies, so print out the new
mapping attribute to indicate which op has which policy.

v2:
 * print out both do/dump policy idx
v3:
 * fix userspace API which renumbered after patch rebasing

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/genl/ctrl.c b/genl/ctrl.c
index 68099fe97f1a5554657c2a4dd574410757665c9b..549bc6635831fb32337f966c0e9c97b8514191a3 100644 (file)
--- a/genl/ctrl.c
+++ b/genl/ctrl.c
@@ -162,6 +162,33 @@ static int print_ctrl(struct rtnl_ctrl_data *ctrl,
                __u32 *ma = RTA_DATA(tb[CTRL_ATTR_MAXATTR]);
                fprintf(fp, " max attribs: %d ",*ma);
        }
+       if (tb[CTRL_ATTR_OP_POLICY]) {
+               const struct rtattr *pos;
+
+               rtattr_for_each_nested(pos, tb[CTRL_ATTR_OP_POLICY]) {
+                       struct rtattr *ptb[CTRL_ATTR_POLICY_DUMP_MAX + 1];
+                       struct rtattr *pattrs = RTA_DATA(pos);
+                       int plen = RTA_PAYLOAD(pos);
+
+                       parse_rtattr_flags(ptb, CTRL_ATTR_POLICY_DUMP_MAX,
+                                          pattrs, plen, NLA_F_NESTED);
+
+                       fprintf(fp, " op %d policies:",
+                               pos->rta_type & ~NLA_F_NESTED);
+
+                       if (ptb[CTRL_ATTR_POLICY_DO]) {
+                               __u32 *v = RTA_DATA(ptb[CTRL_ATTR_POLICY_DO]);
+
+                               fprintf(fp, " do=%d", *v);
+                       }
+
+                       if (ptb[CTRL_ATTR_POLICY_DUMP]) {
+                               __u32 *v = RTA_DATA(ptb[CTRL_ATTR_POLICY_DUMP]);
+
+                               fprintf(fp, " dump=%d", *v);
+                       }
+               }
+       }
        if (tb[CTRL_ATTR_POLICY])
                nl_print_policy(tb[CTRL_ATTR_POLICY], fp);