Merge branch 'network-dont-send-nl80211-req-if-family-id-not-set'

This commit is contained in:
Daniel Eklöf 2021-10-24 18:21:51 +02:00
commit c9abb6b98f
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 6 additions and 0 deletions

View file

@ -33,6 +33,8 @@
* foreign-toplevel: update bar when a top-level is closed. * foreign-toplevel: update bar when a top-level is closed.
* Bar not being mapped on an output before at least one module has * Bar not being mapped on an output before at least one module has
“refreshed” it (https://codeberg.org/dnkl/yambar/issues/116). “refreshed” it (https://codeberg.org/dnkl/yambar/issues/116).
* network: failure to retrieve wireless attributes (SSID, RX/TX
bitrate, signal strength etc).
### Security ### Security

View file

@ -310,6 +310,9 @@ send_nl80211_request(struct private *m, uint8_t cmd, uint16_t flags, uint32_t se
if (m->ifindex < 0) if (m->ifindex < 0)
return false; return false;
if (m->nl80211.family_id == (uint16_t)-1)
return false;
const struct { const struct {
struct nlmsghdr hdr; struct nlmsghdr hdr;
struct { struct {
@ -692,6 +695,7 @@ handle_genl_ctrl(struct module *mod, uint16_t type, bool nested,
case CTRL_ATTR_FAMILY_ID: { case CTRL_ATTR_FAMILY_ID: {
m->nl80211.family_id = *(const uint16_t *)payload; m->nl80211.family_id = *(const uint16_t *)payload;
send_nl80211_get_interface(m); send_nl80211_get_interface(m);
send_nl80211_get_station(m);
break; break;
} }