summaryrefslogtreecommitdiffstats
path: root/contrib/wpa_supplicant/ctrl_iface.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/wpa_supplicant/ctrl_iface.c')
-rw-r--r--contrib/wpa_supplicant/ctrl_iface.c1401
1 files changed, 541 insertions, 860 deletions
diff --git a/contrib/wpa_supplicant/ctrl_iface.c b/contrib/wpa_supplicant/ctrl_iface.c
index 01ea456..c864c91 100644
--- a/contrib/wpa_supplicant/ctrl_iface.c
+++ b/contrib/wpa_supplicant/ctrl_iface.c
@@ -1,6 +1,6 @@
/*
- * WPA Supplicant / UNIX domain and UDP socket -based control interface
- * Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ * WPA Supplicant / Control interface (shared code for all backends)
+ * Copyright (c) 2004-2006, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -12,20 +12,7 @@
* See README and COPYING for more details.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#ifndef CONFIG_NATIVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/un.h>
-#include <sys/uio.h>
-#endif /* CONFIG_NATIVE_WINDOWS */
+#include "includes.h"
#include "common.h"
#include "eloop.h"
@@ -37,31 +24,13 @@
#include "ctrl_iface.h"
#include "l2_packet.h"
#include "preauth.h"
+#include "pmksa_cache.h"
#include "wpa_ctrl.h"
#include "eap.h"
-#ifdef CONFIG_CTRL_IFACE_UDP
-#define CTRL_IFACE_SOCK struct sockaddr_in
-#else /* CONFIG_CTRL_IFACE_UDP */
-#define CTRL_IFACE_SOCK struct sockaddr_un
-#endif /* CONFIG_CTRL_IFACE_UDP */
-
-
-/**
- * struct wpa_ctrl_dst - Internal data structure of control interface monitors
- *
- * This structure is used to store information about registered control
- * interface monitors into struct wpa_supplicant. This data is private to
- * ctrl_iface.c and should not be touched directly from other files.
- */
-struct wpa_ctrl_dst {
- struct wpa_ctrl_dst *next;
- CTRL_IFACE_SOCK addr;
- socklen_t addrlen;
- int debug_level;
- int errors;
-};
+static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global,
+ char *buf, int len);
static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
@@ -70,33 +39,34 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
char *value;
int ret = 0;
- value = strchr(cmd, ' ');
+ value = os_strchr(cmd, ' ');
if (value == NULL)
return -1;
*value++ = '\0';
wpa_printf(MSG_DEBUG, "CTRL_IFACE SET '%s'='%s'", cmd, value);
- if (strcasecmp(cmd, "EAPOL::heldPeriod") == 0) {
+ if (os_strcasecmp(cmd, "EAPOL::heldPeriod") == 0) {
eapol_sm_configure(wpa_s->eapol,
atoi(value), -1, -1, -1);
- } else if (strcasecmp(cmd, "EAPOL::authPeriod") == 0) {
+ } else if (os_strcasecmp(cmd, "EAPOL::authPeriod") == 0) {
eapol_sm_configure(wpa_s->eapol,
-1, atoi(value), -1, -1);
- } else if (strcasecmp(cmd, "EAPOL::startPeriod") == 0) {
+ } else if (os_strcasecmp(cmd, "EAPOL::startPeriod") == 0) {
eapol_sm_configure(wpa_s->eapol,
-1, -1, atoi(value), -1);
- } else if (strcasecmp(cmd, "EAPOL::maxStart") == 0) {
+ } else if (os_strcasecmp(cmd, "EAPOL::maxStart") == 0) {
eapol_sm_configure(wpa_s->eapol,
-1, -1, -1, atoi(value));
- } else if (strcasecmp(cmd, "dot11RSNAConfigPMKLifetime") == 0) {
+ } else if (os_strcasecmp(cmd, "dot11RSNAConfigPMKLifetime") == 0) {
if (wpa_sm_set_param(wpa_s->wpa, RSNA_PMK_LIFETIME,
atoi(value)))
ret = -1;
- } else if (strcasecmp(cmd, "dot11RSNAConfigPMKReauthThreshold") == 0) {
+ } else if (os_strcasecmp(cmd, "dot11RSNAConfigPMKReauthThreshold") ==
+ 0) {
if (wpa_sm_set_param(wpa_s->wpa, RSNA_PMK_REAUTH_THRESHOLD,
atoi(value)))
ret = -1;
- } else if (strcasecmp(cmd, "dot11RSNAConfigSATimeout") == 0) {
+ } else if (os_strcasecmp(cmd, "dot11RSNAConfigSATimeout") == 0) {
if (wpa_sm_set_param(wpa_s->wpa, RSNA_SA_TIMEOUT, atoi(value)))
ret = -1;
} else
@@ -126,129 +96,48 @@ static int wpa_supplicant_ctrl_iface_preauth(struct wpa_supplicant *wpa_s,
}
-static int wpa_supplicant_ctrl_iface_attach(struct wpa_supplicant *wpa_s,
- CTRL_IFACE_SOCK *from,
- socklen_t fromlen)
+#ifdef CONFIG_PEERKEY
+/* MLME-STKSTART.request(peer) */
+static int wpa_supplicant_ctrl_iface_stkstart(
+ struct wpa_supplicant *wpa_s, char *addr)
{
- struct wpa_ctrl_dst *dst;
+ u8 peer[ETH_ALEN];
- dst = malloc(sizeof(*dst));
- if (dst == NULL)
+ if (hwaddr_aton(addr, peer)) {
+ wpa_printf(MSG_DEBUG, "CTRL_IFACE STKSTART: invalid "
+ "address '%s'", peer);
return -1;
- memset(dst, 0, sizeof(*dst));
- memcpy(&dst->addr, from, sizeof(CTRL_IFACE_SOCK));
- dst->addrlen = fromlen;
- dst->debug_level = MSG_INFO;
- dst->next = wpa_s->ctrl_dst;
- wpa_s->ctrl_dst = dst;
-#ifdef CONFIG_CTRL_IFACE_UDP
- wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor attached %s:%d",
- inet_ntoa(from->sin_addr), ntohs(from->sin_port));
-#else /* CONFIG_CTRL_IFACE_UDP */
- wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor attached",
- (u8 *) from->sun_path, fromlen);
-#endif /* CONFIG_CTRL_IFACE_UDP */
- return 0;
-}
-
-
-static int wpa_supplicant_ctrl_iface_detach(struct wpa_supplicant *wpa_s,
- CTRL_IFACE_SOCK *from,
- socklen_t fromlen)
-{
- struct wpa_ctrl_dst *dst, *prev = NULL;
-
- dst = wpa_s->ctrl_dst;
- while (dst) {
-#ifdef CONFIG_CTRL_IFACE_UDP
- if (from->sin_addr.s_addr == dst->addr.sin_addr.s_addr &&
- from->sin_port == dst->addr.sin_port) {
- if (prev == NULL)
- wpa_s->ctrl_dst = dst->next;
- else
- prev->next = dst->next;
- free(dst);
- wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor detached "
- "%s:%d", inet_ntoa(from->sin_addr),
- ntohs(from->sin_port));
- return 0;
- }
-#else /* CONFIG_CTRL_IFACE_UDP */
- if (fromlen == dst->addrlen &&
- memcmp(from->sun_path, dst->addr.sun_path, fromlen) == 0) {
- if (prev == NULL)
- wpa_s->ctrl_dst = dst->next;
- else
- prev->next = dst->next;
- free(dst);
- wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor detached",
- (u8 *) from->sun_path, fromlen);
- return 0;
- }
-#endif /* CONFIG_CTRL_IFACE_UDP */
- prev = dst;
- dst = dst->next;
}
- return -1;
-}
+ wpa_printf(MSG_DEBUG, "CTRL_IFACE STKSTART " MACSTR,
+ MAC2STR(peer));
-static int wpa_supplicant_ctrl_iface_level(struct wpa_supplicant *wpa_s,
- CTRL_IFACE_SOCK *from,
- socklen_t fromlen,
- char *level)
-{
- struct wpa_ctrl_dst *dst;
-
- wpa_printf(MSG_DEBUG, "CTRL_IFACE LEVEL %s", level);
-
- dst = wpa_s->ctrl_dst;
- while (dst) {
-#ifdef CONFIG_CTRL_IFACE_UDP
- if (from->sin_addr.s_addr == dst->addr.sin_addr.s_addr &&
- from->sin_port == dst->addr.sin_port) {
- wpa_printf(MSG_DEBUG, "CTRL_IFACE changed monitor "
- "level %s:%d", inet_ntoa(from->sin_addr),
- ntohs(from->sin_port));
- dst->debug_level = atoi(level);
- return 0;
- }
-#else /* CONFIG_CTRL_IFACE_UDP */
- if (fromlen == dst->addrlen &&
- memcmp(from->sun_path, dst->addr.sun_path, fromlen) == 0) {
- wpa_hexdump(MSG_DEBUG, "CTRL_IFACE changed monitor "
- "level", (u8 *) from->sun_path, fromlen);
- dst->debug_level = atoi(level);
- return 0;
- }
-#endif /* CONFIG_CTRL_IFACE_UDP */
- dst = dst->next;
- }
-
- return -1;
+ return wpa_sm_stkstart(wpa_s->wpa, peer);
}
+#endif /* CONFIG_PEERKEY */
static int wpa_supplicant_ctrl_iface_ctrl_rsp(struct wpa_supplicant *wpa_s,
char *rsp)
{
+#ifdef IEEE8021X_EAPOL
char *pos, *id_pos;
int id;
struct wpa_ssid *ssid;
- pos = strchr(rsp, '-');
+ pos = os_strchr(rsp, '-');
if (pos == NULL)
return -1;
*pos++ = '\0';
id_pos = pos;
- pos = strchr(pos, ':');
+ pos = os_strchr(pos, ':');
if (pos == NULL)
return -1;
*pos++ = '\0';
id = atoi(id_pos);
wpa_printf(MSG_DEBUG, "CTRL_IFACE: field=%s id=%d", rsp, id);
wpa_hexdump_ascii_key(MSG_DEBUG, "CTRL_IFACE: value",
- (u8 *) pos, strlen(pos));
+ (u8 *) pos, os_strlen(pos));
ssid = wpa_config_get_network(wpa_s->conf, id);
if (ssid == NULL) {
@@ -257,43 +146,43 @@ static int wpa_supplicant_ctrl_iface_ctrl_rsp(struct wpa_supplicant *wpa_s,
return -1;
}
- if (strcmp(rsp, "IDENTITY") == 0) {
- free(ssid->identity);
- ssid->identity = (u8 *) strdup(pos);
- ssid->identity_len = strlen(pos);
+ if (os_strcmp(rsp, "IDENTITY") == 0) {
+ os_free(ssid->identity);
+ ssid->identity = (u8 *) os_strdup(pos);
+ ssid->identity_len = os_strlen(pos);
ssid->pending_req_identity = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
- } else if (strcmp(rsp, "PASSWORD") == 0) {
- free(ssid->password);
- ssid->password = (u8 *) strdup(pos);
- ssid->password_len = strlen(pos);
+ } else if (os_strcmp(rsp, "PASSWORD") == 0) {
+ os_free(ssid->password);
+ ssid->password = (u8 *) os_strdup(pos);
+ ssid->password_len = os_strlen(pos);
ssid->pending_req_password = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
- } else if (strcmp(rsp, "NEW_PASSWORD") == 0) {
- free(ssid->new_password);
- ssid->new_password = (u8 *) strdup(pos);
- ssid->new_password_len = strlen(pos);
+ } else if (os_strcmp(rsp, "NEW_PASSWORD") == 0) {
+ os_free(ssid->new_password);
+ ssid->new_password = (u8 *) os_strdup(pos);
+ ssid->new_password_len = os_strlen(pos);
ssid->pending_req_new_password = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
- } else if (strcmp(rsp, "PIN") == 0) {
- free(ssid->pin);
- ssid->pin = strdup(pos);
+ } else if (os_strcmp(rsp, "PIN") == 0) {
+ os_free(ssid->pin);
+ ssid->pin = os_strdup(pos);
ssid->pending_req_pin = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
- } else if (strcmp(rsp, "OTP") == 0) {
- free(ssid->otp);
- ssid->otp = (u8 *) strdup(pos);
- ssid->otp_len = strlen(pos);
- free(ssid->pending_req_otp);
+ } else if (os_strcmp(rsp, "OTP") == 0) {
+ os_free(ssid->otp);
+ ssid->otp = (u8 *) os_strdup(pos);
+ ssid->otp_len = os_strlen(pos);
+ os_free(ssid->pending_req_otp);
ssid->pending_req_otp = NULL;
ssid->pending_req_otp_len = 0;
- } else if (strcmp(rsp, "PASSPHRASE") == 0) {
- free(ssid->private_key_passwd);
- ssid->private_key_passwd = (u8 *) strdup(pos);
+ } else if (os_strcmp(rsp, "PASSPHRASE") == 0) {
+ os_free(ssid->private_key_passwd);
+ ssid->private_key_passwd = (u8 *) os_strdup(pos);
ssid->pending_req_passphrase = 0;
if (ssid == wpa_s->current_ssid)
wpa_s->reassociate = 1;
@@ -303,6 +192,10 @@ static int wpa_supplicant_ctrl_iface_ctrl_rsp(struct wpa_supplicant *wpa_s,
}
return 0;
+#else /* IEEE8021X_EAPOL */
+ wpa_printf(MSG_DEBUG, "CTRL_IFACE: 802.1X not included");
+ return -1;
+#endif /* IEEE8021X_EAPOL */
}
@@ -311,29 +204,62 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s,
char *buf, size_t buflen)
{
char *pos, *end, tmp[30];
- int res, verbose;
+ int res, verbose, ret;
- verbose = strcmp(params, "-VERBOSE") == 0;
+ verbose = os_strcmp(params, "-VERBOSE") == 0;
pos = buf;
end = buf + buflen;
if (wpa_s->wpa_state >= WPA_ASSOCIATED) {
- pos += snprintf(pos, end - pos, "bssid=" MACSTR "\n",
- MAC2STR(wpa_s->bssid));
- if (wpa_s->current_ssid) {
- pos += snprintf(pos, end - pos, "ssid=%s\n",
- wpa_ssid_txt(wpa_s->current_ssid->ssid,
- wpa_s->current_ssid->
- ssid_len));
+ struct wpa_ssid *ssid = wpa_s->current_ssid;
+ ret = os_snprintf(pos, end - pos, "bssid=" MACSTR "\n",
+ MAC2STR(wpa_s->bssid));
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ if (ssid) {
+ u8 *_ssid = ssid->ssid;
+ size_t ssid_len = ssid->ssid_len;
+ u8 ssid_buf[MAX_SSID_LEN];
+ if (ssid_len == 0) {
+ int _res = wpa_drv_get_ssid(wpa_s, ssid_buf);
+ if (_res < 0)
+ ssid_len = 0;
+ else
+ ssid_len = _res;
+ _ssid = ssid_buf;
+ }
+ ret = os_snprintf(pos, end - pos, "ssid=%s\nid=%d\n",
+ wpa_ssid_txt(_ssid, ssid_len),
+ ssid->id);
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+
+ if (ssid->id_str) {
+ ret = os_snprintf(pos, end - pos,
+ "id_str=%s\n",
+ ssid->id_str);
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
}
pos += wpa_sm_get_status(wpa_s->wpa, pos, end - pos, verbose);
}
- pos += snprintf(pos, end - pos, "wpa_state=%s\n",
- wpa_supplicant_state_txt(wpa_s->wpa_state));
+ ret = os_snprintf(pos, end - pos, "wpa_state=%s\n",
+ wpa_supplicant_state_txt(wpa_s->wpa_state));
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
if (wpa_s->l2 &&
- l2_packet_get_ip_addr(wpa_s->l2, tmp, sizeof(tmp)) >= 0)
- pos += snprintf(pos, end - pos, "ip_address=%s\n", tmp);
+ l2_packet_get_ip_addr(wpa_s->l2, tmp, sizeof(tmp)) >= 0) {
+ ret = os_snprintf(pos, end - pos, "ip_address=%s\n", tmp);
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
if (wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X ||
wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
@@ -360,7 +286,7 @@ static int wpa_supplicant_ctrl_iface_bssid(struct wpa_supplicant *wpa_s,
u8 bssid[ETH_ALEN];
/* cmd: "<network id> <BSSID>" */
- pos = strchr(cmd, ' ');
+ pos = os_strchr(cmd, ' ');
if (pos == NULL)
return -1;
*pos++ = '\0';
@@ -378,9 +304,9 @@ static int wpa_supplicant_ctrl_iface_bssid(struct wpa_supplicant *wpa_s,
return -1;
}
- memcpy(ssid->bssid, bssid, ETH_ALEN);
+ os_memcpy(ssid->bssid, bssid, ETH_ALEN);
ssid->bssid_set =
- memcmp(bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) != 0;
+ os_memcmp(bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) != 0;
return 0;
@@ -392,26 +318,44 @@ static int wpa_supplicant_ctrl_iface_list_networks(
{
char *pos, *end;
struct wpa_ssid *ssid;
+ int ret;
pos = buf;
end = buf + buflen;
- pos += snprintf(pos, end - pos, "network id / ssid / bssid / flags\n");
+ ret = os_snprintf(pos, end - pos,
+ "network id / ssid / bssid / flags\n");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
ssid = wpa_s->conf->ssid;
while (ssid) {
- pos += snprintf(pos, end - pos, "%d\t%s",
- ssid->id,
- wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
+ ret = os_snprintf(pos, end - pos, "%d\t%s",
+ ssid->id,
+ wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
if (ssid->bssid_set) {
- pos += snprintf(pos, end - pos, "\t" MACSTR,
- MAC2STR(ssid->bssid));
+ ret = os_snprintf(pos, end - pos, "\t" MACSTR,
+ MAC2STR(ssid->bssid));
} else {
- pos += snprintf(pos, end - pos, "\tany");
+ ret = os_snprintf(pos, end - pos, "\tany");
}
- pos += snprintf(pos, end - pos, "\t%s%s",
- ssid == wpa_s->current_ssid ? "[CURRENT]" : "",
- ssid->disabled ? "[DISABLED]" : "");
- pos += snprintf(pos, end - pos, "\n");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ ret = os_snprintf(pos, end - pos, "\t%s%s",
+ ssid == wpa_s->current_ssid ?
+ "[CURRENT]" : "",
+ ssid->disabled ? "[DISABLED]" : "");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ ret = os_snprintf(pos, end - pos, "\n");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
ssid = ssid->next;
}
@@ -422,66 +366,106 @@ static int wpa_supplicant_ctrl_iface_list_networks(
static char * wpa_supplicant_cipher_txt(char *pos, char *end, int cipher)
{
- int first = 1;
- pos += snprintf(pos, end - pos, "-");
+ int first = 1, ret;
+ ret = os_snprintf(pos, end - pos, "-");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
if (cipher & WPA_CIPHER_NONE) {
- pos += snprintf(pos, end - pos, "%sNONE", first ? "" : "+");
+ ret = os_snprintf(pos, end - pos, "%sNONE", first ? "" : "+");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
first = 0;
}
if (cipher & WPA_CIPHER_WEP40) {
- pos += snprintf(pos, end - pos, "%sWEP40", first ? "" : "+");
+ ret = os_snprintf(pos, end - pos, "%sWEP40", first ? "" : "+");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
first = 0;
}
if (cipher & WPA_CIPHER_WEP104) {
- pos += snprintf(pos, end - pos, "%sWEP104", first ? "" : "+");
+ ret = os_snprintf(pos, end - pos, "%sWEP104",
+ first ? "" : "+");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
first = 0;
}
if (cipher & WPA_CIPHER_TKIP) {
- pos += snprintf(pos, end - pos, "%sTKIP", first ? "" : "+");
+ ret = os_snprintf(pos, end - pos, "%sTKIP", first ? "" : "+");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
first = 0;
}
if (cipher & WPA_CIPHER_CCMP) {
- pos += snprintf(pos, end - pos, "%sCCMP", first ? "" : "+");
+ ret = os_snprintf(pos, end - pos, "%sCCMP", first ? "" : "+");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
first = 0;
}
return pos;
}
-static char * wpa_supplicant_ie_txt(struct wpa_supplicant *wpa_s,
- char *pos, char *end, const char *proto,
+static char * wpa_supplicant_ie_txt(char *pos, char *end, const char *proto,
const u8 *ie, size_t ie_len)
{
struct wpa_ie_data data;
- int first;
+ int first, ret;
- pos += snprintf(pos, end - pos, "[%s-", proto);
+ ret = os_snprintf(pos, end - pos, "[%s-", proto);
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
if (wpa_parse_wpa_ie(ie, ie_len, &data) < 0) {
- pos += snprintf(pos, end - pos, "?]");
+ ret = os_snprintf(pos, end - pos, "?]");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
return pos;
}
first = 1;
if (data.key_mgmt & WPA_KEY_MGMT_IEEE8021X) {
- pos += snprintf(pos, end - pos, "%sEAP", first ? "" : "+");
+ ret = os_snprintf(pos, end - pos, "%sEAP", first ? "" : "+");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
first = 0;
}
if (data.key_mgmt & WPA_KEY_MGMT_PSK) {
- pos += snprintf(pos, end - pos, "%sPSK", first ? "" : "+");
+ ret = os_snprintf(pos, end - pos, "%sPSK", first ? "" : "+");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
first = 0;
}
if (data.key_mgmt & WPA_KEY_MGMT_WPA_NONE) {
- pos += snprintf(pos, end - pos, "%sNone", first ? "" : "+");
+ ret = os_snprintf(pos, end - pos, "%sNone", first ? "" : "+");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
first = 0;
}
pos = wpa_supplicant_cipher_txt(pos, end, data.pairwise_cipher);
- if (data.capabilities & WPA_CAPABILITY_PREAUTH)
- pos += snprintf(pos, end - pos, "-preauth");
+ if (data.capabilities & WPA_CAPABILITY_PREAUTH) {
+ ret = os_snprintf(pos, end - pos, "-preauth");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
+ }
- pos += snprintf(pos, end - pos, "]");
+ ret = os_snprintf(pos, end - pos, "]");
+ if (ret < 0 || ret >= end - pos)
+ return pos;
+ pos += ret;
return pos;
}
@@ -492,41 +476,63 @@ static int wpa_supplicant_ctrl_iface_scan_results(
{
char *pos, *end;
struct wpa_scan_result *res;
- int i;
+ int i, ret;
if (wpa_s->scan_results == NULL &&
wpa_supplicant_get_scan_results(wpa_s) < 0)
return 0;
+ if (wpa_s->scan_results == NULL)
+ return 0;
pos = buf;
end = buf + buflen;
- pos += snprintf(pos, end - pos, "bssid / frequency / signal level / "
- "flags / ssid\n");
+ ret = os_snprintf(pos, end - pos, "bssid / frequency / signal level / "
+ "flags / ssid\n");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
for (i = 0; i < wpa_s->num_scan_results; i++) {
res = &wpa_s->scan_results[i];
- pos += snprintf(pos, end - pos, MACSTR "\t%d\t%d\t",
- MAC2STR(res->bssid), res->freq, res->level);
+ ret = os_snprintf(pos, end - pos, MACSTR "\t%d\t%d\t",
+ MAC2STR(res->bssid), res->freq, res->level);
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
if (res->wpa_ie_len) {
- pos = wpa_supplicant_ie_txt(wpa_s, pos, end, "WPA",
+ pos = wpa_supplicant_ie_txt(pos, end, "WPA",
res->wpa_ie,
res->wpa_ie_len);
}
if (res->rsn_ie_len) {
- pos = wpa_supplicant_ie_txt(wpa_s, pos, end, "WPA2",
+ pos = wpa_supplicant_ie_txt(pos, end, "WPA2",
res->rsn_ie,
res->rsn_ie_len);
}
if (!res->wpa_ie_len && !res->rsn_ie_len &&
- res->caps & IEEE80211_CAP_PRIVACY)
- pos += snprintf(pos, end - pos, "[WEP]");
- if (res->caps & IEEE80211_CAP_IBSS)
- pos += snprintf(pos, end - pos, "[IBSS]");
+ res->caps & IEEE80211_CAP_PRIVACY) {
+ ret = os_snprintf(pos, end - pos, "[WEP]");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
+ if (res->caps & IEEE80211_CAP_IBSS) {
+ ret = os_snprintf(pos, end - pos, "[IBSS]");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
- pos += snprintf(pos, end - pos, "\t%s",
- wpa_ssid_txt(res->ssid, res->ssid_len));
+ ret = os_snprintf(pos, end - pos, "\t%s",
+ wpa_ssid_txt(res->ssid, res->ssid_len));
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
- pos += snprintf(pos, end - pos, "\n");
+ ret = os_snprintf(pos, end - pos, "\n");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
}
return pos - buf;
@@ -540,7 +546,7 @@ static int wpa_supplicant_ctrl_iface_select_network(
struct wpa_ssid *ssid;
/* cmd: "<network id>" or "any" */
- if (strcmp(cmd, "any") == 0) {
+ if (os_strcmp(cmd, "any") == 0) {
wpa_printf(MSG_DEBUG, "CTRL_IFACE: SELECT_NETWORK any");
ssid = wpa_s->conf->ssid;
while (ssid) {
@@ -637,6 +643,7 @@ static int wpa_supplicant_ctrl_iface_add_network(
struct wpa_supplicant *wpa_s, char *buf, size_t buflen)
{
struct wpa_ssid *ssid;
+ int ret;
wpa_printf(MSG_DEBUG, "CTRL_IFACE: ADD_NETWORK");
@@ -646,7 +653,10 @@ static int wpa_supplicant_ctrl_iface_add_network(
ssid->disabled = 1;
wpa_config_set_network_defaults(ssid);
- return snprintf(buf, buflen, "%d\n", ssid->id);
+ ret = os_snprintf(buf, buflen, "%d\n", ssid->id);
+ if (ret < 0 || (size_t) ret >= buflen)
+ return -1;
+ return ret;
}
@@ -668,8 +678,15 @@ static int wpa_supplicant_ctrl_iface_remove_network(
return -1;
}
- if (ssid == wpa_s->current_ssid)
+ if (ssid == wpa_s->current_ssid) {
+ /*
+ * Invalidate the EAP session cache if the current network is
+ * removed.
+ */
+ eapol_sm_invalidate_cached_session(wpa_s->eapol);
+
wpa_supplicant_disassociate(wpa_s, REASON_DEAUTH_LEAVING);
+ }
return 0;
}
@@ -683,19 +700,21 @@ static int wpa_supplicant_ctrl_iface_set_network(
char *name, *value;
/* cmd: "<network id> <variable name> <value>" */
- name = strchr(cmd, ' ');
+ name = os_strchr(cmd, ' ');
if (name == NULL)
return -1;
*name++ = '\0';
- value = strchr(name, ' ');
+ value = os_strchr(name, ' ');
if (value == NULL)
return -1;
*value++ = '\0';
id = atoi(cmd);
- wpa_printf(MSG_DEBUG, "CTRL_IFACE: SET_NETWORK id=%d name='%s' "
- "value='%s'", id, name, value);
+ wpa_printf(MSG_DEBUG, "CTRL_IFACE: SET_NETWORK id=%d name='%s'",
+ id, name);
+ wpa_hexdump_ascii_key(MSG_DEBUG, "CTRL_IFACE: value",
+ (u8 *) value, os_strlen(value));
ssid = wpa_config_get_network(wpa_s->conf, id);
if (ssid == NULL) {
@@ -706,12 +725,21 @@ static int wpa_supplicant_ctrl_iface_set_network(
if (wpa_config_set(ssid, name, value, 0) < 0) {
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Failed to set network "
- "variable '%s' to '%s'", name, value);
+ "variable '%s'", name);
return -1;
}
- if ((strcmp(name, "psk") == 0 && value[0] == '"' && ssid->ssid_len) ||
- (strcmp(name, "ssid") == 0 && ssid->passphrase))
+ if (wpa_s->current_ssid == ssid) {
+ /*
+ * Invalidate the EAP session cache if anything in the current
+ * configuration changes.
+ */
+ eapol_sm_invalidate_cached_session(wpa_s->eapol);
+ }
+
+ if ((os_strcmp(name, "psk") == 0 &&
+ value[0] == '"' && ssid->ssid_len) ||
+ (os_strcmp(name, "ssid") == 0 && ssid->passphrase))
wpa_config_update_psk(ssid);
return 0;
@@ -726,8 +754,8 @@ static int wpa_supplicant_ctrl_iface_get_network(
char *name, *value;
/* cmd: "<network id> <variable name>" */
- name = strchr(cmd, ' ');
- if (name == NULL)
+ name = os_strchr(cmd, ' ');
+ if (name == NULL || buflen == 0)
return -1;
*name++ = '\0';
@@ -742,18 +770,19 @@ static int wpa_supplicant_ctrl_iface_get_network(
return -1;
}
- value = wpa_config_get(ssid, name);
+ value = wpa_config_get_no_key(ssid, name);
if (value == NULL) {
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Failed to get network "
"variable '%s'", name);
return -1;
}
- snprintf(buf, buflen, "%s", value);
+ os_snprintf(buf, buflen, "%s", value);
+ buf[buflen - 1] = '\0';
- free(value);
+ os_free(value);
- return strlen(buf);
+ return os_strlen(buf);
}
@@ -781,16 +810,28 @@ static int wpa_supplicant_ctrl_iface_save_config(struct wpa_supplicant *wpa_s)
static int wpa_supplicant_ctrl_iface_get_capability(
- struct wpa_supplicant *wpa_s, const char *field, char *buf,
+ struct wpa_supplicant *wpa_s, const char *_field, char *buf,
size_t buflen)
{
struct wpa_driver_capa capa;
- int res, first = 1;
- char *pos, *end;
+ int res, first = 1, ret;
+ char *pos, *end, *strict;
+ char field[30];
+
+ /* Determine whether or not strict checking was requested */
+ os_snprintf(field, sizeof(field), "%s", _field);
+ field[sizeof(field) - 1] = '\0';
+ strict = os_strchr(field, ' ');
+ if (strict != NULL) {
+ *strict++ = '\0';
+ if (os_strcmp(strict, "strict") != 0)
+ return -1;
+ }
- wpa_printf(MSG_DEBUG, "CTRL_IFACE: GET_CAPABILITY '%s'", field);
+ wpa_printf(MSG_DEBUG, "CTRL_IFACE: GET_CAPABILITY '%s' %s",
+ field, strict ? strict : "");
- if (strcmp(field, "eap") == 0) {
+ if (os_strcmp(field, "eap") == 0) {
return eap_get_names(buf, buflen);
}
@@ -799,124 +840,205 @@ static int wpa_supplicant_ctrl_iface_get_capability(
pos = buf;
end = pos + buflen;
- if (strcmp(field, "pairwise") == 0) {
- if (res < 0)
- return snprintf(buf, buflen, "CCMP TKIP NONE");
+ if (os_strcmp(field, "pairwise") == 0) {
+ if (res < 0) {
+ if (strict)
+ return 0;
+ ret = os_snprintf(buf, buflen, "CCMP TKIP NONE");
+ if (ret < 0 || (size_t) ret >= buflen)
+ return -1;
+ return ret;
+ }
if (capa.enc & WPA_DRIVER_CAPA_ENC_CCMP) {
- pos += snprintf(pos, end - pos, "%sCCMP",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sCCMP",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
if (capa.enc & WPA_DRIVER_CAPA_ENC_TKIP) {
- pos += snprintf(pos, end - pos, "%sTKIP",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sTKIP",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
if (capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE) {
- pos += snprintf(pos, end - pos, "%sNONE",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sNONE",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
return pos - buf;
}
- if (strcmp(field, "group") == 0) {
- if (res < 0)
- return snprintf(buf, buflen, "CCMP TKIP WEP104 WEP40");
+ if (os_strcmp(field, "group") == 0) {
+ if (res < 0) {
+ if (strict)
+ return 0;
+ ret = os_snprintf(buf, buflen,
+ "CCMP TKIP WEP104 WEP40");
+ if (ret < 0 || (size_t) ret >= buflen)
+ return -1;
+ return ret;
+ }
if (capa.enc & WPA_DRIVER_CAPA_ENC_CCMP) {
- pos += snprintf(pos, end - pos, "%sCCMP",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sCCMP",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
if (capa.enc & WPA_DRIVER_CAPA_ENC_TKIP) {
- pos += snprintf(pos, end - pos, "%sTKIP",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sTKIP",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
if (capa.enc & WPA_DRIVER_CAPA_ENC_WEP104) {
- pos += snprintf(pos, end - pos, "%sWEP104",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sWEP104",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
if (capa.enc & WPA_DRIVER_CAPA_ENC_WEP40) {
- pos += snprintf(pos, end - pos, "%sWEP40",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sWEP40",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
return pos - buf;
}
- if (strcmp(field, "key_mgmt") == 0) {
+ if (os_strcmp(field, "key_mgmt") == 0) {
if (res < 0) {
- return snprintf(buf, buflen, "WPA-PSK WPA-EAP "
- "IEEE8021X WPA-NONE NONE");
+ if (strict)
+ return 0;
+ ret = os_snprintf(buf, buflen, "WPA-PSK WPA-EAP "
+ "IEEE8021X WPA-NONE NONE");
+ if (ret < 0 || (size_t) ret >= buflen)
+ return -1;
+ return ret;
}
- pos += snprintf(pos, end - pos, "NONE IEEE8021X");
+ ret = os_snprintf(pos, end - pos, "NONE IEEE8021X");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA |
- WPA_DRIVER_CAPA_KEY_MGMT_WPA2))
- pos += snprintf(pos, end - pos, " WPA-EAP");
+ WPA_DRIVER_CAPA_KEY_MGMT_WPA2)) {
+ ret = os_snprintf(pos, end - pos, " WPA-EAP");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK |
- WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK))
- pos += snprintf(pos, end - pos, " WPA-PSK");
+ WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK)) {
+ ret = os_snprintf(pos, end - pos, " WPA-PSK");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
- if (capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE)
- pos += snprintf(pos, end - pos, " WPA-NONE");
+ if (capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE) {
+ ret = os_snprintf(pos, end - pos, " WPA-NONE");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
+ }
return pos - buf;
}
- if (strcmp(field, "proto") == 0) {
- if (res < 0)
- return snprintf(buf, buflen, "RSN WPA");
+ if (os_strcmp(field, "proto") == 0) {
+ if (res < 0) {
+ if (strict)
+ return 0;
+ ret = os_snprintf(buf, buflen, "RSN WPA");
+ if (ret < 0 || (size_t) ret >= buflen)
+ return -1;
+ return ret;
+ }
if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |
WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK)) {
- pos += snprintf(pos, end - pos, "%sRSN",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sRSN",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA |
WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK)) {
- pos += snprintf(pos, end - pos, "%sWPA",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sWPA",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
return pos - buf;
}
- if (strcmp(field, "auth_alg") == 0) {
- if (res < 0)
- return snprintf(buf, buflen, "OPEN SHARED LEAP");
+ if (os_strcmp(field, "auth_alg") == 0) {
+ if (res < 0) {
+ if (strict)
+ return 0;
+ ret = os_snprintf(buf, buflen, "OPEN SHARED LEAP");
+ if (ret < 0 || (size_t) ret >= buflen)
+ return -1;
+ return ret;
+ }
if (capa.auth & (WPA_DRIVER_AUTH_OPEN)) {
- pos += snprintf(pos, end - pos, "%sOPEN",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sOPEN",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
if (capa.auth & (WPA_DRIVER_AUTH_SHARED)) {
- pos += snprintf(pos, end - pos, "%sSHARED",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sSHARED",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
if (capa.auth & (WPA_DRIVER_AUTH_LEAP)) {
- pos += snprintf(pos, end - pos, "%sLEAP",
- first ? "" : " ");
+ ret = os_snprintf(pos, end - pos, "%sLEAP",
+ first ? "" : " ");
+ if (ret < 0 || ret >= end - pos)
+ return pos - buf;
+ pos += ret;
first = 0;
}
@@ -930,49 +1052,51 @@ static int wpa_supplicant_ctrl_iface_get_capability(
}
-static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
- void *sock_ctx)
+static int wpa_supplicant_ctrl_iface_ap_scan(
+ struct wpa_supplicant *wpa_s, char *cmd)
+{
+ int ap_scan = atoi(cmd);
+
+ if (ap_scan < 0 || ap_scan > 2)
+ return -1;
+ wpa_s->conf->ap_scan = ap_scan;
+ return 0;
+}
+
+
+char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
+ char *buf, size_t *resp_len)
{
- struct wpa_supplicant *wpa_s = eloop_ctx;
- char buf[256];
- int res;
- CTRL_IFACE_SOCK from;
- socklen_t fromlen = sizeof(from);
char *reply;
const int reply_size = 2048;
+ int ctrl_rsp = 0;
int reply_len;
- int new_attached = 0, ctrl_rsp = 0;
- res = recvfrom(sock, buf, sizeof(buf) - 1, 0,
- (struct sockaddr *) &from, &fromlen);
- if (res < 0) {
- perror("recvfrom(ctrl_iface)");
- return;
- }
- buf[res] = '\0';
- if (strncmp(buf, WPA_CTRL_RSP, strlen(WPA_CTRL_RSP)) == 0) {
+ if (os_strncmp(buf, WPA_CTRL_RSP, os_strlen(WPA_CTRL_RSP)) == 0 ||
+ os_strncmp(buf, "SET_NETWORK ", 12) == 0) {
wpa_hexdump_ascii_key(MSG_DEBUG, "RX ctrl_iface",
- (u8 *) buf, res);
+ (const u8 *) buf, os_strlen(buf));
} else {
- wpa_hexdump_ascii(MSG_DEBUG, "RX ctrl_iface", (u8 *) buf, res);
+ wpa_hexdump_ascii(MSG_DEBUG, "RX ctrl_iface",
+ (const u8 *) buf, os_strlen(buf));
}
- reply = malloc(reply_size);
+ reply = os_malloc(reply_size);
if (reply == NULL) {
- sendto(sock, "FAIL\n", 5, 0, (struct sockaddr *) &from,
- fromlen);
- return;
+ *resp_len = 1;
+ return NULL;
}
- memcpy(reply, "OK\n", 3);
+ os_memcpy(reply, "OK\n", 3);
reply_len = 3;
- if (strcmp(buf, "PING") == 0) {
- memcpy(reply, "PONG\n", 5);
+ if (os_strcmp(buf, "PING") == 0) {
+ os_memcpy(reply, "PONG\n", 5);
reply_len = 5;
- } else if (strcmp(buf, "MIB") == 0) {
+ } else if (os_strcmp(buf, "MIB") == 0) {
reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
if (reply_len >= 0) {
+ int res;
res = eapol_sm_get_mib(wpa_s->eapol, reply + reply_len,
reply_size - reply_len);
if (res < 0)
@@ -980,452 +1104,105 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
else
reply_len += res;
}
- } else if (strncmp(buf, "STATUS", 6) == 0) {
+ } else if (os_strncmp(buf, "STATUS", 6) == 0) {
reply_len = wpa_supplicant_ctrl_iface_status(
wpa_s, buf + 6, reply, reply_size);
- } else if (strcmp(buf, "PMKSA") == 0) {
+ } else if (os_strcmp(buf, "PMKSA") == 0) {
reply_len = pmksa_cache_list(wpa_s->wpa, reply, reply_size);
- } else if (strncmp(buf, "SET ", 4) == 0) {
+ } else if (os_strncmp(buf, "SET ", 4) == 0) {
if (wpa_supplicant_ctrl_iface_set(wpa_s, buf + 4))
reply_len = -1;
- } else if (strcmp(buf, "LOGON") == 0) {
+ } else if (os_strcmp(buf, "LOGON") == 0) {
eapol_sm_notify_logoff(wpa_s->eapol, FALSE);
- } else if (strcmp(buf, "LOGOFF") == 0) {
+ } else if (os_strcmp(buf, "LOGOFF") == 0) {
eapol_sm_notify_logoff(wpa_s->eapol, TRUE);
- } else if (strcmp(buf, "REASSOCIATE") == 0) {
+ } else if (os_strcmp(buf, "REASSOCIATE") == 0) {
wpa_s->disconnected = 0;
wpa_s->reassociate = 1;
wpa_supplicant_req_scan(wpa_s, 0, 0);
- } else if (strncmp(buf, "PREAUTH ", 8) == 0) {
+ } else if (os_strncmp(buf, "PREAUTH ", 8) == 0) {
if (wpa_supplicant_ctrl_iface_preauth(wpa_s, buf + 8))
reply_len = -1;
- } else if (strcmp(buf, "ATTACH") == 0) {
- if (wpa_supplicant_ctrl_iface_attach(wpa_s, &from, fromlen))
- reply_len = -1;
- else
- new_attached = 1;
- } else if (strcmp(buf, "DETACH") == 0) {
- if (wpa_supplicant_ctrl_iface_detach(wpa_s, &from, fromlen))
- reply_len = -1;
- } else if (strncmp(buf, "LEVEL ", 6) == 0) {
- if (wpa_supplicant_ctrl_iface_level(wpa_s, &from, fromlen,
- buf + 6))
+#ifdef CONFIG_PEERKEY
+ } else if (os_strncmp(buf, "STKSTART ", 9) == 0) {
+ if (wpa_supplicant_ctrl_iface_stkstart(wpa_s, buf + 9))
reply_len = -1;
- } else if (strncmp(buf, WPA_CTRL_RSP, strlen(WPA_CTRL_RSP)) == 0) {
+#endif /* CONFIG_PEERKEY */
+ } else if (os_strncmp(buf, WPA_CTRL_RSP, os_strlen(WPA_CTRL_RSP)) == 0)
+ {
if (wpa_supplicant_ctrl_iface_ctrl_rsp(
- wpa_s, buf + strlen(WPA_CTRL_RSP)))
+ wpa_s, buf + os_strlen(WPA_CTRL_RSP)))
reply_len = -1;
else
ctrl_rsp = 1;
- } else if (strcmp(buf, "RECONFIGURE") == 0) {
+ } else if (os_strcmp(buf, "RECONFIGURE") == 0) {
if (wpa_supplicant_reload_configuration(wpa_s))
reply_len = -1;
- } else if (strcmp(buf, "TERMINATE") == 0) {
+ } else if (os_strcmp(buf, "TERMINATE") == 0) {
eloop_terminate();
- } else if (strncmp(buf, "BSSID ", 6) == 0) {
+ } else if (os_strncmp(buf, "BSSID ", 6) == 0) {
if (wpa_supplicant_ctrl_iface_bssid(wpa_s, buf + 6))
reply_len = -1;
- } else if (strcmp(buf, "LIST_NETWORKS") == 0) {
+ } else if (os_strcmp(buf, "LIST_NETWORKS") == 0) {
reply_len = wpa_supplicant_ctrl_iface_list_networks(
wpa_s, reply, reply_size);
- } else if (strcmp(buf, "DISCONNECT") == 0) {
+ } else if (os_strcmp(buf, "DISCONNECT") == 0) {
wpa_s->disconnected = 1;
wpa_supplicant_disassociate(wpa_s, REASON_DEAUTH_LEAVING);
- } else if (strcmp(buf, "SCAN") == 0) {
+ } else if (os_strcmp(buf, "SCAN") == 0) {
wpa_s->scan_req = 2;
wpa_supplicant_req_scan(wpa_s, 0, 0);
- } else if (strcmp(buf, "SCAN_RESULTS") == 0) {
+ } else if (os_strcmp(buf, "SCAN_RESULTS") == 0) {
reply_len = wpa_supplicant_ctrl_iface_scan_results(
wpa_s, reply, reply_size);
- } else if (strncmp(buf, "SELECT_NETWORK ", 15) == 0) {
+ } else if (os_strncmp(buf, "SELECT_NETWORK ", 15) == 0) {
if (wpa_supplicant_ctrl_iface_select_network(wpa_s, buf + 15))
reply_len = -1;
- } else if (strncmp(buf, "ENABLE_NETWORK ", 15) == 0) {
+ } else if (os_strncmp(buf, "ENABLE_NETWORK ", 15) == 0) {
if (wpa_supplicant_ctrl_iface_enable_network(wpa_s, buf + 15))
reply_len = -1;
- } else if (strncmp(buf, "DISABLE_NETWORK ", 16) == 0) {
+ } else if (os_strncmp(buf, "DISABLE_NETWORK ", 16) == 0) {
if (wpa_supplicant_ctrl_iface_disable_network(wpa_s, buf + 16))
reply_len = -1;
- } else if (strcmp(buf, "ADD_NETWORK") == 0) {
+ } else if (os_strcmp(buf, "ADD_NETWORK") == 0) {
reply_len = wpa_supplicant_ctrl_iface_add_network(
wpa_s, reply, reply_size);
- } else if (strncmp(buf, "REMOVE_NETWORK ", 15) == 0) {
+ } else if (os_strncmp(buf, "REMOVE_NETWORK ", 15) == 0) {
if (wpa_supplicant_ctrl_iface_remove_network(wpa_s, buf + 15))
reply_len = -1;
- } else if (strncmp(buf, "SET_NETWORK ", 12) == 0) {
+ } else if (os_strncmp(buf, "SET_NETWORK ", 12) == 0) {
if (wpa_supplicant_ctrl_iface_set_network(wpa_s, buf + 12))
reply_len = -1;
- } else if (strncmp(buf, "GET_NETWORK ", 12) == 0) {
+ } else if (os_strncmp(buf, "GET_NETWORK ", 12) == 0) {
reply_len = wpa_supplicant_ctrl_iface_get_network(
wpa_s, buf + 12, reply, reply_size);
- } else if (strcmp(buf, "SAVE_CONFIG") == 0) {
+ } else if (os_strcmp(buf, "SAVE_CONFIG") == 0) {
if (wpa_supplicant_ctrl_iface_save_config(wpa_s))
reply_len = -1;
- } else if (strncmp(buf, "GET_CAPABILITY ", 15) == 0) {
+ } else if (os_strncmp(buf, "GET_CAPABILITY ", 15) == 0) {
reply_len = wpa_supplicant_ctrl_iface_get_capability(
wpa_s, buf + 15, reply, reply_size);
+ } else if (os_strncmp(buf, "AP_SCAN ", 8) == 0) {
+ if (wpa_supplicant_ctrl_iface_ap_scan(wpa_s, buf + 8))
+ reply_len = -1;
+ } else if (os_strcmp(buf, "INTERFACES") == 0) {
+ reply_len = wpa_supplicant_global_iface_interfaces(
+ wpa_s->global, reply, reply_size);
} else {
- memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
reply_len = 16;
}
if (reply_len < 0) {
- memcpy(reply, "FAIL\n", 5);
+ os_memcpy(reply, "FAIL\n", 5);
reply_len = 5;
}
- sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from, fromlen);
- free(reply);
- if (new_attached)
- eapol_sm_notify_ctrl_attached(wpa_s->eapol);
if (ctrl_rsp)
eapol_sm_notify_ctrl_response(wpa_s->eapol);
-}
-
-
-#ifndef CONFIG_CTRL_IFACE_UDP
-static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)
-{
- char *buf;
- size_t len;
-
- if (wpa_s->conf->ctrl_interface == NULL)
- return NULL;
-
- len = strlen(wpa_s->conf->ctrl_interface) + strlen(wpa_s->ifname) + 2;
- buf = malloc(len);
- if (buf == NULL)
- return NULL;
-
- snprintf(buf, len, "%s/%s",
- wpa_s->conf->ctrl_interface, wpa_s->ifname);
-#ifdef __CYGWIN__
- {
- /* Windows/WinPcap uses interface names that are not suitable
- * as a file name - convert invalid chars to underscores */
- char *pos = buf;
- while (*pos) {
- if (*pos == '\\')
- *pos = '_';
- pos++;
- }
- }
-#endif /* __CYGWIN__ */
- return buf;
-}
-#endif /* CONFIG_CTRL_IFACE_UDP */
-
-
-/**
- * wpa_supplicant_ctrl_iface_init - Initialize control interface
- * @wpa_s: Pointer to wpa_supplicant data
- * Returns: 0 on success, -1 on failure
- *
- * Initialize the control interface and start receiving commands from external
- * programs.
- */
-int wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
-{
- CTRL_IFACE_SOCK addr;
- int s = -1;
-#ifndef CONFIG_CTRL_IFACE_UDP
- char *fname = NULL;
-#endif /* CONFIG_CTRL_IFACE_UDP */
-
- wpa_s->ctrl_sock = -1;
-
- if (wpa_s->conf->ctrl_interface == NULL)
- return 0;
-
-#ifdef CONFIG_CTRL_IFACE_UDP
- s = socket(PF_INET, SOCK_DGRAM, 0);
- if (s < 0) {
- perror("socket(PF_INET)");
- goto fail;
- }
-
- memset(&addr, 0, sizeof(addr));
- addr.sin_family = AF_INET;
- addr.sin_addr.s_addr = htonl((127 << 24) | 1);
- addr.sin_port = htons(WPA_CTRL_IFACE_PORT);
- if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- perror("bind(AF_INET)");
- goto fail;
- }
-#else /* CONFIG_CTRL_IFACE_UDP */
- if (mkdir(wpa_s->conf->ctrl_interface, S_IRWXU | S_IRWXG) < 0) {
- if (errno == EEXIST) {
- wpa_printf(MSG_DEBUG, "Using existing control "
- "interface directory.");
- } else {
- perror("mkdir[ctrl_interface]");
- goto fail;
- }
- }
-
- if (wpa_s->conf->ctrl_interface_gid_set &&
- chown(wpa_s->conf->ctrl_interface, 0,
- wpa_s->conf->ctrl_interface_gid) < 0) {
- perror("chown[ctrl_interface]");
- return -1;
- }
-
- if (strlen(wpa_s->conf->ctrl_interface) + 1 + strlen(wpa_s->ifname) >=
- sizeof(addr.sun_path))
- goto fail;
-
- s = socket(PF_UNIX, SOCK_DGRAM, 0);
- if (s < 0) {
- perror("socket(PF_UNIX)");
- goto fail;
- }
-
- memset(&addr, 0, sizeof(addr));
- addr.sun_family = AF_UNIX;
- fname = wpa_supplicant_ctrl_iface_path(wpa_s);
- if (fname == NULL)
- goto fail;
- strncpy(addr.sun_path, fname, sizeof(addr.sun_path));
- if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- perror("bind(PF_UNIX)");
- if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"
- " allow connections - assuming it was left"
- "over from forced program termination");
- if (unlink(fname) < 0) {
- perror("unlink[ctrl_iface]");
- wpa_printf(MSG_ERROR, "Could not unlink "
- "existing ctrl_iface socket '%s'",
- fname);
- goto fail;
- }
- if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) <
- 0) {
- perror("bind(PF_UNIX)");
- goto fail;
- }
- wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
- "ctrl_iface socket '%s'", fname);
- } else {
- wpa_printf(MSG_INFO, "ctrl_iface exists and seems to "
- "be in use - cannot override it");
- wpa_printf(MSG_INFO, "Delete '%s' manually if it is "
- "not used anymore", fname);
- free(fname);
- fname = NULL;
- goto fail;
- }
- }
-
- if (wpa_s->conf->ctrl_interface_gid_set &&
- chown(fname, 0, wpa_s->conf->ctrl_interface_gid) < 0) {
- perror("chown[ctrl_interface/ifname]");
- goto fail;
- }
-
- if (chmod(fname, S_IRWXU | S_IRWXG) < 0) {
- perror("chmod[ctrl_interface/ifname]");
- goto fail;
- }
- free(fname);
-#endif /* CONFIG_CTRL_IFACE_UDP */
-
- wpa_s->ctrl_sock = s;
- eloop_register_read_sock(s, wpa_supplicant_ctrl_iface_receive, wpa_s,
- NULL);
- return 0;
-
-fail:
- if (s >= 0)
- close(s);
-#ifndef CONFIG_CTRL_IFACE_UDP
- if (fname) {
- unlink(fname);
- free(fname);
- }
-#endif /* CONFIG_CTRL_IFACE_UDP */
- return -1;
-}
-
-
-/**
- * wpa_supplicant_ctrl_iface_deinit - Deinitialize control interface
- * @wpa_s: Pointer to wpa_supplicant data
- *
- * Deinitialize the control interface that was initialized with
- * wpa_supplicant_ctrl_iface_init().
- */
-void wpa_supplicant_ctrl_iface_deinit(struct wpa_supplicant *wpa_s)
-{
- struct wpa_ctrl_dst *dst, *prev;
-
- if (wpa_s->ctrl_sock > -1) {
-#ifndef CONFIG_CTRL_IFACE_UDP
- char *fname;
-#endif /* CONFIG_CTRL_IFACE_UDP */
- eloop_unregister_read_sock(wpa_s->ctrl_sock);
- if (wpa_s->ctrl_dst) {
- /*
- * Wait a second before closing the control socket if
- * there are any attached monitors in order to allow
- * them to receive any pending messages.
- */
- wpa_printf(MSG_DEBUG, "CTRL_IFACE wait for attached "
- "monitors to receive messages");
- sleep(1);
- }
- close(wpa_s->ctrl_sock);
- wpa_s->ctrl_sock = -1;
-#ifndef CONFIG_CTRL_IFACE_UDP
- fname = wpa_supplicant_ctrl_iface_path(wpa_s);
- if (fname)
- unlink(fname);
- free(fname);
-
- if (rmdir(wpa_s->conf->ctrl_interface) < 0) {
- if (errno == ENOTEMPTY) {
- wpa_printf(MSG_DEBUG, "Control interface "
- "directory not empty - leaving it "
- "behind");
- } else {
- perror("rmdir[ctrl_interface]");
- }
- }
-#endif /* CONFIG_CTRL_IFACE_UDP */
- }
-
- dst = wpa_s->ctrl_dst;
- while (dst) {
- prev = dst;
- dst = dst->next;
- free(prev);
- }
-}
-
-
-/**
- * wpa_supplicant_ctrl_iface_send - Send a control interface packet to monitors
- * @wpa_s: Pointer to wpa_supplicant data
- * @level: Priority level of the message
- * @buf: Message data
- * @len: Message length
- *
- * Send a packet to all monitor programs attached to the control interface.
- */
-void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s, int level,
- char *buf, size_t len)
-{
- struct wpa_ctrl_dst *dst, *next;
- char levelstr[10];
- int idx;
-#ifdef CONFIG_CTRL_IFACE_UDP
- char *sbuf;
- int llen;
-
- dst = wpa_s->ctrl_dst;
- if (wpa_s->ctrl_sock < 0 || dst == NULL)
- return;
-
- snprintf(levelstr, sizeof(levelstr), "<%d>", level);
-
- llen = strlen(levelstr);
- sbuf = malloc(llen + len);
- if (sbuf == NULL)
- return;
-
- memcpy(sbuf, levelstr, llen);
- memcpy(sbuf + llen, buf, len);
-
- idx = 0;
- while (dst) {
- next = dst->next;
- if (level >= dst->debug_level) {
- wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor send %s:%d",
- inet_ntoa(dst->addr.sin_addr),
- ntohs(dst->addr.sin_port));
- if (sendto(wpa_s->ctrl_sock, sbuf, llen + len, 0,
- (struct sockaddr *) &dst->addr,
- sizeof(dst->addr)) < 0) {
- perror("sendto(CTRL_IFACE monitor)");
- dst->errors++;
- if (dst->errors > 10) {
- wpa_supplicant_ctrl_iface_detach(
- wpa_s, &dst->addr,
- dst->addrlen);
- }
- } else
- dst->errors = 0;
- }
- idx++;
- dst = next;
- }
- free(sbuf);
-#else /* CONFIG_CTRL_IFACE_UDP */
- struct msghdr msg;
- struct iovec io[2];
-
- dst = wpa_s->ctrl_dst;
- if (wpa_s->ctrl_sock < 0 || dst == NULL)
- return;
-
- snprintf(levelstr, sizeof(levelstr), "<%d>", level);
- io[0].iov_base = levelstr;
- io[0].iov_len = strlen(levelstr);
- io[1].iov_base = buf;
- io[1].iov_len = len;
- memset(&msg, 0, sizeof(msg));
- msg.msg_iov = io;
- msg.msg_iovlen = 2;
-
- idx = 0;
- while (dst) {
- next = dst->next;
- if (level >= dst->debug_level) {
- wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor send",
- (u8 *) dst->addr.sun_path, dst->addrlen);
- msg.msg_name = &dst->addr;
- msg.msg_namelen = dst->addrlen;
- if (sendmsg(wpa_s->ctrl_sock, &msg, 0) < 0) {
- perror("sendmsg(CTRL_IFACE monitor)");
- dst->errors++;
- if (dst->errors > 10) {
- wpa_supplicant_ctrl_iface_detach(
- wpa_s, &dst->addr,
- dst->addrlen);
- }
- } else
- dst->errors = 0;
- }
- idx++;
- dst = next;
- }
-#endif /* CONFIG_CTRL_IFACE_UDP */
-}
-
-
-/**
- * wpa_supplicant_ctrl_iface_wait - Wait for ctrl_iface monitor
- * @wpa_s: Pointer to wpa_supplicant data
- *
- * Wait until the first message from an external program using the control
- * interface is received. This function can be used to delay normal startup
- * processing to allow control interface programs to attach with
- * %wpa_supplicant before normal operations are started.
- */
-void wpa_supplicant_ctrl_iface_wait(struct wpa_supplicant *wpa_s)
-{
- fd_set rfds;
-
- if (wpa_s->ctrl_sock < 0)
- return;
-
- wpa_printf(MSG_DEBUG, "CTRL_IFACE - %s - wait for monitor",
- wpa_s->ifname);
-
- FD_ZERO(&rfds);
- FD_SET(wpa_s->ctrl_sock, &rfds);
- select(wpa_s->ctrl_sock + 1, &rfds, NULL, NULL, NULL);
+ *resp_len = reply_len;
+ return reply;
}
@@ -1437,14 +1214,15 @@ static int wpa_supplicant_global_iface_add(struct wpa_global *global,
/*
* <ifname>TAB<confname>TAB<driver>TAB<ctrl_interface>TAB<driver_param>
+ * TAB<bridge_ifname>
*/
wpa_printf(MSG_DEBUG, "CTRL_IFACE GLOBAL INTERFACE_ADD '%s'", cmd);
- memset(&iface, 0, sizeof(iface));
+ os_memset(&iface, 0, sizeof(iface));
do {
iface.ifname = pos = cmd;
- pos = strchr(pos, '\t');
+ pos = os_strchr(pos, '\t');
if (pos)
*pos++ = '\0';
if (iface.ifname[0] == '\0')
@@ -1453,7 +1231,7 @@ static int wpa_supplicant_global_iface_add(struct wpa_global *global,
break;
iface.confname = pos;
- pos = strchr(pos, '\t');
+ pos = os_strchr(pos, '\t');
if (pos)
*pos++ = '\0';
if (iface.confname[0] == '\0')
@@ -1462,7 +1240,7 @@ static int wpa_supplicant_global_iface_add(struct wpa_global *global,
break;
iface.driver = pos;
- pos = strchr(pos, '\t');
+ pos = os_strchr(pos, '\t');
if (pos)
*pos++ = '\0';
if (iface.driver[0] == '\0')
@@ -1471,7 +1249,7 @@ static int wpa_supplicant_global_iface_add(struct wpa_global *global,
break;
iface.ctrl_interface = pos;
- pos = strchr(pos, '\t');
+ pos = os_strchr(pos, '\t');
if (pos)
*pos++ = '\0';
if (iface.ctrl_interface[0] == '\0')
@@ -1480,13 +1258,22 @@ static int wpa_supplicant_global_iface_add(struct wpa_global *global,
break;
iface.driver_param = pos;
- pos = strchr(pos, '\t');
+ pos = os_strchr(pos, '\t');
if (pos)
*pos++ = '\0';
if (iface.driver_param[0] == '\0')
iface.driver_param = NULL;
if (pos == NULL)
break;
+
+ iface.bridge_ifname = pos;
+ pos = os_strchr(pos, '\t');
+ if (pos)
+ *pos++ = '\0';
+ if (iface.bridge_ifname[0] == '\0')
+ iface.bridge_ifname = NULL;
+ if (pos == NULL)
+ break;
} while (0);
if (wpa_supplicant_get_iface(global, iface.ifname))
@@ -1510,179 +1297,73 @@ static int wpa_supplicant_global_iface_remove(struct wpa_global *global,
}
-static void wpa_supplicant_global_ctrl_iface_receive(int sock, void *eloop_ctx,
- void *sock_ctx)
+static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global,
+ char *buf, int len)
{
- struct wpa_global *global = eloop_ctx;
- char buf[256];
int res;
- CTRL_IFACE_SOCK from;
- socklen_t fromlen = sizeof(from);
+ char *pos, *end;
+ struct wpa_supplicant *wpa_s;
+
+ wpa_s = global->ifaces;
+ pos = buf;
+ end = buf + len;
+
+ while (wpa_s) {
+ res = os_snprintf(pos, end - pos, "%s\n", wpa_s->ifname);
+ if (res < 0 || res >= end - pos) {
+ *pos = '\0';
+ break;
+ }
+ pos += res;
+ wpa_s = wpa_s->next;
+ }
+ return pos - buf;
+}
+
+
+char * wpa_supplicant_global_ctrl_iface_process(struct wpa_global *global,
+ char *buf, size_t *resp_len)
+{
char *reply;
const int reply_size = 2048;
int reply_len;
- res = recvfrom(sock, buf, sizeof(buf) - 1, 0,
- (struct sockaddr *) &from, &fromlen);
- if (res < 0) {
- perror("recvfrom(ctrl_iface)");
- return;
- }
- buf[res] = '\0';
- wpa_hexdump_ascii(MSG_DEBUG, "RX global ctrl_iface", (u8 *) buf, res);
+ wpa_hexdump_ascii(MSG_DEBUG, "RX global ctrl_iface",
+ (const u8 *) buf, os_strlen(buf));
- reply = malloc(reply_size);
+ reply = os_malloc(reply_size);
if (reply == NULL) {
- sendto(sock, "FAIL\n", 5, 0, (struct sockaddr *) &from,
- fromlen);
- return;
+ *resp_len = 1;
+ return NULL;
}
- memcpy(reply, "OK\n", 3);
+ os_memcpy(reply, "OK\n", 3);
reply_len = 3;
- if (strcmp(buf, "PING") == 0) {
- memcpy(reply, "PONG\n", 5);
+ if (os_strcmp(buf, "PING") == 0) {
+ os_memcpy(reply, "PONG\n", 5);
reply_len = 5;
- } else if (strncmp(buf, "INTERFACE_ADD ", 14) == 0) {
+ } else if (os_strncmp(buf, "INTERFACE_ADD ", 14) == 0) {
if (wpa_supplicant_global_iface_add(global, buf + 14))
reply_len = -1;
- } else if (strncmp(buf, "INTERFACE_REMOVE ", 17) == 0) {
+ } else if (os_strncmp(buf, "INTERFACE_REMOVE ", 17) == 0) {
if (wpa_supplicant_global_iface_remove(global, buf + 17))
reply_len = -1;
+ } else if (os_strcmp(buf, "INTERFACES") == 0) {
+ reply_len = wpa_supplicant_global_iface_interfaces(
+ global, reply, reply_size);
+ } else if (os_strcmp(buf, "TERMINATE") == 0) {
+ eloop_terminate();
} else {
- memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
reply_len = 16;
}
if (reply_len < 0) {
- memcpy(reply, "FAIL\n", 5);
+ os_memcpy(reply, "FAIL\n", 5);
reply_len = 5;
}
- sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from, fromlen);
- free(reply);
-}
-
-
-/**
- * wpa_supplicant_global_ctrl_iface_init - Initialize global control interface
- * @global: Pointer to global data from wpa_supplicant_init()
- * Returns: 0 on success, -1 on failure
- *
- * Initialize the global control interface and start receiving commands from
- * external programs.
- */
-int wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)
-{
- CTRL_IFACE_SOCK addr;
- int s = -1;
-#ifndef CONFIG_CTRL_IFACE_UDP
- char *fname = NULL;
-#endif /* CONFIG_CTRL_IFACE_UDP */
-
- global->ctrl_sock = -1;
-
- if (global->params.ctrl_interface == NULL)
- return 0;
-
- wpa_printf(MSG_DEBUG, "Global control interface '%s'",
- global->params.ctrl_interface);
-
-#ifdef CONFIG_CTRL_IFACE_UDP
- s = socket(PF_INET, SOCK_DGRAM, 0);
- if (s < 0) {
- perror("socket(PF_INET)");
- goto fail;
- }
-
- memset(&addr, 0, sizeof(addr));
- addr.sin_family = AF_INET;
- addr.sin_addr.s_addr = htonl((127 << 24) | 1);
- addr.sin_port = htons(WPA_GLOBAL_CTRL_IFACE_PORT);
- if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- perror("bind(AF_INET)");
- goto fail;
- }
-#else /* CONFIG_CTRL_IFACE_UDP */
- s = socket(PF_UNIX, SOCK_DGRAM, 0);
- if (s < 0) {
- perror("socket(PF_UNIX)");
- goto fail;
- }
-
- memset(&addr, 0, sizeof(addr));
- addr.sun_family = AF_UNIX;
- strncpy(addr.sun_path, global->params.ctrl_interface,
- sizeof(addr.sun_path));
- if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- perror("bind(PF_UNIX)");
- if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"
- " allow connections - assuming it was left"
- "over from forced program termination");
- if (unlink(global->params.ctrl_interface) < 0) {
- perror("unlink[ctrl_iface]");
- wpa_printf(MSG_ERROR, "Could not unlink "
- "existing ctrl_iface socket '%s'",
- global->params.ctrl_interface);
- goto fail;
- }
- if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) <
- 0) {
- perror("bind(PF_UNIX)");
- goto fail;
- }
- wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
- "ctrl_iface socket '%s'",
- global->params.ctrl_interface);
- } else {
- wpa_printf(MSG_INFO, "ctrl_iface exists and seems to "
- "be in use - cannot override it");
- wpa_printf(MSG_INFO, "Delete '%s' manually if it is "
- "not used anymore",
- global->params.ctrl_interface);
- goto fail;
- }
- }
-#endif /* CONFIG_CTRL_IFACE_UDP */
-
- global->ctrl_sock = s;
- eloop_register_read_sock(s, wpa_supplicant_global_ctrl_iface_receive,
- global, NULL);
-
- return 0;
-
-fail:
- if (s >= 0)
- close(s);
-#ifndef CONFIG_CTRL_IFACE_UDP
- if (fname) {
- unlink(fname);
- free(fname);
- }
-#endif /* CONFIG_CTRL_IFACE_UDP */
- return -1;
-}
-
-
-/**
- * wpa_supplicant_global_ctrl_iface_deinit - Deinitialize global ctrl interface
- * @global: Pointer to global data from wpa_supplicant_init()
- *
- * Deinitialize the global control interface that was initialized with
- * wpa_supplicant_global_ctrl_iface_init().
- */
-void wpa_supplicant_global_ctrl_iface_deinit(struct wpa_global *global)
-{
- if (global->ctrl_sock < 0)
- return;
-
- eloop_unregister_read_sock(global->ctrl_sock);
- close(global->ctrl_sock);
- global->ctrl_sock = -1;
-#ifndef CONFIG_CTRL_IFACE_UDP
- if (global->params.ctrl_interface)
- unlink(global->params.ctrl_interface);
-#endif /* CONFIG_CTRL_IFACE_UDP */
+ *resp_len = reply_len;
+ return reply;
}
OpenPOWER on IntegriCloud