scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-30 10:02:53 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

wifi-2069 Fix for vifC not getting applied to vifS

Browse Source 
- WM was getting stuck on recvmsg() while receiving netlink event notifications
   Since we are already using event loop to read data as and when it arrives, there was
   no need to keep nl_recvmsgs() in blocking mode for notifications.
   Setting socket to non-blocking mode resolves the issue.
 - Also removed a redundant reload_config call in captive.c.

Signed-off-by: Yashvardhan <yashvardhan@netexperience.com>
This commit is contained in:
Yashvardhan
2021-05-20 00:55:38 -07:00
committed by Rick Sommerville
parent 915041e40f
commit a71436d27c
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/captive.c
View File

@@ -525,7 +525,6 @@ void opennds_section_del(char *section_name)
uci_commit(nds_ctx, &opennds, false);
uci_unload(nds_ctx, opennds);
uci_free_context(nds_ctx);
reload_config = 1;
}
void vif_captive_portal_set(const struct schema_Wifi_VIF_Config *vconf, char *ifname)

2
feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/radio.c
View File

@@ -463,7 +463,7 @@ static void periodic_task(void *arg)
}
if (reload_config) {
LOGT("periodic: reload config");
LOGD("periodic: reload_config");
reload_config = 0;
uci_commit_all(uci);
sync();

38
feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/radio_nl80211.c
View File

@@ -50,7 +50,8 @@
extern struct ev_loop *wifihal_evloop;
extern ovsdb_table_t table_Wifi_VIF_State;
extern ovsdb_table_t table_Wifi_Associated_Clients;
static struct unl unl;
static struct unl unl_req;
static struct unl unl_notify;
static ev_io unl_io;
static int avl_addrcmp(const void *k1, const void *k2, void *ptr)
@@ -471,10 +472,10 @@ int nl80211_channel_get(char *name, unsigned int *chan)
if (!idx)
return -1;
msg = unl_genl_msg(&unl, NL80211_CMD_GET_INTERFACE, true);
msg = unl_genl_msg(&unl_req, NL80211_CMD_GET_INTERFACE, true);
nla_put_u32(msg, NL80211_ATTR_IFINDEX, idx);
unl_genl_request(&unl, msg, nl80211_channel_recv, chan);
unl_genl_request(&unl_req, msg, nl80211_channel_recv, chan);
phy->current_channel = *chan;
@@ -562,7 +563,7 @@ static void nl80211_ev(struct ev_loop *ev, struct ev_io *io, int event)
nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, NULL);
nl_cb_set(cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM, no_seq_check, NULL);
nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, nl80211_recv, NULL);
nl_recvmsgs(unl.sock, cb);
nl_recvmsgs(unl_notify.sock, cb);
nl_cb_put(cb);
}
@@ -580,24 +581,33 @@ int radio_nl80211_init(void)
{
struct nl_msg *msg;
if (unl_genl_init(&unl, "nl80211") < 0) {
if (unl_genl_init(&unl_req, "nl80211") < 0) {
syslog(0, "nl80211: failed to connect\n");
return -1;
}
msg = unl_genl_msg(&unl, NL80211_CMD_GET_WIPHY, true);
unl_genl_request(&unl, msg, nl80211_recv, NULL);
msg = unl_genl_msg(&unl, NL80211_CMD_GET_INTERFACE, true);
unl_genl_request(&unl, msg, nl80211_recv, NULL);
if (unl_genl_init(&unl_notify, "nl80211") < 0) {
syslog(0, "nl80211: failed to connect\n");
return -1;
}
unl_genl_subscribe(&unl, "config");
unl_genl_subscribe(&unl, "mlme");
unl_genl_subscribe(&unl, "vendor");
msg = unl_genl_msg(&unl_req, NL80211_CMD_GET_WIPHY, true);
unl_genl_request(&unl_req, msg, nl80211_recv, NULL);
msg = unl_genl_msg(&unl_req, NL80211_CMD_GET_INTERFACE, true);
unl_genl_request(&unl_req, msg, nl80211_recv, NULL);
if (nl_socket_set_buffer_size(unl.sock, 262144, 0) < 0)
unl_genl_subscribe(&unl_notify, "config");
unl_genl_subscribe(&unl_notify, "mlme");
unl_genl_subscribe(&unl_notify, "vendor");
if (nl_socket_set_buffer_size(unl_notify.sock, 262144, 0) < 0)
LOGE("radio_nl80211: Failed to set nl socket buffer size");
ev_io_init(&unl_io, nl80211_ev, unl.sock->s_fd, EV_READ);
if (nl_socket_set_nonblocking(unl_notify.sock))
LOGE("radio_nl80211: Failed to set socket in the non blocking mode");
ev_io_init(&unl_io, nl80211_ev, unl_notify.sock->s_fd, EV_READ);
ev_io_start(wifihal_evloop, &unl_io);
evsched_task(&vif_poll_stations, NULL, EVSCHED_SEC(5));