]> git.ipfire.org Git - thirdparty/iw.git/blobdiff - mpath.c
add a few new commands/events
[thirdparty/iw.git] / mpath.c
diff --git a/mpath.c b/mpath.c
index fab87010d29500d92bd879418f4f783722bb0abc..ff0b7419fd2be08888b7801956f9967a36b6fbb0 100644 (file)
--- a/mpath.c
+++ b/mpath.c
@@ -1,15 +1,18 @@
+#include <net/if.h>
 #include <errno.h>
+#include <string.h>
+
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
 #include <netlink/genl/ctrl.h>
 #include <netlink/msg.h>
 #include <netlink/attr.h>
-#include <linux/nl80211.h>
-
-#include <net/if.h>
 
+#include "nl80211.h"
 #include "iw.h"
 
+SECTION(mpath);
+
 enum plink_state {
        LISTEN,
        OPN_SNT,
@@ -20,27 +23,6 @@ enum plink_state {
        BLOCKED
 };
 
-enum plink_actions {
-       PLINK_ACTION_UNDEFINED,
-       PLINK_ACTION_OPEN,
-       PLINK_ACTION_BLOCK,
-};
-
-
-static int wait_handler(struct nl_msg *msg, void *arg)
-{
-       int *finished = arg;
-
-       *finished = 1;
-       return NL_STOP;
-}
-
-static int error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err,
-                        void *arg)
-{
-       fprintf(stderr, "nl80211 error %d\n", err->error);
-       exit(err->error);
-}
 
 static int print_mpath_handler(struct nl_msg *msg, void *arg)
 {
@@ -50,7 +32,7 @@ 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 },
@@ -68,13 +50,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;
        }
 
@@ -82,9 +64,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]));
@@ -109,282 +91,98 @@ static int print_mpath_handler(struct nl_msg *msg, void *arg)
 }
 
 static int handle_mpath_get(struct nl80211_state *state,
-                               char *dev, int argc, char **argv)
+                           struct nl_msg *msg,
+                           int argc, char **argv,
+                           enum id_input id)
 {
-       struct nl_msg *msg;
-       struct nl_cb *cb = NULL;
-       int ret = -1;
-       int err;
-       int finished = 0;
        unsigned char dst[ETH_ALEN];
 
-       if (argc < 1) {
-               fprintf(stderr, "not enough arguments\n");
-               return -1;
-       }
+       if (argc < 1)
+               return 1;
 
        if (mac_addr_a2n(dst, argv[0])) {
                fprintf(stderr, "invalid mac address\n");
-               return -1;
+               return 2;
        }
        argc--;
        argv++;
 
-       if (argc) {
-               fprintf(stderr, "too many arguments\n");
-               return -1;
-       }
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               goto out;
-
-       genlmsg_put(msg, 0, 0, genl_family_get_id(state->nl80211), 0,
-                   0, NL80211_CMD_GET_MPATH, 0);
+       if (argc)
+               return 1;
 
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, dst);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(dev));
-
-       cb = nl_cb_alloc(NL_CB_CUSTOM);
-       if (!cb)
-               goto out;
-
-       if (nl_send_auto_complete(state->nl_handle, msg) < 0)
-               goto out;
 
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_mpath_handler, NULL);
-       nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, wait_handler, &finished);
-       nl_cb_err(cb, NL_CB_CUSTOM, error_handler, NULL);
+       register_handler(print_mpath_handler, NULL);
 
-       err = nl_recvmsgs(state->nl_handle, cb);
-
-       if (!finished)
-               err = nl_wait_for_ack(state->nl_handle);
-
-       if (err < 0)
-               goto out;
-
-       ret = 0;
-
- out:
-       nl_cb_put(cb);
+       return 0;
  nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
+       return -ENOBUFS;
 }
-
-static int handle_mpath_set(struct nl80211_state *state, int new,
-                               char *dev, int argc, char **argv)
+COMMAND(mpath, get, "<MAC address>",
+       NL80211_CMD_GET_MPATH, 0, CIB_NETDEV, handle_mpath_get,
+       "Get information on mesh path to the given node.");
+COMMAND(mpath, del, "<MAC address>",
+       NL80211_CMD_DEL_MPATH, 0, CIB_NETDEV, handle_mpath_get,
+       "Remove the mesh path to the given node.");
+
+static int handle_mpath_set(struct nl80211_state *state,
+                           struct nl_msg *msg,
+                           int argc, char **argv,
+                           enum id_input id)
 {
-       struct nl_msg *msg;
-       struct nl_cb *cb = NULL;
-       int ret = -1;
-       int err, command;
-       int finished = 0;
        unsigned char dst[ETH_ALEN];
        unsigned char next_hop[ETH_ALEN];
 
-       if (argc < 3) {
-               fprintf(stderr, "not enough arguments\n");
-               return -1;
-       }
+       if (argc < 3)
+               return 1;
 
        if (mac_addr_a2n(dst, argv[0])) {
                fprintf(stderr, "invalid destination mac address\n");
-               return -1;
+               return 2;
        }
        argc--;
        argv++;
 
-       if (strcmp("next_hop", argv[0]) != 0) {
-               fprintf(stderr, "parameter not supported\n");
-               return -1;
-       }
+       if (strcmp("next_hop", argv[0]) != 0)
+               return 1;
        argc--;
        argv++;
 
        if (mac_addr_a2n(next_hop, argv[0])) {
                fprintf(stderr, "invalid next hop mac address\n");
-               return -1;
+               return 2;
        }
        argc--;
        argv++;
 
-       if (argc) {
-               fprintf(stderr, "too many arguments\n");
-               return -1;
-       }
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               goto out;
-
-       command = new ? NL80211_CMD_NEW_MPATH : NL80211_CMD_SET_MPATH;
-       genlmsg_put(msg, 0, 0, genl_family_get_id(state->nl80211), 0, 0,
-                   command, 0);
+       if (argc)
+               return 1;
 
        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, dst);
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(dev));
        NLA_PUT(msg, NL80211_ATTR_MPATH_NEXT_HOP, ETH_ALEN, next_hop);
 
-       cb = nl_cb_alloc(NL_CB_CUSTOM);
-       if (!cb)
-               goto out;
-
-       if (nl_send_auto_complete(state->nl_handle, msg) < 0)
-               goto out;
-
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_mpath_handler, NULL);
-       nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, wait_handler, &finished);
-       nl_cb_err(cb, NL_CB_CUSTOM, error_handler, NULL);
-
-       err = nl_recvmsgs(state->nl_handle, cb);
-
-       if (!finished)
-               err = nl_wait_for_ack(state->nl_handle);
-
-       if (err < 0)
-               goto out;
-
-       ret = 0;
-
- out:
-       nl_cb_put(cb);
- nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
-}
-
-static int handle_mpath_del(struct nl80211_state *state,
-                               char *dev, int argc, char **argv)
-{
-       struct nl_msg *msg;
-       struct nl_cb *cb = NULL;
-       int ret = -1;
-       int err;
-       int finished = 0;
-       unsigned char dst[ETH_ALEN];
-
-       if (argc > 1) {
-               fprintf(stderr, "too many arguments\n");
-               return -1;
-       }
-
-       if (argc && mac_addr_a2n(dst, argv[0])) {
-               fprintf(stderr, "invalid mac address\n");
-               return -1;
-       }
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               goto out;
-
-       genlmsg_put(msg, 0, 0, genl_family_get_id(state->nl80211), 0, 0,
-                   NL80211_CMD_DEL_MPATH, 0);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(dev));
-       if (argc)
-               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, dst);
-
-       cb = nl_cb_alloc(NL_CB_CUSTOM);
-       if (!cb)
-               goto out;
-
-       if (nl_send_auto_complete(state->nl_handle, msg) < 0)
-               goto out;
-
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_mpath_handler, NULL);
-       nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, wait_handler, &finished);
-       nl_cb_err(cb, NL_CB_CUSTOM, error_handler, NULL);
-
-       err = nl_recvmsgs(state->nl_handle, cb);
-
-       if (!finished)
-               err = nl_wait_for_ack(state->nl_handle);
-
-       if (err < 0)
-               goto out;
-
-       ret = 0;
-
- out:
-       nl_cb_put(cb);
+       register_handler(print_mpath_handler, NULL);
+       return 0;
  nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
+       return -ENOBUFS;
 }
+COMMAND(mpath, new, "<destination MAC address> next_hop <next hop MAC address>",
+       NL80211_CMD_NEW_MPATH, 0, CIB_NETDEV, handle_mpath_set,
+       "Create a new mesh path (instead of relying on automatic discovery).");
+COMMAND(mpath, set, "<destination MAC address> next_hop <next hop MAC address>",
+       NL80211_CMD_SET_MPATH, 0, CIB_NETDEV, handle_mpath_set,
+       "Set an existing mesh path's next hop.");
 
 static int handle_mpath_dump(struct nl80211_state *state,
-                               char *dev, int argc, char **argv)
-{
-       struct nl_msg *msg;
-       struct nl_cb *cb = NULL;
-       int ret = -1;
-       int err;
-       int finished = 0;
-
-       if (argc) {
-               fprintf(stderr, "too many arguments\n");
-               return -1;
-       }
-
-       msg = nlmsg_alloc();
-       if (!msg)
-               goto out;
-
-       genlmsg_put(msg, 0, 0, genl_family_get_id(state->nl80211), 0,
-                   NLM_F_DUMP, NL80211_CMD_GET_MPATH, 0);
-
-       NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(dev));
-
-       cb = nl_cb_alloc(NL_CB_CUSTOM);
-       if (!cb)
-               goto out;
-
-       if (nl_send_auto_complete(state->nl_handle, msg) < 0)
-               goto out;
-
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_mpath_handler, NULL);
-       nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, wait_handler, &finished);
-
-       err = nl_recvmsgs(state->nl_handle, cb);
-
-       if (err < 0)
-               goto out;
-
-       ret = 0;
-
- out:
-       nl_cb_put(cb);
- nla_put_failure:
-       nlmsg_free(msg);
-       return ret;
-}
-
-int handle_mpath(struct nl80211_state *state,
-                  char *dev, int argc, char **argv)
+                            struct nl_msg *msg,
+                            int argc, char **argv,
+                            enum id_input id)
 {
-       char *cmd = argv[0];
-
-       if (argc < 1) {
-               fprintf(stderr, "you must specify an mpath command\n");
-               return -1;
-       }
-
-       argc--;
-       argv++;
-
-       if (strcmp(cmd, "new") == 0)
-               return handle_mpath_set(state, 1, dev, argc, argv);
-       if (strcmp(cmd, "del") == 0)
-               return handle_mpath_del(state, dev, argc, argv);
-       if (strcmp(cmd, "get") == 0)
-               return handle_mpath_get(state, dev, argc, argv);
-       if (strcmp(cmd, "set") == 0)
-               return handle_mpath_set(state, 0, dev, argc, argv);
-       if (strcmp(cmd, "dump") == 0)
-               return handle_mpath_dump(state, dev, argc, argv);
-
-       printf("invalid interface command %s\n", cmd);
-       return -1;
+       printf("DEST ADDR         NEXT HOP          IFACE\tSN\tMETRIC\tQLEN\t"
+              "EXPTIME\t\tDTIM\tDRET\tFLAGS\n");
+       register_handler(print_mpath_handler, NULL);
+       return 0;
 }
+COMMAND(mpath, dump, NULL,
+       NL80211_CMD_GET_MPATH, NLM_F_DUMP, CIB_NETDEV, handle_mpath_dump,
+       "List known mesh paths.");