/*
- * luci-rpcd - LuCI UBUS RPC server
+ * rpcd - UBUS RPC server
*
- * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "iwinfo.h"
-#include "plugin.h"
+#include <sys/types.h>
+#include <dirent.h>
+#include <libubus.h>
+#include <iwinfo.h>
+#include <iwinfo/utils.h>
+#include <net/ethernet.h>
+
+#ifdef linux
+#include <netinet/ether.h>
+#endif
+
+#include <rpcd/plugin.h>
+
static struct blob_buf buf;
static const struct iwinfo_ops *iw;
[RPC_D_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
};
+enum {
+ RPC_A_DEVICE,
+ RPC_A_MACADDR,
+ __RPC_A_MAX,
+};
+
+static const struct blobmsg_policy rpc_assoclist_policy[__RPC_A_MAX] = {
+ [RPC_A_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
+ [RPC_A_MACADDR] = { .name = "mac", .type = BLOBMSG_TYPE_STRING },
+};
+
+enum {
+ RPC_U_SECTION,
+ __RPC_U_MAX
+};
+
+static const struct blobmsg_policy rpc_uci_policy[__RPC_U_MAX] = {
+ [RPC_U_SECTION] = { .name = "section", .type = BLOBMSG_TYPE_STRING },
+};
+
+static int
+__rpc_iwinfo_open(struct blob_attr *device)
+{
+ if (!device)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ ifname = blobmsg_data(device);
+ iw = iwinfo_backend(ifname);
+
+ return iw ? UBUS_STATUS_OK : UBUS_STATUS_NOT_FOUND;
+}
static int
rpc_iwinfo_open(struct blob_attr *msg)
blobmsg_parse(rpc_device_policy, __RPC_D_MAX, tb,
blob_data(msg), blob_len(msg));
- if (!tb[RPC_D_DEVICE])
- return UBUS_STATUS_INVALID_ARGUMENT;
-
- ifname = blobmsg_data(tb[RPC_D_DEVICE]);
- iw = iwinfo_backend(ifname);
-
- return iw ? UBUS_STATUS_OK : UBUS_STATUS_NOT_FOUND;
+ return __rpc_iwinfo_open(tb[RPC_D_DEVICE]);
}
static void
rpc_iwinfo_add_encryption(name, &crypto);
}
+static void
+rpc_iwinfo_call_htmodes(const char *name)
+{
+ int modes;
+ void *c;
+
+ if (!iw->htmodelist(ifname, &modes))
+ {
+ c = blobmsg_open_array(&buf, name);
+
+ if (modes & IWINFO_HTMODE_HT20)
+ blobmsg_add_string(&buf, NULL, "HT20");
+
+ if (modes & IWINFO_HTMODE_HT40)
+ blobmsg_add_string(&buf, NULL, "HT40");
+
+ if (modes & IWINFO_HTMODE_VHT20)
+ blobmsg_add_string(&buf, NULL, "VHT20");
+
+ if (modes & IWINFO_HTMODE_VHT40)
+ blobmsg_add_string(&buf, NULL, "VHT40");
+
+ if (modes & IWINFO_HTMODE_VHT80)
+ blobmsg_add_string(&buf, NULL, "VHT80");
+
+ if (modes & IWINFO_HTMODE_VHT80_80)
+ blobmsg_add_string(&buf, NULL, "VHT80+80");
+
+ if (modes & IWINFO_HTMODE_VHT160)
+ blobmsg_add_string(&buf, NULL, "VHT160");
+
+ blobmsg_close_array(&buf, c);
+ }
+}
+
static void
rpc_iwinfo_call_hwmodes(const char *name)
{
{
c = blobmsg_open_array(&buf, name);
+ if (modes & IWINFO_80211_AC)
+ blobmsg_add_string(&buf, NULL, "ac");
+
if (modes & IWINFO_80211_A)
blobmsg_add_string(&buf, NULL, "a");
rpc_iwinfo_call_int("bitrate", iw->bitrate, NULL);
rpc_iwinfo_call_encryption("encryption");
+ rpc_iwinfo_call_htmodes("htmodes");
rpc_iwinfo_call_hwmodes("hwmodes");
c = blobmsg_open_table(&buf, "hardware");
return UBUS_STATUS_OK;
}
+static void
+rpc_iwinfo_add_rateinfo(struct iwinfo_rate_entry *r)
+{
+ blobmsg_add_u8(&buf, "ht", r->is_ht);
+ blobmsg_add_u8(&buf, "vht", r->is_vht);
+ blobmsg_add_u32(&buf, "mhz", r->mhz);
+ blobmsg_add_u32(&buf, "rate", r->rate);
+
+ if (r->is_ht) {
+ blobmsg_add_u32(&buf, "mcs", r->mcs);
+ blobmsg_add_u8(&buf, "40mhz", r->is_40mhz);
+ blobmsg_add_u8(&buf, "short_gi", r->is_short_gi);
+ }
+ else if (r->is_vht) {
+ blobmsg_add_u32(&buf, "mcs", r->mcs);
+ blobmsg_add_u32(&buf, "nss", r->nss);
+ blobmsg_add_u8(&buf, "short_gi", r->is_short_gi);
+ }
+}
+
static int
rpc_iwinfo_assoclist(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
char mac[18];
char res[IWINFO_BUFSIZE];
struct iwinfo_assoclist_entry *a;
+ struct ether_addr *macaddr = NULL;
void *c, *d, *e;
+ struct blob_attr *tb[__RPC_A_MAX];
+ bool found = false;
- rv = rpc_iwinfo_open(msg);
+ blobmsg_parse(rpc_assoclist_policy, __RPC_A_MAX, tb,
+ blob_data(msg), blob_len(msg));
+ rv = __rpc_iwinfo_open(tb[RPC_A_DEVICE]);
if (rv)
return rv;
+ if (tb[RPC_A_MACADDR])
+ macaddr = ether_aton(blobmsg_data(tb[RPC_A_MACADDR]));
+
blob_buf_init(&buf, 0);
- c = blobmsg_open_array(&buf, "results");
+ if (!macaddr)
+ c = blobmsg_open_array(&buf, "results");
if (!iw->assoclist(ifname, res, &len) && (len > 0))
{
for (i = 0; i < len; i += sizeof(struct iwinfo_assoclist_entry))
{
a = (struct iwinfo_assoclist_entry *)&res[i];
- d = blobmsg_open_table(&buf, NULL);
+
+ if (!macaddr)
+ d = blobmsg_open_table(&buf, NULL);
+ else if (memcmp(macaddr, a->mac, ETH_ALEN) != 0)
+ continue;
snprintf(mac, sizeof(mac), "%02X:%02X:%02X:%02X:%02X:%02X",
a->mac[0], a->mac[1], a->mac[2],
blobmsg_add_string(&buf, "mac", mac);
blobmsg_add_u32(&buf, "signal", a->signal);
+ blobmsg_add_u32(&buf, "signal_avg", a->signal_avg);
blobmsg_add_u32(&buf, "noise", a->noise);
blobmsg_add_u32(&buf, "inactive", a->inactive);
+ blobmsg_add_u32(&buf, "connected_time", a->connected_time);
+ blobmsg_add_u32(&buf, "thr", a->thr);
+ blobmsg_add_u8(&buf, "authorized", a->is_authorized);
+ blobmsg_add_u8(&buf, "authenticated", a->is_authenticated);
+ blobmsg_add_string(&buf, "preamble", a->is_preamble_short ? "short" : "long");
+ blobmsg_add_u8(&buf, "wme", a->is_wme);
+ blobmsg_add_u8(&buf, "mfp", a->is_mfp);
+ blobmsg_add_u8(&buf, "tdls", a->is_tdls);
+
+ blobmsg_add_u16(&buf, "mesh llid", a->llid);
+ blobmsg_add_u16(&buf, "mesh plid", a->plid);
+ blobmsg_add_string(&buf, "mesh plink", a->plink_state);
+ blobmsg_add_string(&buf, "mesh local PS", a->local_ps);
+ blobmsg_add_string(&buf, "mesh peer PS", a->peer_ps);
+ blobmsg_add_string(&buf, "mesh non-peer PS", a->nonpeer_ps);
e = blobmsg_open_table(&buf, "rx");
- blobmsg_add_u32(&buf, "rate", a->rx_rate.rate);
- blobmsg_add_u32(&buf, "mcs", a->rx_rate.mcs);
- blobmsg_add_u8(&buf, "40mhz", a->rx_rate.is_40mhz);
- blobmsg_add_u8(&buf, "short_gi", a->rx_rate.is_short_gi);
+ blobmsg_add_u64(&buf, "drop_misc", a->rx_drop_misc);
+ blobmsg_add_u32(&buf, "packets", a->rx_packets);
+ blobmsg_add_u32(&buf, "bytes", a->rx_bytes);
+ rpc_iwinfo_add_rateinfo(&a->rx_rate);
blobmsg_close_table(&buf, e);
e = blobmsg_open_table(&buf, "tx");
- blobmsg_add_u32(&buf, "rate", a->tx_rate.rate);
- blobmsg_add_u32(&buf, "mcs", a->tx_rate.mcs);
- blobmsg_add_u8(&buf, "40mhz", a->tx_rate.is_40mhz);
- blobmsg_add_u8(&buf, "short_gi", a->tx_rate.is_short_gi);
+ blobmsg_add_u32(&buf, "failed", a->tx_failed);
+ blobmsg_add_u32(&buf, "retries", a->tx_retries);
+ blobmsg_add_u32(&buf, "packets", a->tx_packets);
+ blobmsg_add_u32(&buf, "bytes", a->tx_bytes);
+ rpc_iwinfo_add_rateinfo(&a->tx_rate);
blobmsg_close_table(&buf, e);
- blobmsg_close_table(&buf, d);
+ found = true;
+ if (!macaddr)
+ blobmsg_close_table(&buf, d);
+ else
+ break;
}
}
- blobmsg_close_array(&buf, c);
+ if (!macaddr)
+ blobmsg_close_array(&buf, c);
+ else if (!found)
+ return UBUS_STATUS_NOT_FOUND;
ubus_send_reply(ctx, req, buf.head);
return UBUS_STATUS_OK;
}
+static int
+rpc_iwinfo_survey(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ char res[IWINFO_BUFSIZE];
+ struct iwinfo_survey_entry *e;
+ void *c, *d;
+ int i, rv, len;
+
+ blob_buf_init(&buf, 0);
+
+ rv = rpc_iwinfo_open(msg);
+
+ c = blobmsg_open_array(&buf, "results");
+
+ if (rv || iw->survey(ifname, res, &len) || len < 0)
+ return UBUS_STATUS_OK;
+
+ for (i = 0; i < len; i += sizeof(struct iwinfo_survey_entry)) {
+ e = (struct iwinfo_survey_entry *)&res[i];
+
+ d = blobmsg_open_table(&buf, NULL);
+ blobmsg_add_u32(&buf, "mhz", e->mhz);
+ blobmsg_add_u32(&buf, "noise", e->noise);
+ blobmsg_add_u64(&buf, "active_time", e->active_time);
+ blobmsg_add_u64(&buf, "busy_time", e->busy_time);
+ blobmsg_add_u64(&buf, "busy_time_ext", e->busy_time_ext);
+ blobmsg_add_u64(&buf, "rx_time", e->rxtime);
+ blobmsg_add_u64(&buf, "tx_time", e->txtime);
+ blobmsg_close_table(&buf, d);
+ }
+
+ blobmsg_close_array(&buf, c);
+ ubus_send_reply(ctx, req, buf.head);
+ rpc_iwinfo_close();
+ return UBUS_STATUS_OK;
+}
+
static int
rpc_iwinfo_freqlist(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
int rv, len;
char cur[3];
char iso3166[3];
- char res[IWINFO_BUFSIZE];
+ char res[IWINFO_BUFSIZE] = {0};
const char *ccode;
const struct iwinfo_iso3166_label *l;
void *c, *d;
return UBUS_STATUS_OK;
}
+static int
+rpc_iwinfo_phyname(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ int i;
+ bool found = false;
+ char res[IWINFO_BUFSIZE];
+ const struct iwinfo_ops *ops;
+ struct blob_attr *tb[__RPC_U_MAX];
+ const char *backends[] = {
+ "nl80211",
+ "madwifi",
+ "wl"
+ };
+
+ blobmsg_parse(rpc_uci_policy, __RPC_U_MAX, tb,
+ blob_data(msg), blob_len(msg));
+
+ if (!tb[RPC_U_SECTION])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ for (i = 0; i < ARRAY_SIZE(backends); i++)
+ {
+ ops = iwinfo_backend_by_name(backends[i]);
+
+ if (!ops || !ops->lookup_phy)
+ continue;
+
+ if (!ops->lookup_phy(blobmsg_get_string(tb[RPC_U_SECTION]), res))
+ {
+ found = true;
+ break;
+ }
+ }
+
+ if (found)
+ {
+ blob_buf_init(&buf, 0);
+ blobmsg_add_string(&buf, "phyname", res);
+
+ ubus_send_reply(ctx, req, buf.head);
+ }
+
+ rpc_iwinfo_close();
+
+ return found ? UBUS_STATUS_OK : UBUS_STATUS_NOT_FOUND;
+}
+
static int
rpc_iwinfo_devices(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
rpc_iwinfo_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx)
{
static const struct ubus_method iwinfo_methods[] = {
- { .name = "devices", .handler = rpc_iwinfo_devices },
+ UBUS_METHOD_NOARG("devices", rpc_iwinfo_devices),
UBUS_METHOD("info", rpc_iwinfo_info, rpc_device_policy),
UBUS_METHOD("scan", rpc_iwinfo_scan, rpc_device_policy),
- UBUS_METHOD("assoclist", rpc_iwinfo_assoclist, rpc_device_policy),
+ UBUS_METHOD("assoclist", rpc_iwinfo_assoclist, rpc_assoclist_policy),
UBUS_METHOD("freqlist", rpc_iwinfo_freqlist, rpc_device_policy),
UBUS_METHOD("txpowerlist", rpc_iwinfo_txpowerlist, rpc_device_policy),
UBUS_METHOD("countrylist", rpc_iwinfo_countrylist, rpc_device_policy),
+ UBUS_METHOD("survey", rpc_iwinfo_survey, rpc_device_policy),
+ UBUS_METHOD("phyname", rpc_iwinfo_phyname, rpc_uci_policy),
};
static struct ubus_object_type iwinfo_type =
return ubus_add_object(ctx, &obj);
}
-const struct rpc_plugin rpc_plugin = {
+struct rpc_plugin rpc_plugin = {
.init = rpc_iwinfo_api_init
};