]> git.ipfire.org Git - thirdparty/iw.git/blobdiff - interface.c
ibss: use correct "MHz" instead of "MHZ"
[thirdparty/iw.git] / interface.c
index 5a7647a9c7f019f39a9f13ae69929e3018badfa8..4f0821d3942f544aaddbb17024a7178441321204 100644 (file)
@@ -16,7 +16,8 @@
                        "fcsfail:  show frames with FCS errors\n"\
                        "control:  show control frames\n"\
                        "otherbss: show frames from other BSSes\n"\
-                       "cook:     use cooked mode"
+                       "cook:     use cooked mode\n"\
+                       "active:   use active mode (ACK incoming unicast packets)"
 
 SECTION(interface);
 
@@ -27,6 +28,7 @@ static char *mntr_flags[NL80211_MNTR_FLAG_MAX + 1] = {
        "control",
        "otherbss",
        "cook",
+       "active",
 };
 
 static int parse_mntr_flags(int *_argc, char ***_argv,
@@ -102,6 +104,9 @@ static int get_if_type(int *argc, char ***argv, enum nl80211_iftype *type,
            strcmp(tpstr, "ibss") == 0) {
                *type = NL80211_IFTYPE_ADHOC;
                return 0;
+       } else if (strcmp(tpstr, "ocb") == 0) {
+               *type = NL80211_IFTYPE_OCB;
+               return 0;
        } else if (strcmp(tpstr, "monitor") == 0) {
                *type = NL80211_IFTYPE_MONITOR;
                return 0;
@@ -160,7 +165,6 @@ nla_put_failure:
 }
 
 static int handle_interface_add(struct nl80211_state *state,
-                               struct nl_cb *cb,
                                struct nl_msg *msg,
                                int argc, char **argv,
                                enum id_input id)
@@ -169,6 +173,8 @@ static int handle_interface_add(struct nl80211_state *state,
        char *mesh_id = NULL;
        enum nl80211_iftype type;
        int tpset;
+       unsigned char mac_addr[ETH_ALEN];
+       int found_mac = 0;
 
        if (argc < 1)
                return 1;
@@ -181,6 +187,7 @@ static int handle_interface_add(struct nl80211_state *state,
        if (tpset)
                return tpset;
 
+try_another:
        if (argc) {
                if (strcmp(argv[0], "mesh_id") == 0) {
                        argc--;
@@ -191,6 +198,17 @@ static int handle_interface_add(struct nl80211_state *state,
                        mesh_id = argv[0];
                        argc--;
                        argv++;
+               } else if (strcmp(argv[0], "addr") == 0) {
+                       argc--;
+                       argv++;
+                       if (mac_addr_a2n(mac_addr, argv[0])) {
+                               fprintf(stderr, "Invalid MAC address\n");
+                               return 2;
+                       }
+                       argc--;
+                       argv++;
+                       found_mac = 1;
+                       goto try_another;
                } else if (strcmp(argv[0], "4addr") == 0) {
                        argc--;
                        argv++;
@@ -219,23 +237,24 @@ static int handle_interface_add(struct nl80211_state *state,
        NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, type);
        if (mesh_id)
                NLA_PUT(msg, NL80211_ATTR_MESH_ID, strlen(mesh_id), mesh_id);
+       if (found_mac)
+               NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, mac_addr);
 
        return 0;
  nla_put_failure:
        return -ENOBUFS;
 }
-COMMAND(interface, add, "<name> type <type> [mesh_id <meshid>] [4addr on|off] [flags <flag>*]",
+COMMAND(interface, add, "<name> type <type> [mesh_id <meshid>] [4addr on|off] [flags <flag>*] [addr <mac-addr>]",
        NL80211_CMD_NEW_INTERFACE, 0, CIB_PHY, handle_interface_add,
        "Add a new virtual interface with the given configuration.\n"
        IFACE_TYPES "\n\n"
        "The flags are only used for monitor interfaces, valid flags are:\n"
        VALID_FLAGS "\n\n"
        "The mesh_id is used only for mesh mode.");
-COMMAND(interface, add, "<name> type <type> [mesh_id <meshid>] [4addr on|off] [flags <flag>*]",
+COMMAND(interface, add, "<name> type <type> [mesh_id <meshid>] [4addr on|off] [flags <flag>*] [addr <mac-addr>]",
        NL80211_CMD_NEW_INTERFACE, 0, CIB_NETDEV, handle_interface_add, NULL);
 
 static int handle_interface_del(struct nl80211_state *state,
-                               struct nl_cb *cb,
                                struct nl_msg *msg,
                                int argc, char **argv,
                                enum id_input id)
@@ -262,6 +281,26 @@ static char *channel_type_name(enum nl80211_channel_type channel_type)
        }
 }
 
+char *channel_width_name(enum nl80211_chan_width width)
+{
+       switch (width) {
+       case NL80211_CHAN_WIDTH_20_NOHT:
+               return "20 MHz (no HT)";
+       case NL80211_CHAN_WIDTH_20:
+               return "20 MHz";
+       case NL80211_CHAN_WIDTH_40:
+               return "40 MHz";
+       case NL80211_CHAN_WIDTH_80:
+               return "80 MHz";
+       case NL80211_CHAN_WIDTH_80P80:
+               return "80+80 MHz";
+       case NL80211_CHAN_WIDTH_160:
+               return "160 MHz";
+       default:
+               return "unknown";
+       }
+}
+
 static int print_iface_handler(struct nl_msg *msg, void *arg)
 {
        struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
@@ -306,33 +345,51 @@ static int print_iface_handler(struct nl_msg *msg, void *arg)
                printf("%s\twiphy %d\n", indent, nla_get_u32(tb_msg[NL80211_ATTR_WIPHY]));
        if (tb_msg[NL80211_ATTR_WIPHY_FREQ]) {
                uint32_t freq = nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_FREQ]);
-               enum nl80211_channel_type channel_type = NL80211_CHAN_NO_HT;
 
-               if (tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE])
+               printf("%s\tchannel %d (%d MHz)", indent,
+                      ieee80211_frequency_to_channel(freq), freq);
+
+               if (tb_msg[NL80211_ATTR_CHANNEL_WIDTH]) {
+                       printf(", width: %s",
+                               channel_width_name(nla_get_u32(tb_msg[NL80211_ATTR_CHANNEL_WIDTH])));
+                       if (tb_msg[NL80211_ATTR_CENTER_FREQ1])
+                               printf(", center1: %d MHz",
+                                       nla_get_u32(tb_msg[NL80211_ATTR_CENTER_FREQ1]));
+                       if (tb_msg[NL80211_ATTR_CENTER_FREQ2])
+                               printf(", center2: %d MHz",
+                                       nla_get_u32(tb_msg[NL80211_ATTR_CENTER_FREQ2]));
+               } else if (tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
+                       enum nl80211_channel_type channel_type;
+
                        channel_type = nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
+                       printf(" %s", channel_type_name(channel_type));
+               }
+
+               printf("\n");
+       }
+
+       if (tb_msg[NL80211_ATTR_WIPHY_TX_POWER_LEVEL]) {
+               uint32_t txp = nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_TX_POWER_LEVEL]);
 
-               printf("%s\tchannel %d (%d MHz) %s\n", indent,
-                      ieee80211_frequency_to_channel(freq), freq,
-                      channel_type_name(channel_type));
+               printf("%s\ttxpower %d.%.2d dBm\n",
+                      indent, txp / 100, txp % 100);
        }
 
        return NL_SKIP;
 }
 
 static int handle_interface_info(struct nl80211_state *state,
-                                struct nl_cb *cb,
                                 struct nl_msg *msg,
                                 int argc, char **argv,
                                 enum id_input id)
 {
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_iface_handler, NULL);
+       register_handler(print_iface_handler, NULL);
        return 0;
 }
 TOPLEVEL(info, NULL, NL80211_CMD_GET_INTERFACE, 0, CIB_NETDEV, handle_interface_info,
         "Show information for this interface.");
 
 static int handle_interface_set(struct nl80211_state *state,
-                               struct nl_cb *cb,
                                struct nl_msg *msg,
                                int argc, char **argv,
                                enum id_input id)
@@ -363,7 +420,6 @@ COMMAND(set, monitor, "<flag>*",
        VALID_FLAGS);
 
 static int handle_interface_meshid(struct nl80211_state *state,
-                                  struct nl_cb *cb,
                                   struct nl_msg *msg,
                                   int argc, char **argv,
                                   enum id_input id)
@@ -387,20 +443,18 @@ COMMAND(set, meshid, "<meshid>",
 static unsigned int dev_dump_wiphy;
 
 static int handle_dev_dump(struct nl80211_state *state,
-                          struct nl_cb *cb,
                           struct nl_msg *msg,
                           int argc, char **argv,
                           enum id_input id)
 {
        dev_dump_wiphy = -1;
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_iface_handler, &dev_dump_wiphy);
+       register_handler(print_iface_handler, &dev_dump_wiphy);
        return 0;
 }
 TOPLEVEL(dev, NULL, NL80211_CMD_GET_INTERFACE, NLM_F_DUMP, CIB_NONE, handle_dev_dump,
         "List all network interfaces for wireless hardware.");
 
 static int handle_interface_type(struct nl80211_state *state,
-                                struct nl_cb *cb,
                                 struct nl_msg *msg,
                                 int argc, char **argv,
                                 enum id_input id)
@@ -427,7 +481,6 @@ COMMAND(set, type, "<type>",
        IFACE_TYPES);
 
 static int handle_interface_4addr(struct nl80211_state *state,
-                                 struct nl_cb *cb,
                                  struct nl_msg *msg,
                                  int argc, char **argv,
                                  enum id_input id)
@@ -441,7 +494,6 @@ COMMAND(set, 4addr, "<on|off>",
        "Set interface 4addr (WDS) mode.");
 
 static int handle_interface_noack_map(struct nl80211_state *state,
-                                     struct nl_cb *cb,
                                      struct nl_msg *msg,
                                      int argc, char **argv,
                                      enum id_input id)
@@ -469,7 +521,6 @@ COMMAND(set, noack_map, "<map>",
 
 
 static int handle_interface_wds_peer(struct nl80211_state *state,
-                                    struct nl_cb *cb,
                                     struct nl_msg *msg,
                                     int argc, char **argv,
                                     enum id_input id)
@@ -501,7 +552,6 @@ COMMAND(set, peer, "<MAC address>",
        "Set interface WDS peer.");
 
 static int set_mcast_rate(struct nl80211_state *state,
-                         struct nl_cb *cb,
                          struct nl_msg *msg,
                          int argc, char **argv,
                          enum id_input id)