[OpenWrt-Devel] [PATCH 2/5] hostapd: add ubus switch_chan method to ifaces
Yury Shvedov
yshvedov at wimarksystems.com
Mon Oct 8 08:53:02 EDT 2018
Hi!
Here is the series of patches on hostapd, I'm using in my project. They
are introduces more informative communication with ubus, used by me. I
thought it could be useful for someone.
But something hell strange happened with the series while sending. Sorry
for this mess. Can someone explain what is wrong? The git-send-email
messages was okay. I tried to send the series twice. The second attempt
- with --thread and --in-reply to 3/5 patch.
On 10/8/18 3:28 PM, Yury Shvedov wrote:
> switch_chan method now could be called directly by hostapd_iface object.
>
> Signed-off-by: Yury Shvedov <yshvedov at wimarksystems.com>
> ---
> .../services/hostapd/src/src/ap/ubus.c | 145 +++++++++++-------
> 1 file changed, 86 insertions(+), 59 deletions(-)
>
> diff --git a/package/network/services/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c
> index a393451af2..6d12126a1a 100644
> --- a/package/network/services/hostapd/src/src/ap/ubus.c
> +++ b/package/network/services/hostapd/src/src/ap/ubus.c
> @@ -145,9 +145,88 @@ hostapd_iface_get_bss(struct ubus_context *ctx, struct ubus_object *obj,
>
> return 0;
> }
> +
> +#ifdef NEED_AP_MLME
> +enum {
> + CSA_FREQ,
> + CSA_BCN_COUNT,
> + CSA_CENTER_FREQ1,
> + CSA_CENTER_FREQ2,
> + CSA_BANDWIDTH,
> + CSA_SEC_CHANNEL_OFFSET,
> + CSA_HT,
> + CSA_VHT,
> + CSA_BLOCK_TX,
> + __CSA_MAX
> +};
> +
> +static const struct blobmsg_policy csa_policy[__CSA_MAX] = {
> + [CSA_FREQ] = { "freq", BLOBMSG_TYPE_INT32 },
> + [CSA_BCN_COUNT] = { "bcn_count", BLOBMSG_TYPE_INT32 },
> + [CSA_CENTER_FREQ1] = { "center_freq1", BLOBMSG_TYPE_INT32 },
> + [CSA_CENTER_FREQ2] = { "center_freq2", BLOBMSG_TYPE_INT32 },
> + [CSA_BANDWIDTH] = { "bandwidth", BLOBMSG_TYPE_INT32 },
> + [CSA_SEC_CHANNEL_OFFSET] = { "sec_channel_offset", BLOBMSG_TYPE_INT32 },
> + [CSA_HT] = { "ht", BLOBMSG_TYPE_BOOL },
> + [CSA_VHT] = { "vht", BLOBMSG_TYPE_BOOL },
> + [CSA_BLOCK_TX] = { "block_tx", BLOBMSG_TYPE_BOOL },
> +};
> +
> +static int
> +hostapd_switch_chan(struct hostapd_data *hapd, struct blob_attr *msg)
> +{
> + struct blob_attr *tb[__CSA_MAX];
> + struct csa_settings css;
> +
> + blobmsg_parse(csa_policy, __CSA_MAX, tb, blob_data(msg), blob_len(msg));
> +
> + if (!tb[CSA_FREQ])
> + return UBUS_STATUS_INVALID_ARGUMENT;
> +
> + memset(&css, 0, sizeof(css));
> + css.freq_params.freq = blobmsg_get_u32(tb[CSA_FREQ]);
> +
> +#define SET_CSA_SETTING(name, field, type) \
> + do { \
> + if (tb[name]) \
> + css.field = blobmsg_get_ ## type(tb[name]); \
> + } while(0)
> +
> + SET_CSA_SETTING(CSA_BCN_COUNT, cs_count, u32);
> + SET_CSA_SETTING(CSA_CENTER_FREQ1, freq_params.center_freq1, u32);
> + SET_CSA_SETTING(CSA_CENTER_FREQ2, freq_params.center_freq2, u32);
> + SET_CSA_SETTING(CSA_BANDWIDTH, freq_params.bandwidth, u32);
> + SET_CSA_SETTING(CSA_SEC_CHANNEL_OFFSET, freq_params.sec_channel_offset, u32);
> + SET_CSA_SETTING(CSA_HT, freq_params.ht_enabled, bool);
> + SET_CSA_SETTING(CSA_VHT, freq_params.vht_enabled, bool);
> + SET_CSA_SETTING(CSA_BLOCK_TX, block_tx, bool);
> +
> +
> + if (hostapd_switch_channel(hapd, &css) != 0)
> + return UBUS_STATUS_NOT_SUPPORTED;
> + return UBUS_STATUS_OK;
> +#undef SET_CSA_SETTING
> +}
> +
> +static int
> +hostapd_iface_switch_chan(struct ubus_context *ctx, struct ubus_object *obj,
> + struct ubus_request_data *req, const char *method,
> + struct blob_attr *msg)
> +{
> + struct hostapd_iface *iface = container_of(obj, struct hostapd_iface,
> + ubus.obj);
> + if (iface && iface->bss[0])
> + return hostapd_switch_chan(iface->bss[0], msg);
> + return UBUS_STATUS_INVALID_ARGUMENT;
> +}
> +#endif
> +
> static const struct ubus_method iface_methods[] = {
> UBUS_METHOD_NOARG("get_state", hostapd_iface_get_state),
> UBUS_METHOD_NOARG("get_bss", hostapd_iface_get_bss),
> +#ifdef NEED_AP_MLME
> + UBUS_METHOD("switch_chan", hostapd_iface_switch_chan, csa_policy),
> +#endif
> };
> static struct ubus_object_type iface_object_type =
> UBUS_OBJECT_TYPE("hostapd_iface", iface_methods);
> @@ -472,69 +551,17 @@ hostapd_bss_update_beacon(struct ubus_context *ctx, struct ubus_object *obj,
> return 0;
> }
>
> -enum {
> - CSA_FREQ,
> - CSA_BCN_COUNT,
> - CSA_CENTER_FREQ1,
> - CSA_CENTER_FREQ2,
> - CSA_BANDWIDTH,
> - CSA_SEC_CHANNEL_OFFSET,
> - CSA_HT,
> - CSA_VHT,
> - CSA_BLOCK_TX,
> - __CSA_MAX
> -};
> -
> -static const struct blobmsg_policy csa_policy[__CSA_MAX] = {
> - [CSA_FREQ] = { "freq", BLOBMSG_TYPE_INT32 },
> - [CSA_BCN_COUNT] = { "bcn_count", BLOBMSG_TYPE_INT32 },
> - [CSA_CENTER_FREQ1] = { "center_freq1", BLOBMSG_TYPE_INT32 },
> - [CSA_CENTER_FREQ2] = { "center_freq2", BLOBMSG_TYPE_INT32 },
> - [CSA_BANDWIDTH] = { "bandwidth", BLOBMSG_TYPE_INT32 },
> - [CSA_SEC_CHANNEL_OFFSET] = { "sec_channel_offset", BLOBMSG_TYPE_INT32 },
> - [CSA_HT] = { "ht", BLOBMSG_TYPE_BOOL },
> - [CSA_VHT] = { "vht", BLOBMSG_TYPE_BOOL },
> - [CSA_BLOCK_TX] = { "block_tx", BLOBMSG_TYPE_BOOL },
> -};
>
> #ifdef NEED_AP_MLME
> static int
> -hostapd_switch_chan(struct ubus_context *ctx, struct ubus_object *obj,
> - struct ubus_request_data *req, const char *method,
> - struct blob_attr *msg)
> +hostapd_bss_switch_chan(struct ubus_context *ctx, struct ubus_object *obj,
> + struct ubus_request_data *req, const char *method,
> + struct blob_attr *msg)
> {
> - struct blob_attr *tb[__CSA_MAX];
> struct hostapd_data *hapd = get_hapd_from_object(obj);
> - struct csa_settings css;
> -
> - blobmsg_parse(csa_policy, __CSA_MAX, tb, blob_data(msg), blob_len(msg));
> -
> - if (!tb[CSA_FREQ])
> - return UBUS_STATUS_INVALID_ARGUMENT;
> -
> - memset(&css, 0, sizeof(css));
> - css.freq_params.freq = blobmsg_get_u32(tb[CSA_FREQ]);
> -
> -#define SET_CSA_SETTING(name, field, type) \
> - do { \
> - if (tb[name]) \
> - css.field = blobmsg_get_ ## type(tb[name]); \
> - } while(0)
> -
> - SET_CSA_SETTING(CSA_BCN_COUNT, cs_count, u32);
> - SET_CSA_SETTING(CSA_CENTER_FREQ1, freq_params.center_freq1, u32);
> - SET_CSA_SETTING(CSA_CENTER_FREQ2, freq_params.center_freq2, u32);
> - SET_CSA_SETTING(CSA_BANDWIDTH, freq_params.bandwidth, u32);
> - SET_CSA_SETTING(CSA_SEC_CHANNEL_OFFSET, freq_params.sec_channel_offset, u32);
> - SET_CSA_SETTING(CSA_HT, freq_params.ht_enabled, bool);
> - SET_CSA_SETTING(CSA_VHT, freq_params.vht_enabled, bool);
> - SET_CSA_SETTING(CSA_BLOCK_TX, block_tx, bool);
> -
> -
> - if (hostapd_switch_channel(hapd, &css) != 0)
> - return UBUS_STATUS_NOT_SUPPORTED;
> - return UBUS_STATUS_OK;
> -#undef SET_CSA_SETTING
> + if (hapd)
> + return hostapd_switch_chan(hapd, msg);
> + return UBUS_STATUS_INVALID_ARGUMENT;
> }
> #endif
>
> @@ -1050,7 +1077,7 @@ static const struct ubus_method bss_methods[] = {
> UBUS_METHOD_NOARG("update_beacon", hostapd_bss_update_beacon),
> UBUS_METHOD_NOARG("get_features", hostapd_bss_get_features),
> #ifdef NEED_AP_MLME
> - UBUS_METHOD("switch_chan", hostapd_switch_chan, csa_policy),
> + UBUS_METHOD("switch_chan", hostapd_bss_switch_chan, csa_policy),
> #endif
> UBUS_METHOD("set_vendor_elements", hostapd_vendor_elements, ve_policy),
> UBUS_METHOD("notify_response", hostapd_notify_response, notify_policy),
--
С уважением,
Юрий Шведов
WiMark Systems
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list