-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE
-#endif
#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 <strings.h>
#include "nl80211.h"
#include "iw.h"
SECTION(ibss);
static int join_ibss(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 *end;
+ struct chandef chandef;
unsigned char abssid[6];
unsigned char rates[NL80211_MAX_SUPP_RATES];
int n_rates = 0;
char *value = NULL, *sptr = NULL;
float rate;
int bintval;
+ int parsed, err;
if (argc < 2)
return 1;
argv++;
argc--;
- /* freq */
- NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ,
- strtoul(argv[0], &end, 10));
- if (*end != '\0')
- return 1;
- argv++;
- argc--;
+ err = parse_freqchan(&chandef, false, argc, argv, &parsed);
+ if (err)
+ return err;
+
+ argv += parsed;
+ argc -= parsed;
+
+ put_chandef(msg, &chandef);
+ if (err)
+ return err;
if (argc && strcmp(argv[0], "fixed-freq") == 0) {
NLA_PUT_FLAG(msg, NL80211_ATTR_FREQ_FIXED);
if (*end != '\0')
return 1;
- NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, (int) rate * 10);
+ NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, (int)(rate * 10));
argv++;
argc--;
}
}
static int leave_ibss(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;
}
NL80211_CMD_LEAVE_IBSS, 0, CIB_NETDEV, leave_ibss,
"Leave the current IBSS cell.");
COMMAND(ibss, join,
- "<SSID> <freq in MHz> [fixed-freq] [<fixed bssid>] [beacon-interval <TU>]"
+ "<SSID> <freq in MHz> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [fixed-freq] [<fixed bssid>] [beacon-interval <TU>]"
" [basic-rates <rate in Mbps,rate2,...>] [mcast-rate <rate in Mbps>] "
"[key d:0:abcde]",
NL80211_CMD_JOIN_IBSS, 0, CIB_NETDEV, join_ibss,