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/d799c386123a
branches: trunk
changeset: 447220:d799c386123a
user: christos <christos%NetBSD.org@localhost>
date: Fri Jan 04 21:22:20 2019 +0000
description:
merge conflicts.
diffstat:
external/bsd/wpa/bin/Makefile.inc | 7 +-
external/bsd/wpa/bin/hostapd/Makefile | 9 +-
external/bsd/wpa/bin/wpa_supplicant/Makefile | 10 +-
external/bsd/wpa/dist/hostapd/hostapd_cli.c | 530 +-
external/bsd/wpa/dist/hostapd/main.c | 44 +-
external/bsd/wpa/dist/src/ap/ap_drv_ops.c | 76 +-
external/bsd/wpa/dist/src/ap/drv_callbacks.c | 457 +-
external/bsd/wpa/dist/src/ap/hostapd.c | 400 +-
external/bsd/wpa/dist/src/ap/hostapd.h | 94 +-
external/bsd/wpa/dist/src/ap/ieee802_11.c | 1843 ++++-
external/bsd/wpa/dist/src/ap/peerkey_auth.c | 396 -
external/bsd/wpa/dist/src/ap/wmm.c | 15 +-
external/bsd/wpa/dist/src/ap/wpa_auth.c | 1900 ++++-
external/bsd/wpa/dist/src/ap/wpa_auth.h | 283 +-
external/bsd/wpa/dist/src/ap/wpa_auth_ft.c | 3601 ++++++++-
external/bsd/wpa/dist/src/ap/wpa_auth_i.h | 104 +-
external/bsd/wpa/dist/src/common/wpa_common.h | 146 +-
external/bsd/wpa/dist/src/drivers/driver.h | 937 ++-
external/bsd/wpa/dist/src/drivers/driver_wired.c | 348 +-
external/bsd/wpa/dist/src/eap_peer/eap_pwd.c | 587 +-
external/bsd/wpa/dist/src/eap_server/eap_server.c | 81 +-
external/bsd/wpa/dist/src/eap_server/eap_server_pwd.c | 429 +-
external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c | 25 +-
external/bsd/wpa/dist/src/p2p/p2p.c | 86 +-
external/bsd/wpa/dist/src/radius/radius_das.c | 217 +-
external/bsd/wpa/dist/src/rsn_supp/peerkey.c | 1155 ---
external/bsd/wpa/dist/src/rsn_supp/peerkey.h | 82 -
external/bsd/wpa/dist/src/rsn_supp/tdls.c | 44 +-
external/bsd/wpa/dist/src/rsn_supp/wpa.c | 1791 ++++-
external/bsd/wpa/dist/src/rsn_supp/wpa_ft.c | 332 +-
external/bsd/wpa/dist/src/rsn_supp/wpa_i.h | 69 +-
external/bsd/wpa/dist/src/utils/common.c | 21 +
external/bsd/wpa/dist/src/utils/common.h | 15 +
external/bsd/wpa/dist/src/utils/eloop.h | 8 +-
external/bsd/wpa/dist/src/utils/os.h | 12 +
external/bsd/wpa/dist/src/utils/os_unix.c | 15 +
external/bsd/wpa/dist/wpa_supplicant/Makefile | 283 +-
external/bsd/wpa/dist/wpa_supplicant/README | 15 +-
external/bsd/wpa/dist/wpa_supplicant/config.c | 393 +-
external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c | 1391 +++-
external/bsd/wpa/dist/wpa_supplicant/defconfig | 65 +-
external/bsd/wpa/dist/wpa_supplicant/driver_i.h | 210 +-
external/bsd/wpa/dist/wpa_supplicant/events.c | 1050 ++-
external/bsd/wpa/dist/wpa_supplicant/wnm_sta.c | 532 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c | 463 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_priv.c | 265 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c | 1928 +++--
external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant_i.h | 213 +-
48 files changed, 17053 insertions(+), 5924 deletions(-)
diffs (truncated from 33769 to 300 lines):
diff -r 584faf9eb0d3 -r d799c386123a external/bsd/wpa/bin/Makefile.inc
--- a/external/bsd/wpa/bin/Makefile.inc Fri Jan 04 20:22:32 2019 +0000
+++ b/external/bsd/wpa/bin/Makefile.inc Fri Jan 04 21:22:20 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2017/05/21 15:28:39 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.7 2019/01/04 21:22:20 christos Exp $
BINDIR?= /usr/sbin
@@ -8,7 +8,7 @@
WPA_SUPPLICANT_DISTDIR?= ${WPA_DISTDIR}/wpa_supplicant
HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd
-.PATH.c: \
+COMMON_PATH= \
${WPA_DISTDIR}/src/ap \
${WPA_DISTDIR}/src/common \
${WPA_DISTDIR}/src/crypto \
@@ -26,6 +26,9 @@
-I${WPA_DISTDIR}/src/l2_packet \
-I${WPA_DISTDIR}/src/utils
+CONFIG_TLS_DEFAULT_CIPHERS = "DEFAULT:!EXP:!LOW"
+
+CPPFLAGS+= -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
CPPFLAGS+=-DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX -DCONFIG_ELOOP_KQUEUE
.include <bsd.own.mk>
diff -r 584faf9eb0d3 -r d799c386123a external/bsd/wpa/bin/hostapd/Makefile
--- a/external/bsd/wpa/bin/hostapd/Makefile Fri Jan 04 20:22:32 2019 +0000
+++ b/external/bsd/wpa/bin/hostapd/Makefile Fri Jan 04 21:22:20 2019 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2018/01/14 03:05:06 christos Exp $
+# $NetBSD: Makefile,v 1.12 2019/01/04 21:22:20 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
PROG= hostapd
+CPPFLAGS+= -Diphdr=ip
# ap
SRCS+= \
@@ -22,7 +23,6 @@
ieee802_11_shared.c \
ieee802_1x.c \
neighbor_db.c \
-peerkey_auth.c \
pmksa_cache_auth.c \
preauth_auth.c \
rrm.c \
@@ -49,6 +49,7 @@
driver_bsd.c \
driver_none.c \
driver_wired.c \
+driver_wired_common.c \
driver_common.c \
drivers.c
@@ -107,7 +108,8 @@
${WPA_DISTDIR}/src/eap_server \
${WPA_DISTDIR}/src/eapol_auth \
${WPA_DISTDIR}/src/drivers \
- ${WPA_DISTDIR}/src/radius
+ ${WPA_DISTDIR}/src/radius \
+ ${COMMON_PATH}
MAN= hostapd.8 hostapd.conf.5
@@ -122,6 +124,7 @@
CPPFLAGS+= -DCONFIG_DRIVER_NONE
CPPFLAGS+= -DCONFIG_DRIVER_WIRED
CPPFLAGS+= -DCONFIG_DRIVER_WPA
+
.if ${MKINET6} != "no"
CPPFLAGS+= -DCONFIG_IPV6
.endif
diff -r 584faf9eb0d3 -r d799c386123a external/bsd/wpa/bin/wpa_supplicant/Makefile
--- a/external/bsd/wpa/bin/wpa_supplicant/Makefile Fri Jan 04 20:22:32 2019 +0000
+++ b/external/bsd/wpa/bin/wpa_supplicant/Makefile Fri Jan 04 21:22:20 2019 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2016/11/21 20:15:16 christos Exp $
+# $NetBSD: Makefile,v 1.10 2019/01/04 21:22:20 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
PROG= wpa_supplicant
SRCS= \
base64.c \
+bitfield.c \
blacklist.c \
bss.c \
common.c \
@@ -15,6 +16,7 @@
ctrl_iface_unix.c \
driver_common.c \
driver_bsd.c \
+driver_wired_common.c \
driver_wired.c \
drivers.c \
eap_common.c \
@@ -28,10 +30,11 @@
l2_packet_freebsd.c \
main.c \
notify.c \
+op_classes.c \
os_unix.c \
-peerkey.c \
pmksa_cache.c \
preauth.c \
+rrm.c \
random.c \
scan.c \
sha1-prf.c \
@@ -51,7 +54,8 @@
${WPA_SUPPLICANT_DISTDIR} \
${WPA_DISTDIR}/src/drivers \
${WPA_DISTDIR}/src/eap_peer \
- ${WPA_DISTDIR}/src/rsn_supp
+ ${WPA_DISTDIR}/src/rsn_supp \
+ ${COMMON_PATH}
CPPFLAGS+= \
-I${WPA_SUPPLICANT_DISTDIR} \
diff -r 584faf9eb0d3 -r d799c386123a external/bsd/wpa/dist/hostapd/hostapd_cli.c
--- a/external/bsd/wpa/dist/hostapd/hostapd_cli.c Fri Jan 04 20:22:32 2019 +0000
+++ b/external/bsd/wpa/dist/hostapd/hostapd_cli.c Fri Jan 04 21:22:20 2019 +0000
@@ -1,6 +1,6 @@
/*
* hostapd - command line interface for hostapd daemon
- * Copyright (c) 2004-2016, Jouni Malinen <j%w1.fi@localhost>
+ * Copyright (c) 2004-2018, Jouni Malinen <j%w1.fi@localhost>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@@ -21,7 +21,7 @@
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";
+"Copyright (c) 2004-2018, Jouni Malinen <j%w1.fi@localhost> and contributors";
static struct wpa_ctrl *ctrl_conn;
static int hostapd_cli_quit = 0;
@@ -45,6 +45,8 @@
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 update_stations(struct wpa_ctrl *ctrl);
+static void cli_event(const char *str);
static void usage(void)
@@ -147,13 +149,45 @@
}
+static int hostapd_cli_reconnect(const char *ifname)
+{
+ char *next_ctrl_ifname;
+
+ hostapd_cli_close_connection();
+
+ if (!ifname)
+ return -1;
+
+ next_ctrl_ifname = os_strdup(ifname);
+ os_free(ctrl_ifname);
+ ctrl_ifname = next_ctrl_ifname;
+ if (!ctrl_ifname)
+ return -1;
+
+ ctrl_conn = hostapd_cli_open_connection(ctrl_ifname);
+ if (!ctrl_conn)
+ return -1;
+ if (!interactive && !action_file)
+ return 0;
+ if (wpa_ctrl_attach(ctrl_conn) == 0) {
+ hostapd_cli_attached = 1;
+ register_event_handler(ctrl_conn);
+ update_stations(ctrl_conn);
+ } else {
+ printf("Warning: Failed to attach to hostapd.\n");
+ }
+ return 0;
+}
+
+
static void hostapd_cli_msg_cb(char *msg, size_t len)
{
+ cli_event(msg);
printf("%s\n", msg);
}
-static int _wpa_ctrl_command(struct wpa_ctrl *ctrl, char *cmd, int print)
+static int _wpa_ctrl_command(struct wpa_ctrl *ctrl, const char *cmd, int print)
{
char buf[4096];
size_t len;
@@ -181,7 +215,7 @@
}
-static inline int wpa_ctrl_command(struct wpa_ctrl *ctrl, char *cmd)
+static inline int wpa_ctrl_command(struct wpa_ctrl *ctrl, const char *cmd)
{
return _wpa_ctrl_command(ctrl, cmd, 1);
}
@@ -286,6 +320,21 @@
}
+static char ** hostapd_complete_stations(const char *str, int pos)
+{
+ int arg = get_cmd_arg_num(str, pos);
+ char **res = NULL;
+
+ switch (arg) {
+ case 1:
+ res = cli_txt_list_array(&stations);
+ break;
+ }
+
+ return res;
+}
+
+
static int hostapd_cli_cmd_new_sta(struct wpa_ctrl *ctrl, int argc,
char *argv[])
{
@@ -318,21 +367,6 @@
}
-static char ** hostapd_complete_deauthenticate(const char *str, int pos)
-{
- int arg = get_cmd_arg_num(str, pos);
- char **res = NULL;
-
- switch (arg) {
- case 1:
- res = cli_txt_list_array(&stations);
- break;
- }
-
- return res;
-}
-
-
static int hostapd_cli_cmd_disassociate(struct wpa_ctrl *ctrl, int argc,
char *argv[])
{
@@ -351,21 +385,6 @@
}
-static char ** hostapd_complete_disassociate(const char *str, int pos)
-{
- int arg = get_cmd_arg_num(str, pos);
- char **res = NULL;
-
- switch (arg) {
- case 1:
- res = cli_txt_list_array(&stations);
- break;
- }
-
- return res;
-}
-
-
#ifdef CONFIG_TAXONOMY
static int hostapd_cli_cmd_signature(struct wpa_ctrl *ctrl, int argc,
char *argv[])
@@ -701,8 +720,8 @@
}
-static int wpa_ctrl_command_sta(struct wpa_ctrl *ctrl, char *cmd,
- char *addr, size_t addr_len)
+static int wpa_ctrl_command_sta(struct wpa_ctrl *ctrl, const char *cmd,
+ char *addr, size_t addr_len, int print)
{
char buf[4096], *pos;
size_t len;
@@ -726,7 +745,8 @@
buf[len] = '\0';
if (memcmp(buf, "FAIL", 4) == 0)
return -1;
- printf("%s", buf);
+ if (print)
+ printf("%s", buf);
pos = buf;
while (*pos != '\0' && *pos != '\n')
@@ -742,16 +762,33 @@
{
char addr[32], cmd[64];
Home |
Main Index |
Thread Index |
Old Index