} else if (strcmp(tpstr, "__p2pcl") == 0) {
*type = NL80211_IFTYPE_P2P_CLIENT;
return 0;
+ } else if (strcmp(tpstr, "__p2pdev") == 0) {
+ *type = NL80211_IFTYPE_P2P_DEVICE;
+ return 0;
} else if (strcmp(tpstr, "__p2pgo") == 0) {
*type = NL80211_IFTYPE_P2P_GO;
return 0;
static int handle_interface_add(struct nl80211_state *state,
struct nl_cb *cb,
struct nl_msg *msg,
- int argc, char **argv)
+ int argc, char **argv,
+ enum id_input id)
{
char *name;
char *mesh_id = NULL;
static int handle_interface_del(struct nl80211_state *state,
struct nl_cb *cb,
struct nl_msg *msg,
- int argc, char **argv)
+ int argc, char **argv,
+ enum id_input id)
{
return 0;
}
"Remove this virtual interface");
HIDDEN(interface, del, NULL, NL80211_CMD_DEL_INTERFACE, 0, CIB_NETDEV, handle_interface_del);
+static char *channel_type_name(enum nl80211_channel_type channel_type)
+{
+ switch (channel_type) {
+ case NL80211_CHAN_NO_HT:
+ return "NO HT";
+ case NL80211_CHAN_HT20:
+ return "HT20";
+ case NL80211_CHAN_HT40MINUS:
+ return "HT40-";
+ case NL80211_CHAN_HT40PLUS:
+ return "HT40+";
+ default:
+ return "unknown";
+ }
+}
+
static int print_iface_handler(struct nl_msg *msg, void *arg)
{
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
if (tb_msg[NL80211_ATTR_IFNAME])
printf("%sInterface %s\n", indent, nla_get_string(tb_msg[NL80211_ATTR_IFNAME]));
+ else
+ printf("%sUnnamed/non-netdev interface\n", indent);
if (tb_msg[NL80211_ATTR_IFINDEX])
printf("%s\tifindex %d\n", indent, nla_get_u32(tb_msg[NL80211_ATTR_IFINDEX]));
+ if (tb_msg[NL80211_ATTR_WDEV])
+ printf("%s\twdev 0x%llx\n", indent,
+ (unsigned long long)nla_get_u64(tb_msg[NL80211_ATTR_WDEV]));
+ if (tb_msg[NL80211_ATTR_MAC]) {
+ char mac_addr[20];
+ mac_addr_n2a(mac_addr, nla_data(tb_msg[NL80211_ATTR_MAC]));
+ printf("%s\taddr %s\n", indent, mac_addr);
+ }
if (tb_msg[NL80211_ATTR_IFTYPE])
printf("%s\ttype %s\n", indent, iftype_name(nla_get_u32(tb_msg[NL80211_ATTR_IFTYPE])));
+ if (!wiphy && tb_msg[NL80211_ATTR_WIPHY])
+ 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])
+ channel_type = nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
+
+ printf("%s\tchannel %d (%d MHz) %s\n", indent,
+ ieee80211_frequency_to_channel(freq), freq,
+ channel_type_name(channel_type));
+ }
return NL_SKIP;
}
static int handle_interface_info(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_iface_handler, NULL);
return 0;
static int handle_interface_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)
{
if (!argc)
return 1;
static int handle_interface_meshid(struct nl80211_state *state,
struct nl_cb *cb,
struct nl_msg *msg,
- int argc, char **argv)
+ int argc, char **argv,
+ enum id_input id)
{
char *mesh_id = NULL;
static int handle_dev_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)
{
dev_dump_wiphy = -1;
nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_iface_handler, &dev_dump_wiphy);
static int handle_interface_type(struct nl80211_state *state,
struct nl_cb *cb,
struct nl_msg *msg,
- int argc, char **argv)
+ int argc, char **argv,
+ enum id_input id)
{
enum nl80211_iftype type;
int tpset;
IFACE_TYPES);
static int handle_interface_4addr(struct nl80211_state *state,
- struct nl_cb *cb,
- struct nl_msg *msg,
- int argc, char **argv)
+ struct nl_cb *cb,
+ struct nl_msg *msg,
+ int argc, char **argv,
+ enum id_input id)
{
if (argc != 1)
return 1;
}
COMMAND(set, 4addr, "<on|off>",
NL80211_CMD_SET_INTERFACE, 0, CIB_NETDEV, handle_interface_4addr,
- "Set interface 4addr (WDS) mode.\n");
+ "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)
+{
+ uint16_t noack_map;
+ char *end;
+
+ if (argc != 1)
+ return 1;
+
+ noack_map = strtoul(argv[0], &end, 16);
+ if (*end)
+ return 1;
+
+ NLA_PUT_U16(msg, NL80211_ATTR_NOACK_MAP, noack_map);
+
+ return 0;
+ nla_put_failure:
+ return -ENOBUFS;
+
+}
+COMMAND(set, noack_map, "<map>",
+ NL80211_CMD_SET_NOACK_MAP, 0, CIB_NETDEV, handle_interface_noack_map,
+ "Set the NoAck map for the TIDs. (0x0009 = BE, 0x0006 = BK, 0x0030 = VI, 0x00C0 = VO)");
+
static int handle_interface_wds_peer(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 mac_addr[ETH_ALEN];
return 1;
if (mac_addr_a2n(mac_addr, argv[0])) {
- fprintf(stderr, "invalid mac address\n");
+ fprintf(stderr, "Invalid MAC address\n");
return 2;
}
}
COMMAND(set, peer, "<MAC address>",
NL80211_CMD_SET_WDS_PEER, 0, CIB_NETDEV, handle_interface_wds_peer,
- "Set interface wds peer.\n");
+ "Set interface WDS peer.");