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/054908a03311
branches: trunk
changeset: 349051:054908a03311
user: christos <christos%NetBSD.org@localhost>
date: Mon Nov 21 20:15:16 2016 +0000
description:
Merge conflicts.
diffstat:
external/bsd/wpa/bin/Makefile.inc | 3 +-
external/bsd/wpa/bin/hostapd/Makefile | 9 +-
external/bsd/wpa/bin/hostapd_cli/Makefile | 3 +-
external/bsd/wpa/bin/wpa_cli/Makefile | 3 +-
external/bsd/wpa/bin/wpa_supplicant/Makefile | 20 +-
external/bsd/wpa/dist/hostapd/hostapd_cli.c | 731 +++-
external/bsd/wpa/dist/hostapd/main.c | 154 +-
external/bsd/wpa/dist/patches/openssl-0.9.8za-tls-extensions.patch | 397 --
external/bsd/wpa/dist/src/ap/ap_drv_ops.c | 323 +-
external/bsd/wpa/dist/src/ap/drv_callbacks.c | 252 +-
external/bsd/wpa/dist/src/ap/hostapd.c | 641 +++-
external/bsd/wpa/dist/src/ap/hostapd.h | 78 +-
external/bsd/wpa/dist/src/ap/wpa_auth.c | 345 +-
external/bsd/wpa/dist/src/crypto/crypto_cryptoapi.c | 783 ----
external/bsd/wpa/dist/src/crypto/tls_schannel.c | 763 ----
external/bsd/wpa/dist/src/drivers/driver.h | 418 ++-
external/bsd/wpa/dist/src/drivers/driver_bsd.c | 12 +-
external/bsd/wpa/dist/src/eap_peer/eap_pwd.c | 105 +-
external/bsd/wpa/dist/src/eap_server/eap_server.c | 47 +-
external/bsd/wpa/dist/src/eap_server/eap_server_pwd.c | 63 +-
external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c | 53 +-
external/bsd/wpa/dist/src/p2p/p2p.c | 544 ++-
external/bsd/wpa/dist/src/radius/radius_das.c | 14 +-
external/bsd/wpa/dist/src/utils/common.c | 155 +-
external/bsd/wpa/dist/src/utils/common.h | 55 +-
external/bsd/wpa/dist/src/utils/eloop.c | 75 +-
external/bsd/wpa/dist/src/utils/os.h | 19 +
external/bsd/wpa/dist/src/utils/os_unix.c | 127 +-
external/bsd/wpa/dist/src/utils/radiotap.h | 6 +-
external/bsd/wpa/dist/src/utils/trace.h | 2 +
external/bsd/wpa/dist/src/wps/httpread.c | 116 +-
external/bsd/wpa/dist/wpa_supplicant/Makefile | 260 +-
external/bsd/wpa/dist/wpa_supplicant/README | 29 +-
external/bsd/wpa/dist/wpa_supplicant/config.c | 223 +-
external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c | 1829 +++++++--
external/bsd/wpa/dist/wpa_supplicant/defconfig | 50 +
external/bsd/wpa/dist/wpa_supplicant/driver_i.h | 4 +-
external/bsd/wpa/dist/wpa_supplicant/events.c | 721 +++-
external/bsd/wpa/dist/wpa_supplicant/main.c | 23 +-
external/bsd/wpa/dist/wpa_supplicant/tests/link_test.c | 83 -
external/bsd/wpa/dist/wpa_supplicant/tests/test_eap_sim_common.c | 47 -
external/bsd/wpa/dist/wpa_supplicant/tests/test_wpa.c | 369 --
external/bsd/wpa/dist/wpa_supplicant/wnm_sta.c | 497 ++-
external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c | 1010 +++--
external/bsd/wpa/dist/wpa_supplicant/wpa_priv.c | 139 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c | 1483 +++++++-
external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant_i.h | 211 +-
47 files changed, 8750 insertions(+), 4544 deletions(-)
diffs (truncated from 21504 to 300 lines):
diff -r fddf7c40e61b -r 054908a03311 external/bsd/wpa/bin/Makefile.inc
--- a/external/bsd/wpa/bin/Makefile.inc Mon Nov 21 17:00:32 2016 +0000
+++ b/external/bsd/wpa/bin/Makefile.inc Mon Nov 21 20:15:16 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2016/01/24 18:49:05 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2016/11/21 20:15:16 christos Exp $
BINDIR?= /usr/sbin
@@ -14,6 +14,7 @@
${WPA_DISTDIR}/src/crypto \
${WPA_DISTDIR}/src/eap_common \
${WPA_DISTDIR}/src/eapol_supp \
+ ${WPA_DISTDIR}/src/fst \
${WPA_DISTDIR}/src/l2_packet \
${WPA_DISTDIR}/src/utils
diff -r fddf7c40e61b -r 054908a03311 external/bsd/wpa/bin/hostapd/Makefile
--- a/external/bsd/wpa/bin/hostapd/Makefile Mon Nov 21 17:00:32 2016 +0000
+++ b/external/bsd/wpa/bin/hostapd/Makefile Mon Nov 21 20:15:16 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/06/29 19:16:23 christos Exp $
+# $NetBSD: Makefile,v 1.10 2016/11/21 20:15:16 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -21,19 +21,24 @@
ieee802_11_auth.c \
ieee802_11_shared.c \
ieee802_1x.c \
+neighbor_db.c \
peerkey_auth.c \
pmksa_cache_auth.c \
preauth_auth.c \
+rrm.c \
sta_info.c \
tkip_countermeasures.c \
utils.c \
+vlan_ifconfig.c \
vlan_init.c \
+vlan.c \
wpa_auth.c \
wpa_auth_glue.c \
wpa_auth_ie.c
# common
SRCS+= \
+ctrl_iface_common.c \
hw_features_common.c \
ieee802_11_common.c \
wpa_common.c \
@@ -91,6 +96,7 @@
# crypto for non-openssl
NO_SRCS+= \
+aes-cbc.c \
aes-wrap.c \
md5.c
@@ -144,7 +150,6 @@
# crypto
SRCS+= \
-aes-cbc.c \
aes-ctr.c \
aes-eax.c \
aes-encblock.c \
diff -r fddf7c40e61b -r 054908a03311 external/bsd/wpa/bin/hostapd_cli/Makefile
--- a/external/bsd/wpa/bin/hostapd_cli/Makefile Mon Nov 21 17:00:32 2016 +0000
+++ b/external/bsd/wpa/bin/hostapd_cli/Makefile Mon Nov 21 20:15:16 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/08 00:03:20 christos Exp $
+# $NetBSD: Makefile,v 1.3 2016/11/21 20:15:16 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -6,6 +6,7 @@
PROG= hostapd_cli
SRCS= hostapd_cli.c wpa_ctrl.c os_unix.c eloop.c edit.c wpa_debug.c
+SRCS+= common.c cli.c
MAN= hostapd_cli.8
diff -r fddf7c40e61b -r 054908a03311 external/bsd/wpa/bin/wpa_cli/Makefile
--- a/external/bsd/wpa/bin/wpa_cli/Makefile Mon Nov 21 17:00:32 2016 +0000
+++ b/external/bsd/wpa/bin/wpa_cli/Makefile Mon Nov 21 20:15:16 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/08 00:03:20 christos Exp $
+# $NetBSD: Makefile,v 1.5 2016/11/21 20:15:16 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -6,6 +6,7 @@
PROG= wpa_cli
SRCS= wpa_cli.c wpa_ctrl.c os_unix.c eloop.c edit.c wpa_debug.c common.c
+SRCS+= cli.c
CPPFLAGS+=-DCONFIG_READLINE
LDADD+=-ledit -lterminfo
diff -r fddf7c40e61b -r 054908a03311 external/bsd/wpa/bin/wpa_supplicant/Makefile
--- a/external/bsd/wpa/bin/wpa_supplicant/Makefile Mon Nov 21 17:00:32 2016 +0000
+++ b/external/bsd/wpa/bin/wpa_supplicant/Makefile Mon Nov 21 20:15:16 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/29 19:16:23 christos Exp $
+# $NetBSD: Makefile,v 1.9 2016/11/21 20:15:16 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -11,6 +11,7 @@
config.c \
config_file.c \
ctrl_iface.c \
+ctrl_iface_common.c \
ctrl_iface_unix.c \
driver_common.c \
driver_bsd.c \
@@ -43,6 +44,7 @@
wpabuf.c \
wpas_glue.c
+
MAN= wpa_supplicant.8 wpa_supplicant.conf.5
.PATH.c: \
@@ -67,6 +69,22 @@
CPPFLAGS+=-DCONFIG_DEBUG_FILE
CPPFLAGS+=-DCONFIG_DEBUG_SYSLOG
+#CPPFLAGS+=-DCONFIG_FST
+#SRCS+=fst.c \
+#fst_ctrl_aux.c \
+#fst_ctrl_iface.c \
+#fst_group.c \
+#fst_iface.c \
+#fst_session.c
+
+#CPPFLAGS+=-DCONFIG_ACS
+#CPPFLAGS+=-DCONFIG_MBO
+#CPPFLAGS+=-DCONFIG_WNM
+#CPPFLAGS+=-DCONFIG_AP
+#SRCS+=ap.c \
+#gas.c \
+#mbo.c
+
DPADD+= ${LIBPCAP}
LDADD+= -lpcap
diff -r fddf7c40e61b -r 054908a03311 external/bsd/wpa/dist/hostapd/hostapd_cli.c
--- a/external/bsd/wpa/dist/hostapd/hostapd_cli.c Mon Nov 21 17:00:32 2016 +0000
+++ b/external/bsd/wpa/dist/hostapd/hostapd_cli.c Mon Nov 21 20:15:16 2016 +0000
@@ -1,6 +1,6 @@
/*
* hostapd - command line interface for hostapd daemon
- * Copyright (c) 2004-2015, Jouni Malinen <j%w1.fi@localhost>
+ * Copyright (c) 2004-2016, Jouni Malinen <j%w1.fi@localhost>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@@ -10,83 +10,18 @@
#include <dirent.h>
#include "common/wpa_ctrl.h"
+#include "common/ieee802_11_defs.h"
#include "utils/common.h"
#include "utils/eloop.h"
#include "utils/edit.h"
#include "common/version.h"
-
+#include "common/cli.h"
-static const char *hostapd_cli_version =
-"hostapd_cli v" VERSION_STR "\n"
-"Copyright (c) 2004-2015, Jouni Malinen <j%w1.fi@localhost> and contributors";
-
-
-static const char *hostapd_cli_license =
-"This software may be distributed under the terms of the BSD license.\n"
-"See README for more details.\n";
+#ifndef CONFIG_NO_CTRL_IFACE
-static const char *hostapd_cli_full_license =
-"This software may be distributed under the terms of the BSD license.\n"
-"\n"
-"Redistribution and use in source and binary forms, with or without\n"
-"modification, are permitted provided that the following conditions are\n"
-"met:\n"
-"\n"
-"1. Redistributions of source code must retain the above copyright\n"
-" notice, this list of conditions and the following disclaimer.\n"
-"\n"
-"2. Redistributions in binary form must reproduce the above copyright\n"
-" notice, this list of conditions and the following disclaimer in the\n"
-" documentation and/or other materials provided with the distribution.\n"
-"\n"
-"3. Neither the name(s) of the above-listed copyright holder(s) nor the\n"
-" names of its contributors may be used to endorse or promote products\n"
-" derived from this software without specific prior written permission.\n"
-"\n"
-"THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
-"\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
-"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
-"A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n"
-"OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
-"SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
-"LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
-"DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
-"THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
-"(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
-"OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-"\n";
-
-static const char *commands_help =
-"Commands:\n"
-" mib get MIB variables (dot1x, dot11, radius)\n"
-" sta <addr> get MIB variables for one station\n"
-" all_sta get MIB variables for all stations\n"
-" new_sta <addr> add a new station\n"
-" deauthenticate <addr> deauthenticate a station\n"
-" disassociate <addr> disassociate a station\n"
-#ifdef CONFIG_IEEE80211W
-" sa_query <addr> send SA Query to a station\n"
-#endif /* CONFIG_IEEE80211W */
-#ifdef CONFIG_WPS
-" wps_pin <uuid> <pin> [timeout] [addr] add WPS Enrollee PIN\n"
-" wps_check_pin <PIN> verify PIN checksum\n"
-" wps_pbc indicate button pushed to initiate PBC\n"
-" wps_cancel cancel the pending WPS operation\n"
-#ifdef CONFIG_WPS_NFC
-" wps_nfc_tag_read <hexdump> report read NFC tag with WPS data\n"
-" wps_nfc_config_token <WPS/NDEF> build NFC configuration token\n"
-" wps_nfc_token <WPS/NDEF/enable/disable> manager NFC password token\n"
-#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"
-" interface [ifname] show interfaces/select interface\n"
-" level <debug level> change debug level\n"
-" license show full hostapd_cli license\n"
-" quit exit hostapd_cli\n";
+static const char *const hostapd_cli_version =
+"hostapd_cli v" VERSION_STR "\n"
+"Copyright (c) 2004-2016, Jouni Malinen <j%w1.fi@localhost> and contributors";
static struct wpa_ctrl *ctrl_conn;
static int hostapd_cli_quit = 0;
@@ -96,12 +31,20 @@
#define CONFIG_CTRL_IFACE_DIR "/var/run/hostapd"
#endif /* CONFIG_CTRL_IFACE_DIR */
static const char *ctrl_iface_dir = CONFIG_CTRL_IFACE_DIR;
+static const char *client_socket_dir = NULL;
static char *ctrl_ifname = NULL;
static const char *pid_file = NULL;
static const char *action_file = NULL;
static int ping_interval = 5;
static int interactive = 0;
+static int event_handler_registered = 0;
+
+static DEFINE_DL_LIST(stations); /* struct cli_txt_entry */
+
+static void print_help(FILE *stream, const char *cmd);
+static char ** list_cmd_list(void);
+static void hostapd_cli_receive(int sock, void *eloop_ctx, void *sock_ctx);
static void usage(void)
@@ -111,42 +54,81 @@
"\n"
"usage: hostapd_cli [-p<path>] [-i<ifname>] [-hvB] "
"[-a<path>] \\\n"
- " [-G<ping interval>] [command..]\n"
+ " [-P<pid file>] [-G<ping interval>] [command..]\n"
"\n"
"Options:\n"
" -h help (show this usage text)\n"
" -v shown version information\n"
" -p<path> path to find control sockets (default: "
"/var/run/hostapd)\n"
+ " -s<dir_path> dir path to open client sockets (default: "
+ CONFIG_CTRL_IFACE_DIR ")\n"
" -a<file> run in daemon mode executing the action file "
"based on events\n"
" from hostapd\n"
" -B run a daemon in the background\n"
" -i<ifname> Interface to listen on (default: first "
"interface found in the\n"
- " socket path)\n\n"
- "%s",
- commands_help);
+ " socket path)\n\n");
+ print_help(stderr, NULL);
+}
+
+
+static void register_event_handler(struct wpa_ctrl *ctrl)
Home |
Main Index |
Thread Index |
Old Index