Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/wpa merge conflicts.
details: https://anonhg.NetBSD.org/src/rev/11ee18a1d5ad
branches: trunk
changeset: 333057:11ee18a1d5ad
user: christos <christos%NetBSD.org@localhost>
date: Thu Oct 16 19:29:29 2014 +0000
description:
merge conflicts.
diffstat:
external/bsd/wpa/bin/hostapd/Makefile | 3 +-
external/bsd/wpa/bin/wpa_supplicant/Makefile | 3 +-
external/bsd/wpa/dist/hostapd/dump_state.c | 180 --
external/bsd/wpa/dist/hostapd/dump_state.h | 14 -
external/bsd/wpa/dist/hostapd/hostapd_cli.c | 258 +++-
external/bsd/wpa/dist/patches/openssl-0.9.8-tls-extensions.patch | 429 ------
external/bsd/wpa/dist/patches/openssl-0.9.8d-tls-extensions.patch | 429 ------
external/bsd/wpa/dist/patches/openssl-0.9.8e-tls-extensions.patch | 353 -----
external/bsd/wpa/dist/patches/openssl-0.9.8g-tls-extensions.patch | 330 ----
external/bsd/wpa/dist/patches/openssl-0.9.8h-tls-extensions.patch | 344 -----
external/bsd/wpa/dist/patches/openssl-0.9.8i-tls-extensions.patch | 404 -----
external/bsd/wpa/dist/patches/openssl-0.9.8x-tls-extensions.patch | 396 -----
external/bsd/wpa/dist/patches/openssl-0.9.9-session-ticket.patch | 374 -----
external/bsd/wpa/dist/src/ap/wpa_auth.c | 264 +++-
external/bsd/wpa/dist/src/crypto/fips_prf_cryptoapi.c | 19 -
external/bsd/wpa/dist/src/crypto/fips_prf_gnutls.c | 20 -
external/bsd/wpa/dist/src/crypto/fips_prf_nss.c | 19 -
external/bsd/wpa/dist/src/drivers/driver_bsd.c | 188 +-
external/bsd/wpa/dist/src/drivers/driver_test.c | 660 +---------
external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c | 29 +
external/bsd/wpa/dist/src/radius/radius_das.c | 44 +-
external/bsd/wpa/dist/src/utils/eloop.c | 329 ++++-
external/bsd/wpa/dist/src/utils/eloop_none.c | 395 -----
external/bsd/wpa/dist/src/utils/os.h | 152 +-
external/bsd/wpa/dist/src/utils/radiotap.h | 55 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c | 688 +++++++--
26 files changed, 1675 insertions(+), 4704 deletions(-)
diffs (truncated from 8186 to 300 lines):
diff -r 85dfd2e3d230 -r 11ee18a1d5ad external/bsd/wpa/bin/hostapd/Makefile
--- a/external/bsd/wpa/bin/hostapd/Makefile Thu Oct 16 19:16:01 2014 +0000
+++ b/external/bsd/wpa/bin/hostapd/Makefile Thu Oct 16 19:29:29 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/01/03 02:15:43 christos Exp $
+# $NetBSD: Makefile,v 1.6 2014/10/16 19:29:29 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -65,7 +65,6 @@
main.c \
config_file.c \
ctrl_iface.c \
-dump_state.c \
eap_register.c
# l2_packet
diff -r 85dfd2e3d230 -r 11ee18a1d5ad external/bsd/wpa/bin/wpa_supplicant/Makefile
--- a/external/bsd/wpa/bin/wpa_supplicant/Makefile Thu Oct 16 19:16:01 2014 +0000
+++ b/external/bsd/wpa/bin/wpa_supplicant/Makefile Thu Oct 16 19:29:29 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/01/03 02:07:31 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/10/16 19:29:29 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -22,6 +22,7 @@
eapol_supp_sm.c \
eloop.c \
events.c \
+ieee802_11_common.c \
l2_packet_freebsd.c \
main.c \
md5.c \
diff -r 85dfd2e3d230 -r 11ee18a1d5ad external/bsd/wpa/dist/hostapd/dump_state.c
--- a/external/bsd/wpa/dist/hostapd/dump_state.c Thu Oct 16 19:16:01 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-/*
- * hostapd / State dump
- * Copyright (c) 2002-2009, Jouni Malinen <j%w1.fi@localhost>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "utils/includes.h"
-#include <time.h>
-
-#include "utils/common.h"
-#include "radius/radius_client.h"
-#include "radius/radius_server.h"
-#include "eapol_auth/eapol_auth_sm.h"
-#include "eapol_auth/eapol_auth_sm_i.h"
-#include "eap_server/eap.h"
-#include "ap/hostapd.h"
-#include "ap/ap_config.h"
-#include "ap/sta_info.h"
-#include "dump_state.h"
-
-
-static void fprint_char(FILE *f, char c)
-{
- if (c >= 32 && c < 127)
- fprintf(f, "%c", c);
- else
- fprintf(f, "<%02x>", c);
-}
-
-
-static void ieee802_1x_dump_state(FILE *f, const char *prefix,
- struct sta_info *sta)
-{
- struct eapol_state_machine *sm = sta->eapol_sm;
- if (sm == NULL)
- return;
-
- fprintf(f, "%sIEEE 802.1X:\n", prefix);
-
- if (sm->identity) {
- size_t i;
- fprintf(f, "%sidentity=", prefix);
- for (i = 0; i < sm->identity_len; i++)
- fprint_char(f, sm->identity[i]);
- fprintf(f, "\n");
- }
-
- fprintf(f, "%slast EAP type: Authentication Server: %d (%s) "
- "Supplicant: %d (%s)\n", prefix,
- sm->eap_type_authsrv,
- eap_server_get_name(0, sm->eap_type_authsrv),
- sm->eap_type_supp, eap_server_get_name(0, sm->eap_type_supp));
-
- fprintf(f, "%scached_packets=%s\n", prefix,
- sm->last_recv_radius ? "[RX RADIUS]" : "");
-
- eapol_auth_dump_state(f, prefix, sm);
-}
-
-
-/**
- * hostapd_dump_state - SIGUSR1 handler to dump hostapd state to a text file
- */
-static void hostapd_dump_state(struct hostapd_data *hapd)
-{
- FILE *f;
- time_t now;
- struct sta_info *sta;
- int i;
-#ifndef CONFIG_NO_RADIUS
- char *buf;
-#endif /* CONFIG_NO_RADIUS */
-
- if (!hapd->conf->dump_log_name) {
- wpa_printf(MSG_DEBUG, "Dump file not defined - ignoring dump "
- "request");
- return;
- }
-
- wpa_printf(MSG_DEBUG, "Dumping hostapd state to '%s'",
- hapd->conf->dump_log_name);
- f = fopen(hapd->conf->dump_log_name, "w");
- if (f == NULL) {
- wpa_printf(MSG_WARNING, "Could not open dump file '%s' for "
- "writing.", hapd->conf->dump_log_name);
- return;
- }
-
- time(&now);
- fprintf(f, "hostapd state dump - %s", ctime(&now));
- fprintf(f, "num_sta=%d num_sta_non_erp=%d "
- "num_sta_no_short_slot_time=%d\n"
- "num_sta_no_short_preamble=%d\n",
- hapd->num_sta, hapd->iface->num_sta_non_erp,
- hapd->iface->num_sta_no_short_slot_time,
- hapd->iface->num_sta_no_short_preamble);
-
- for (sta = hapd->sta_list; sta != NULL; sta = sta->next) {
- fprintf(f, "\nSTA=" MACSTR "\n", MAC2STR(sta->addr));
-
- fprintf(f,
- " AID=%d flags=0x%x %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s"
- "\n"
- " capability=0x%x listen_interval=%d\n",
- sta->aid,
- sta->flags,
- (sta->flags & WLAN_STA_AUTH ? "[AUTH]" : ""),
- (sta->flags & WLAN_STA_ASSOC ? "[ASSOC]" : ""),
- (sta->flags & WLAN_STA_PS ? "[PS]" : ""),
- (sta->flags & WLAN_STA_TIM ? "[TIM]" : ""),
- (sta->flags & WLAN_STA_PERM ? "[PERM]" : ""),
- (ap_sta_is_authorized(sta) ? "[AUTHORIZED]" : ""),
- (sta->flags & WLAN_STA_PENDING_POLL ? "[PENDING_POLL" :
- ""),
- (sta->flags & WLAN_STA_SHORT_PREAMBLE ?
- "[SHORT_PREAMBLE]" : ""),
- (sta->flags & WLAN_STA_PREAUTH ? "[PREAUTH]" : ""),
- (sta->flags & WLAN_STA_WMM ? "[WMM]" : ""),
- (sta->flags & WLAN_STA_MFP ? "[MFP]" : ""),
- (sta->flags & WLAN_STA_WPS ? "[WPS]" : ""),
- (sta->flags & WLAN_STA_MAYBE_WPS ? "[MAYBE_WPS]" : ""),
- (sta->flags & WLAN_STA_WDS ? "[WDS]" : ""),
- (sta->flags & WLAN_STA_NONERP ? "[NonERP]" : ""),
- (sta->flags & WLAN_STA_WPS2 ? "[WPS2]" : ""),
- sta->capability,
- sta->listen_interval);
-
- fprintf(f, " supported_rates=");
- for (i = 0; i < sta->supported_rates_len; i++)
- fprintf(f, "%02x ", sta->supported_rates[i]);
- fprintf(f, "\n");
-
- fprintf(f,
- " timeout_next=%s\n",
- (sta->timeout_next == STA_NULLFUNC ? "NULLFUNC POLL" :
- (sta->timeout_next == STA_DISASSOC ? "DISASSOC" :
- "DEAUTH")));
-
- ieee802_1x_dump_state(f, " ", sta);
- }
-
-#ifndef CONFIG_NO_RADIUS
- buf = os_malloc(4096);
- if (buf) {
- int count = radius_client_get_mib(hapd->radius, buf, 4096);
- if (count < 0)
- count = 0;
- else if (count > 4095)
- count = 4095;
- buf[count] = '\0';
- fprintf(f, "%s", buf);
-
-#ifdef RADIUS_SERVER
- count = radius_server_get_mib(hapd->radius_srv, buf, 4096);
- if (count < 0)
- count = 0;
- else if (count > 4095)
- count = 4095;
- buf[count] = '\0';
- fprintf(f, "%s", buf);
-#endif /* RADIUS_SERVER */
-
- os_free(buf);
- }
-#endif /* CONFIG_NO_RADIUS */
- fclose(f);
-}
-
-
-int handle_dump_state_iface(struct hostapd_iface *iface, void *ctx)
-{
- size_t i;
-
- for (i = 0; i < iface->num_bss; i++)
- hostapd_dump_state(iface->bss[i]);
-
- return 0;
-}
diff -r 85dfd2e3d230 -r 11ee18a1d5ad external/bsd/wpa/dist/hostapd/dump_state.h
--- a/external/bsd/wpa/dist/hostapd/dump_state.h Thu Oct 16 19:16:01 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-/*
- * hostapd / State dump
- * Copyright (c) 2002-2009, Jouni Malinen <j%w1.fi@localhost>
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#ifndef DUMP_STATE_H
-#define DUMP_STATE_H
-
-int handle_dump_state_iface(struct hostapd_iface *iface, void *ctx);
-
-#endif /* DUMP_STATE_H */
diff -r 85dfd2e3d230 -r 11ee18a1d5ad external/bsd/wpa/dist/hostapd/hostapd_cli.c
--- a/external/bsd/wpa/dist/hostapd/hostapd_cli.c Thu Oct 16 19:16:01 2014 +0000
+++ b/external/bsd/wpa/dist/hostapd/hostapd_cli.c Thu Oct 16 19:29:29 2014 +0000
@@ -1,6 +1,6 @@
/*
* hostapd - command line interface for hostapd daemon
- * Copyright (c) 2004-2012, Jouni Malinen <j%w1.fi@localhost>
+ * Copyright (c) 2004-2014, Jouni Malinen <j%w1.fi@localhost>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@@ -18,7 +18,7 @@
static const char *hostapd_cli_version =
"hostapd_cli v" VERSION_STR "\n"
-"Copyright (c) 2004-2012, Jouni Malinen <j%w1.fi@localhost> and contributors";
+"Copyright (c) 2004-2014, Jouni Malinen <j%w1.fi@localhost> and contributors";
static const char *hostapd_cli_license =
@@ -79,6 +79,7 @@
#endif /* CONFIG_WPS_NFC */
" wps_ap_pin <cmd> [params..] enable/disable AP PIN\n"
" wps_config <SSID> <auth> <encr> <key> configure AP\n"
+" wps_get_status show current WPS status\n"
#endif /* CONFIG_WPS */
" get_config show current configuration\n"
" help show this usage help\n"
@@ -90,7 +91,12 @@
static struct wpa_ctrl *ctrl_conn;
static int hostapd_cli_quit = 0;
static int hostapd_cli_attached = 0;
-static const char *ctrl_iface_dir = "/var/run/hostapd";
+
+#ifndef CONFIG_CTRL_IFACE_DIR
+#define CONFIG_CTRL_IFACE_DIR "/var/run/hostapd"
+#endif /* CONFIG_CTRL_IFACE_DIR */
+static const char *ctrl_iface_dir = CONFIG_CTRL_IFACE_DIR;
+
static char *ctrl_ifname = NULL;
static const char *pid_file = NULL;
static const char *action_file = NULL;
@@ -210,8 +216,21 @@
}
+static int hostapd_cli_cmd_status(struct wpa_ctrl *ctrl, int argc, char *argv[])
+{
+ if (argc > 0 && os_strcmp(argv[0], "driver") == 0)
+ return wpa_ctrl_command(ctrl, "STATUS-DRIVER");
+ return wpa_ctrl_command(ctrl, "STATUS");
+}
+
+
static int hostapd_cli_cmd_mib(struct wpa_ctrl *ctrl, int argc, char *argv[])
{
+ if (argc > 0) {
+ char buf[100];
+ os_snprintf(buf, sizeof(buf), "MIB %s", argv[0]);
+ return wpa_ctrl_command(ctrl, buf);
+ }
return wpa_ctrl_command(ctrl, "MIB");
}
Home |
Main Index |
Thread Index |
Old Index