When STA is disconnected, ensure that the interface is in a cleanly stopped
state:
- if in regular enable/disable state, stop beacons if necessary
- in any other state, disable the interface
When the STA is up, ignore repeated start commands for the same channel, in
order to avoid unnecessary AP restarts
Signed-off-by: Felix Fietkau <nbd@nbd.name>
freq_info.csa_count = req.args.csa_count ?? 10;
ret = iface.switch_channel(freq_info);
} else {
freq_info.csa_count = req.args.csa_count ?? 10;
ret = iface.switch_channel(freq_info);
} else {
ret = iface.start(freq_info);
}
if (!ret)
ret = iface.start(freq_info);
}
if (!ret)
struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
int i;
struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
int i;
+ switch (iface->state) {
+ case HAPD_IFACE_ENABLED:
+ case HAPD_IFACE_DISABLED:
+ break;
- if (iface->state == HAPD_IFACE_ACS) {
acs_cleanup(iface);
iface->scan_cb = NULL;
acs_cleanup(iface);
iface->scan_cb = NULL;
+ /* fallthrough */
+#endif
+ default:
hostapd_disable_iface(iface);
hostapd_disable_iface(iface);
+
+ if (iface->state != HAPD_IFACE_ENABLED)
+ hostapd_disable_iface(iface);
for (i = 0; i < iface->num_bss; i++) {
struct hostapd_data *hapd = iface->bss[i];
for (i = 0; i < iface->num_bss; i++) {
struct hostapd_data *hapd = iface->bss[i];
struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
uc_value_t *info = uc_fn_arg(0);
struct hostapd_config *conf;
struct hostapd_iface *iface = uc_fn_thisval("hostapd.iface");
uc_value_t *info = uc_fn_arg(0);
struct hostapd_config *conf;
uint64_t intval;
int i;
if (!iface)
return NULL;
uint64_t intval;
int i;
if (!iface)
return NULL;
- iface->freq = 0;
- if (!info)
+ if (!info) {
+ iface->freq = 0;
if (ucv_type(info) != UC_OBJECT)
return NULL;
if (ucv_type(info) != UC_OBJECT)
return NULL;
+#define UPDATE_VAL(field, name) \
+ if ((intval = ucv_int64_get(ucv_object_get(info, name, NULL))) && \
+ !errno && intval != conf->field) do { \
+ conf->field = intval; \
+ changed = true; \
+ } while(0)
+
- if ((intval = ucv_int64_get(ucv_object_get(info, "op_class", NULL))) && !errno)
- conf->op_class = intval;
- if ((intval = ucv_int64_get(ucv_object_get(info, "hw_mode", NULL))) && !errno)
- conf->hw_mode = intval;
- if ((intval = ucv_int64_get(ucv_object_get(info, "channel", NULL))) && !errno)
- conf->channel = intval;
- if ((intval = ucv_int64_get(ucv_object_get(info, "sec_channel", NULL))) && !errno)
- conf->secondary_channel = intval;
+ UPDATE_VAL(op_class, "op_class");
+ UPDATE_VAL(hw_mode, "hw_mode");
+ UPDATE_VAL(channel, "channel");
+ UPDATE_VAL(secondary_channel, "sec_channel");
+ if (!changed &&
+ (iface->bss[0]->beacon_set_done ||
+ iface->state == HAPD_IFACE_DFS))
+ return ucv_boolean_new(true);
intval = ucv_int64_get(ucv_object_get(info, "center_seg0_idx", NULL));
if (!errno)
intval = ucv_int64_get(ucv_object_get(info, "center_seg0_idx", NULL));
if (!errno)
intval = ucv_int64_get(ucv_object_get(info, "frequency", NULL));
if (!errno)
iface->freq = intval;
intval = ucv_int64_get(ucv_object_get(info, "frequency", NULL));
if (!errno)
iface->freq = intval;
+ else
+ iface->freq = 0;