update nl80211.h

[thirdparty/iw.git] / mpath.c

diff --git a/mpath.c b/mpath.c
index e8484816bf24268497d63980ff25141315cf2114..2a559c293cc0db2b74358106cfd4f704bacae4df 100644 (file)
--- a/mpath.c
+++ b/mpath.c
@@ -23,12 +23,6 @@ enum plink_state {
        BLOCKED
 };
 
-enum plink_actions {
-       PLINK_ACTION_UNDEFINED,
-       PLINK_ACTION_OPEN,
-       PLINK_ACTION_BLOCK,
-};
-
 
 static int print_mpath_handler(struct nl_msg *msg, void *arg)
 {
@@ -38,12 +32,14 @@ static int print_mpath_handler(struct nl_msg *msg, void *arg)
        char dst[20], next_hop[20], dev[20];
        static struct nla_policy mpath_policy[NL80211_MPATH_INFO_MAX + 1] = {
                [NL80211_MPATH_INFO_FRAME_QLEN] = { .type = NLA_U32 },
-               [NL80211_MPATH_INFO_DSN] = { .type = NLA_U32 },
+               [NL80211_MPATH_INFO_SN] = { .type = NLA_U32 },
                [NL80211_MPATH_INFO_METRIC] = { .type = NLA_U32 },
                [NL80211_MPATH_INFO_EXPTIME] = { .type = NLA_U32 },
                [NL80211_MPATH_INFO_DISCOVERY_TIMEOUT] = { .type = NLA_U32 },
                [NL80211_MPATH_INFO_DISCOVERY_RETRIES] = { .type = NLA_U8 },
                [NL80211_MPATH_INFO_FLAGS] = { .type = NLA_U8 },
+               [NL80211_MPATH_INFO_HOP_COUNT] = { .type = NLA_U8 },
+               [NL80211_MPATH_INFO_PATH_CHANGE] = { .type = NLA_U32 },
        };
 
        nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
@@ -56,13 +52,13 @@ static int print_mpath_handler(struct nl_msg *msg, void *arg)
         */
 
        if (!tb[NL80211_ATTR_MPATH_INFO]) {
-               fprintf(stderr, "mpath info missing!");
+               fprintf(stderr, "mpath info missing!\n");
                return NL_SKIP;
        }
        if (nla_parse_nested(pinfo, NL80211_MPATH_INFO_MAX,
                             tb[NL80211_ATTR_MPATH_INFO],
                             mpath_policy)) {
-               fprintf(stderr, "failed to parse nested attributes!");
+               fprintf(stderr, "failed to parse nested attributes!\n");
                return NL_SKIP;
        }
 
@@ -70,9 +66,9 @@ static int print_mpath_handler(struct nl_msg *msg, void *arg)
        mac_addr_n2a(next_hop, nla_data(tb[NL80211_ATTR_MPATH_NEXT_HOP]));
        if_indextoname(nla_get_u32(tb[NL80211_ATTR_IFINDEX]), dev);
        printf("%s %s %s", dst, next_hop, dev);
-       if (pinfo[NL80211_MPATH_INFO_DSN])
+       if (pinfo[NL80211_MPATH_INFO_SN])
                printf("\t%u",
-                       nla_get_u32(pinfo[NL80211_MPATH_INFO_DSN]));
+                       nla_get_u32(pinfo[NL80211_MPATH_INFO_SN]));
        if (pinfo[NL80211_MPATH_INFO_METRIC])
                printf("\t%u",
                        nla_get_u32(pinfo[NL80211_MPATH_INFO_METRIC]));
@@ -91,15 +87,60 @@ static int print_mpath_handler(struct nl_msg *msg, void *arg)
        if (pinfo[NL80211_MPATH_INFO_FLAGS])
                printf("\t0x%x",
                        nla_get_u8(pinfo[NL80211_MPATH_INFO_FLAGS]));
+       if (pinfo[NL80211_MPATH_INFO_HOP_COUNT])
+               printf("\t%u",
+                      nla_get_u8(pinfo[NL80211_MPATH_INFO_HOP_COUNT]));
+       if (pinfo[NL80211_MPATH_INFO_PATH_CHANGE])
+               printf("\t%u",
+                      nla_get_u32(pinfo[NL80211_MPATH_INFO_PATH_CHANGE]));
 
        printf("\n");
        return NL_SKIP;
 }
 
+static int handle_mpath_probe(struct nl80211_state *state,
+                             struct nl_msg *msg,
+                             int argc, char **argv,
+                             enum id_input id)
+{
+       unsigned char dst[ETH_ALEN];
+       unsigned char *frame;
+       size_t frame_len;
+
+       if (argc < 3)
+               return 1;
+
+       if (mac_addr_a2n(dst, argv[0])) {
+               fprintf(stderr, "invalid mac address\n");
+               return 2;
+       }
+
+       if (strcmp("frame", argv[1]) != 0)
+               return 1;
+
+       frame = parse_hex(argv[2], &frame_len);
+       if (!frame) {
+               fprintf(stderr, "invalid frame pattern: %p\n", frame);
+               return 2;
+       }
+
+       NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, dst);
+       NLA_PUT(msg, NL80211_ATTR_FRAME, frame_len, frame);
+
+       return 0;
+ nla_put_failure:
+       return -ENOBUFS;
+}
+COMMAND(mpath, probe, "<destination MAC address> frame <frame>",
+       NL80211_CMD_PROBE_MESH_LINK, 0, CIB_NETDEV, handle_mpath_probe,
+       "Inject ethernet frame to given peer overriding the next hop\n"
+       "lookup from mpath table.\n."
+       "Example: iw dev wlan0 mpath probe xx:xx:xx:xx:xx:xx frame 01:xx:xx:00\n");
+
 static int handle_mpath_get(struct nl80211_state *state,
-                           struct nl_cb *cb,
                            struct nl_msg *msg,
-                           int argc, char **argv)
+                           int argc, char **argv,
+                           enum id_input id)
 {
        unsigned char dst[ETH_ALEN];
 
@@ -118,7 +159,7 @@ static int handle_mpath_get(struct nl80211_state *state,
 
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, dst);
 
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_mpath_handler, NULL);
+       register_handler(print_mpath_handler, NULL);
 
        return 0;
  nla_put_failure:
@@ -132,9 +173,9 @@ COMMAND(mpath, del, "<MAC address>",
        "Remove the mesh path to the given node.");
 
 static int handle_mpath_set(struct nl80211_state *state,
-                           struct nl_cb *cb,
                            struct nl_msg *msg,
-                           int argc, char **argv)
+                           int argc, char **argv,
+                           enum id_input id)
 {
        unsigned char dst[ETH_ALEN];
        unsigned char next_hop[ETH_ALEN];
@@ -167,7 +208,7 @@ static int handle_mpath_set(struct nl80211_state *state,
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, dst);
        NLA_PUT(msg, NL80211_ATTR_MPATH_NEXT_HOP, ETH_ALEN, next_hop);
 
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_mpath_handler, NULL);
+       register_handler(print_mpath_handler, NULL);
        return 0;
  nla_put_failure:
        return -ENOBUFS;
@@ -180,11 +221,13 @@ COMMAND(mpath, set, "<destination MAC address> next_hop <next hop MAC address>",
        "Set an existing mesh path's next hop.");
 
 static int handle_mpath_dump(struct nl80211_state *state,
-                            struct nl_cb *cb,
                             struct nl_msg *msg,
-                            int argc, char **argv)
+                            int argc, char **argv,
+                            enum id_input id)
 {
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_mpath_handler, NULL);
+       printf("DEST ADDR         NEXT HOP          IFACE\tSN\tMETRIC\tQLEN\t"
+              "EXPTIME\tDTIM\tDRET\tFLAGS\tHOP_COUNT\tPATH_CHANGE\n");
+       register_handler(print_mpath_handler, NULL);
        return 0;
 }
 COMMAND(mpath, dump, NULL,