mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-23 15:32:25 +00:00
080b0fb9b3
The supplicant is updated to the current release and is now downloaded as archive rather than pulled from git. For the time being 'libnl' is still kept at 3.2.25 as the current 3.7.0 release relies on more Linux infrastructure that our integration does not provide. Issue #4861.
96 lines
3.2 KiB
Diff
96 lines
3.2 KiB
Diff
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
|
|
index aec179a..6c07c73 100644
|
|
--- a/src/drivers/driver_nl80211.c
|
|
+++ b/src/drivers/driver_nl80211.c
|
|
@@ -1985,13 +1985,13 @@ static void wpa_driver_nl80211_rfkill_blocked(void *ctx)
|
|
{
|
|
struct wpa_driver_nl80211_data *drv = ctx;
|
|
|
|
- wpa_printf(MSG_DEBUG, "nl80211: RFKILL blocked");
|
|
+ wpa_printf(MSG_INFO, "nl80211: RFKILL blocked");
|
|
|
|
/*
|
|
* rtnetlink ifdown handler will report interfaces other than the P2P
|
|
* Device interface as disabled.
|
|
*/
|
|
- if (drv->nlmode == NL80211_IFTYPE_P2P_DEVICE)
|
|
+ // if (drv->nlmode == NL80211_IFTYPE_P2P_DEVICE)
|
|
wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED, NULL);
|
|
}
|
|
|
|
@@ -1999,7 +1999,7 @@ static void wpa_driver_nl80211_rfkill_blocked(void *ctx)
|
|
static void wpa_driver_nl80211_rfkill_unblocked(void *ctx)
|
|
{
|
|
struct wpa_driver_nl80211_data *drv = ctx;
|
|
- wpa_printf(MSG_DEBUG, "nl80211: RFKILL unblocked");
|
|
+ wpa_printf(MSG_INFO, "nl80211: RFKILL unblocked");
|
|
if (i802_set_iface_flags(drv->first_bss, 1)) {
|
|
wpa_printf(MSG_DEBUG, "nl80211: Could not set interface UP "
|
|
"after rfkill unblock");
|
|
@@ -2013,7 +2013,7 @@ static void wpa_driver_nl80211_rfkill_unblocked(void *ctx)
|
|
* rtnetlink ifup handler will report interfaces other than the P2P
|
|
* Device interface as enabled.
|
|
*/
|
|
- if (drv->nlmode == NL80211_IFTYPE_P2P_DEVICE)
|
|
+ // if (drv->nlmode == NL80211_IFTYPE_P2P_DEVICE)
|
|
wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED, NULL);
|
|
}
|
|
|
|
@@ -8709,7 +8709,7 @@ static void * nl80211_global_init(void *ctx)
|
|
if (wpa_driver_nl80211_init_nl_global(global) < 0)
|
|
goto err;
|
|
|
|
- global->ioctl_sock = socket(PF_INET, SOCK_DGRAM, 0);
|
|
+ global->ioctl_sock = 42;
|
|
if (global->ioctl_sock < 0) {
|
|
wpa_printf(MSG_ERROR, "nl80211: socket(PF_INET,SOCK_DGRAM) failed: %s",
|
|
strerror(errno));
|
|
diff --git a/src/drivers/netlink.c b/src/drivers/netlink.c
|
|
index 0e960f4..38fb26c 100644
|
|
--- a/src/drivers/netlink.c
|
|
+++ b/src/drivers/netlink.c
|
|
@@ -13,6 +13,8 @@
|
|
#include "priv_netlink.h"
|
|
#include "netlink.h"
|
|
|
|
+#define PF_NETLINK 16
|
|
+#define AF_NETLINK PF_NETLINK
|
|
|
|
struct netlink_data {
|
|
struct netlink_config *cfg;
|
|
diff --git a/src/utils/common.c b/src/utils/common.c
|
|
index 2c12751..e9047d5 100644
|
|
--- a/src/utils/common.c
|
|
+++ b/src/utils/common.c
|
|
@@ -509,12 +509,12 @@ void printf_encode(char *txt, size_t maxlen, const u8 *data, size_t len)
|
|
*txt++ = 't';
|
|
break;
|
|
default:
|
|
- if (data[i] >= 32 && data[i] <= 126) {
|
|
+ // if (data[i] >= 32 && data[i] <= 126) {
|
|
*txt++ = data[i];
|
|
- } else {
|
|
- txt += os_snprintf(txt, end - txt, "\\x%02x",
|
|
- data[i]);
|
|
- }
|
|
+ // } else {
|
|
+ // txt += os_snprintf(txt, end - txt, "\\x%02x",
|
|
+ // data[i]);
|
|
+ // }
|
|
break;
|
|
}
|
|
}
|
|
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
|
|
index bcd67fc..025ec8d 100644
|
|
--- a/wpa_supplicant/ctrl_iface.c
|
|
+++ b/wpa_supplicant/ctrl_iface.c
|
|
@@ -11447,7 +11447,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
|
|
char *buf, size_t *resp_len)
|
|
{
|
|
char *reply;
|
|
- const int reply_size = 4096;
|
|
+ const int reply_size = 4096*8;
|
|
int reply_len;
|
|
|
|
if (os_strncmp(buf, WPA_CTRL_RSP, os_strlen(WPA_CTRL_RSP)) == 0 ||
|