diff options
Diffstat (limited to 'package/network')
28 files changed, 375 insertions, 269 deletions
diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile index ffaf942e54..6c2e2680fe 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-app/Makefile @@ -19,6 +19,8 @@ PKG_LICENSE:=BSD-2-Clause PKG_BUILD_DEPENDS:=kmod-ltq-vdsl-vr9 +PKG_FLAGS:=nonshared + include $(INCLUDE_DIR)/package.mk define Package/ltq-vdsl-app diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 3f12a40cd3..3f70275b92 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.75 -PKG_RELEASE:=7 +PKG_VERSION:=2.76 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=887236f1ddde6eb57cdb9d01916c9f72 +PKG_MD5SUM:=00f5ee66b4e4b7f14538bf62ae3c9461 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch index f5b5ca04ec..5fc62ffab3 100644 --- a/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch +++ b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch @@ -1,15 +1,15 @@ --- a/src/dhcp.c +++ b/src/dhcp.c -@@ -146,7 +146,7 @@ void dhcp_packet(time_t now, int pxe_fd) - struct iovec iov; +@@ -147,7 +147,7 @@ void dhcp_packet(time_t now, int pxe_fd) ssize_t sz; int iface_index = 0, unicast_dest = 0, is_inform = 0; + int rcvd_iface_index; - struct in_addr iface_addr; + struct in_addr iface_addr, *addrp = NULL; struct iface_param parm; #ifdef HAVE_LINUX_NETWORK struct arpreq arp_req; -@@ -275,11 +275,9 @@ void dhcp_packet(time_t now, int pxe_fd) +@@ -277,11 +277,9 @@ void dhcp_packet(time_t now, int pxe_fd) { ifr.ifr_addr.sa_family = AF_INET; if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 ) @@ -23,7 +23,7 @@ } for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) -@@ -298,7 +296,7 @@ void dhcp_packet(time_t now, int pxe_fd) +@@ -300,7 +298,7 @@ void dhcp_packet(time_t now, int pxe_fd) parm.relay_local.s_addr = 0; parm.ind = iface_index; @@ -32,7 +32,7 @@ { /* If we failed to match the primary address of the interface, see if we've got a --listen-address for a secondary */ -@@ -318,6 +316,12 @@ void dhcp_packet(time_t now, int pxe_fd) +@@ -320,6 +318,12 @@ void dhcp_packet(time_t now, int pxe_fd) complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm); } diff --git a/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch b/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch index 81fbf185b1..ca5a806696 100644 --- a/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch +++ b/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch @@ -10,7 +10,7 @@ Signed-off-by: Steven Barth <steven@midlink.org> --- a/src/dnssec.c +++ b/src/dnssec.c -@@ -429,17 +429,24 @@ static time_t timestamp_time; +@@ -462,17 +462,24 @@ static time_t timestamp_time; int setup_timestamp(void) { struct stat statbuf; @@ -36,7 +36,7 @@ Signed-off-by: Steven Barth <steven@midlink.org> { /* time already OK, update timestamp, and do key checking from the start. */ if (utime(daemon->timestamp_file, NULL) == -1) -@@ -460,7 +467,7 @@ int setup_timestamp(void) +@@ -493,7 +500,7 @@ int setup_timestamp(void) close(fd); diff --git a/package/network/services/dnsmasq/patches/230-fix-poll-h-include-warning-on-musl.patch b/package/network/services/dnsmasq/patches/230-fix-poll-h-include-warning-on-musl.patch new file mode 100644 index 0000000000..19300f7d66 --- /dev/null +++ b/package/network/services/dnsmasq/patches/230-fix-poll-h-include-warning-on-musl.patch @@ -0,0 +1,18 @@ +dnsmasq: fix warning with poll.h include on musl + +Warning is: + #warning redirecting incorrect #include <sys/poll.h> to <poll.h> + +Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> + +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -82,7 +82,7 @@ typedef unsigned long long u64; + #if defined(HAVE_SOLARIS_NETWORK) + # include <sys/sockio.h> + #endif +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/wait.h> + #include <sys/time.h> + #include <sys/un.h> diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 8d4e7bc7fa..c873611688 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=2015.71 -PKG_RELEASE:=3 +PKG_VERSION:=2016.73 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ http://matt.ucc.asn.au/dropbear/releases/ \ https://dropbear.nl/mirror/releases/ -PKG_MD5SUM:=2ccc0a2f3e37ca221db12c5af6a88137 +PKG_MD5SUM:=8d6d78ce60ca52350ec04fcbd711ce9b PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE diff --git a/package/network/services/dropbear/patches/120-openwrt_options.patch b/package/network/services/dropbear/patches/120-openwrt_options.patch index f020208090..f16aaf001e 100644 --- a/package/network/services/dropbear/patches/120-openwrt_options.patch +++ b/package/network/services/dropbear/patches/120-openwrt_options.patch @@ -61,7 +61,7 @@ /* ECDSA is significantly faster than RSA or DSS. Compiling in ECC * code (either ECDSA or ECDH) increases binary size - around 30kB * on x86-64 */ -@@ -189,7 +189,7 @@ If you test it please contact the Dropbe +@@ -194,7 +194,7 @@ If you test it please contact the Dropbe /* Whether to print the message of the day (MOTD). This doesn't add much code * size */ @@ -70,7 +70,7 @@ /* The MOTD file path */ #ifndef MOTD_FILENAME -@@ -237,7 +237,7 @@ Homedir is prepended unless path begins +@@ -242,7 +242,7 @@ Homedir is prepended unless path begins * note that it will be provided for all "hidden" client-interactive * style prompts - if you want something more sophisticated, use * SSH_ASKPASS instead. Comment out this var to remove this functionality.*/ diff --git a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch deleted file mode 100644 index bf1641b8bf..0000000000 --- a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/cli-runopts.c -+++ b/cli-runopts.c -@@ -284,6 +284,10 @@ void cli_getopts(int argc, char ** argv) - debug_trace = 1; - break; - #endif -+ case 'o': -+ next = &dummy; -+ case 'x': -+ break; - case 'F': - case 'e': - #ifndef ENABLE_USER_ALGO_LIST -@@ -301,7 +305,6 @@ void cli_getopts(int argc, char ** argv) - print_version(); - exit(EXIT_SUCCESS); - break; -- case 'o': - case 'b': - next = &dummy; - default: diff --git a/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch new file mode 100644 index 0000000000..ab09c2f3dc --- /dev/null +++ b/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch @@ -0,0 +1,11 @@ +--- a/cli-runopts.c ++++ b/cli-runopts.c +@@ -296,6 +296,8 @@ void cli_getopts(int argc, char ** argv) + debug_trace = 1; + break; + #endif ++ case 'x': ++ break; + case 'F': + case 'e': + #ifndef ENABLE_USER_ALGO_LIST diff --git a/package/network/services/dropbear/patches/140-disable_assert.patch b/package/network/services/dropbear/patches/140-disable_assert.patch index 667d69cb38..78b54acfa0 100644 --- a/package/network/services/dropbear/patches/140-disable_assert.patch +++ b/package/network/services/dropbear/patches/140-disable_assert.patch @@ -1,6 +1,6 @@ --- a/dbutil.h +++ b/dbutil.h -@@ -88,7 +88,11 @@ int m_str_to_uint(const char* str, unsig +@@ -78,7 +78,11 @@ int m_str_to_uint(const char* str, unsig #define DEF_MP_INT(X) mp_int X = {0, 0, 0, NULL} /* Dropbear assertion */ diff --git a/package/network/services/dropbear/patches/500-set-default-path.patch b/package/network/services/dropbear/patches/500-set-default-path.patch index 3f65250a97..da6b9ae0ce 100644 --- a/package/network/services/dropbear/patches/500-set-default-path.patch +++ b/package/network/services/dropbear/patches/500-set-default-path.patch @@ -1,6 +1,6 @@ --- a/options.h +++ b/options.h -@@ -347,7 +347,9 @@ be overridden at runtime with -I. 0 disa +@@ -352,7 +352,9 @@ be overridden at runtime with -I. 0 disa #define DEFAULT_IDLE_TIMEOUT 0 /* The default path. This will often get replaced by the shell */ diff --git a/package/network/services/mdns/Makefile b/package/network/services/mdns/Makefile index 2f467e3e4c..ec4efa7d4c 100644 --- a/package/network/services/mdns/Makefile +++ b/package/network/services/mdns/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE_URL=$(OPENWRT_GIT)/project/mdnsd.git PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=ae8773477c31b741ba8b47f8898e4c0a1c834b85 -PKG_MAINTAINER:=John Crispin <blogic@openwrt.org> +PKG_MAINTAINER:=John Crispin <john@phrozen.org> PKG_LICENSE:=LGPL-2.1 include $(INCLUDE_DIR)/package-seccomp.mk diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index 6c68b49ac4..19f78bc508 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn -PKG_VERSION:=2.3.10 +PKG_VERSION:=2.3.11 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_MD5SUM:=8831ded42db4317e287157b6b8cba74c +PKG_MD5SUM:=0f5f1ca1dc5743fa166d93dd4ec952f014b5f33bafd88f0ea34b455cae1434a7 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -73,7 +73,6 @@ define Build/Configure --disable-plugins \ --disable-debug \ --disable-pkcs11 \ - --enable-password-save \ $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_LZO),--enable,--disable)-lzo \ $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_X509_ALT_USERNAME),enable,disable-x509-alt-username)-ssl \ $(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_SERVER),--enable,--disable)-server \ diff --git a/package/network/services/openvpn/files/openvpn.init b/package/network/services/openvpn/files/openvpn.init index 5396d0bf47..6dac7b3fa1 100644 --- a/package/network/services/openvpn/files/openvpn.init +++ b/package/network/services/openvpn/files/openvpn.init @@ -121,7 +121,7 @@ start_instance() { reneg_bytes reneg_pkts reneg_sec \ replay_persist replay_window resolv_retry route route_delay route_gateway \ route_metric route_pre_down route_up rport script_security secret server server_bridge setenv shaper sndbuf \ - socks_proxy status status_version syslog tcp_queue_limit tls_auth \ + socks_proxy status status_version syslog tcp_queue_limit tls_auth tls_version_min \ tls_cipher tls_remote tls_timeout tls_verify tmp_dir topology tran_window \ tun_mtu tun_mtu_extra txqueuelen user verb down push up \ verify_x509_name x509_username_field \ diff --git a/package/network/services/openvpn/patches/100-polarssl-disable-runtime-version-check.patch b/package/network/services/openvpn/patches/100-polarssl-disable-runtime-version-check.patch index 73ab40649d..bd8e5b780d 100644 --- a/package/network/services/openvpn/patches/100-polarssl-disable-runtime-version-check.patch +++ b/package/network/services/openvpn/patches/100-polarssl-disable-runtime-version-check.patch @@ -1,6 +1,6 @@ --- a/src/openvpn/ssl_polarssl.c +++ b/src/openvpn/ssl_polarssl.c -@@ -1153,7 +1153,7 @@ const char * +@@ -1151,7 +1151,7 @@ const char * get_ssl_library_version(void) { static char polar_version[30]; diff --git a/package/network/services/openvpn/patches/101-remove_polarssl_debug_call.patch b/package/network/services/openvpn/patches/101-remove_polarssl_debug_call.patch new file mode 100644 index 0000000000..3cef32395e --- /dev/null +++ b/package/network/services/openvpn/patches/101-remove_polarssl_debug_call.patch @@ -0,0 +1,21 @@ +openvpn: remove call to PolarSSL debug function + +OpenVPN >=2.3.11 uses PolarSSL debug functions for improved logging. +This requires that PolarSSL is built with POLARSSL_DEBUG_C, which increases +its size significantly. + +This change does not impact OpenVPN operation, see: +https://sourceforge.net/p/openvpn/mailman/message/35153943/ + +Signed-off-by: Magnus Kroken <mkroken@gmail.com> + +--- a/src/openvpn/ssl_polarssl.c ++++ b/src/openvpn/ssl_polarssl.c +@@ -742,7 +742,7 @@ void key_state_ssl_init(struct key_state + if (polar_ok(ssl_init(ks_ssl->ctx))) + { + /* Initialise SSL context */ +- debug_set_threshold(3); ++ /*debug_set_threshold(3);*/ + ssl_set_dbg (ks_ssl->ctx, my_debug, NULL); + ssl_set_endpoint (ks_ssl->ctx, ssl_ctx->endpoint); diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index af38ed4aed..4b41ac33e9 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.48.0 +PKG_VERSION:=7.49.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ ftp://ftp.planetmirror.com/pub/curl/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ -PKG_MD5SUM:=d42e0fc34a5cace5739631cc040974fe +PKG_MD5SUM:=7416aaff4a9210b43edda7615ffa4169 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING @@ -109,7 +109,6 @@ CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ --disable-manual \ - --without-ca-bundle \ --without-nss \ --without-libmetalink \ --without-librtmp \ @@ -117,11 +116,11 @@ CONFIGURE_ARGS += \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ \ $(if $(CONFIG_LIBCURL_AXTLS),--with-axtls="$(STAGING_DIR)/usr" --without-ca-path,--without-axtls) \ - $(if $(CONFIG_LIBCURL_CYASSL),--with-cyassl="$(STAGING_DIR)/usr" --without-ca-path,--without-cyassl) \ - $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" --with-ca-path=/etc/ssl/certs,--without-gnutls) \ - $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --with-ca-path=/etc/ssl/certs,--without-ssl) \ - $(if $(CONFIG_LIBCURL_POLARSSL),--with-polarssl="$(STAGING_DIR)/usr" --with-ca-path=/etc/ssl/certs,--without-polarssl) \ - $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr" --without-ca-path,--without-mbedtls) \ + $(if $(CONFIG_LIBCURL_CYASSL),--with-cyassl="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-cyassl) \ + $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-gnutls) \ + $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-ssl) \ + $(if $(CONFIG_LIBCURL_POLARSSL),--with-polarssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-polarssl) \ + $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-mbedtls) \ \ $(if $(CONFIG_LIBCURL_LIBIDN),--with-libidn="$(STAGING_DIR)/usr",--without-libidn) \ $(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \ diff --git a/package/network/utils/curl/patches/200-no_docs_tests.patch b/package/network/utils/curl/patches/200-no_docs_tests.patch index 4ac5badf60..6f86d4c6cb 100644 --- a/package/network/utils/curl/patches/200-no_docs_tests.patch +++ b/package/network/utils/curl/patches/200-no_docs_tests.patch @@ -3,8 +3,8 @@ @@ -150,7 +150,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config - SUBDIRS = lib src include scripts --DIST_SUBDIRS = $(SUBDIRS) tests packages docs + SUBDIRS = lib src include +-DIST_SUBDIRS = $(SUBDIRS) tests packages docs scripts +DIST_SUBDIRS = $(SUBDIRS) packages pkgconfigdir = $(libdir)/pkgconfig @@ -14,9 +14,9 @@ @@ -611,7 +611,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config - SUBDIRS = lib src include scripts --DIST_SUBDIRS = $(SUBDIRS) tests packages docs + SUBDIRS = lib src include +-DIST_SUBDIRS = $(SUBDIRS) tests packages docs scripts +DIST_SUBDIRS = $(SUBDIRS) packages pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc - LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c \ + LIB_VAUTH_CFILES = vauth/vauth.c vauth/cleartext.c vauth/cram.c \ diff --git a/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch b/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch deleted file mode 100644 index 5c0a37e760..0000000000 --- a/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/lib/curl_ntlm_msgs.c -+++ b/lib/curl_ntlm_msgs.c -@@ -573,7 +573,7 @@ CURLcode Curl_sasl_create_ntlm_type3_mes - else - #endif - --#if USE_NTRESPONSES && USE_NTLM2SESSION -+#if USE_NTRESPONSES && USE_NTLM2SESSION && !defined(CURL_DISABLE_CRYPTO_AUTH) - /* We don't support NTLM2 if we don't have USE_NTRESPONSES */ - if(ntlm->flags & NTLMFLAG_NEGOTIATE_NTLM2_KEY) { - unsigned char ntbuffer[0x18]; ---- a/lib/vtls/vtls.c -+++ b/lib/vtls/vtls.c -@@ -921,9 +921,9 @@ CURLcode Curl_ssl_md5sum(unsigned char * - unsigned char *md5sum, /* output */ - size_t md5len) - { --#ifdef curlssl_md5sum -+#if defined(curlssl_md5sum) - curlssl_md5sum(tmp, tmplen, md5sum, md5len); --#else -+#elif !defined(CURL_DISABLE_CRYPTO_AUTH) - MD5_context *MD5pw; - - (void) md5len; diff --git a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch index 7f7937b950..bb622ee78d 100644 --- a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch +++ b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch @@ -1,6 +1,6 @@ --- a/lib/vtls/polarssl.c +++ b/lib/vtls/polarssl.c -@@ -592,7 +592,7 @@ void Curl_polarssl_session_free(void *pt +@@ -653,7 +653,7 @@ void Curl_polarssl_session_free(void *pt size_t Curl_polarssl_version(char *buffer, size_t size) { @@ -11,7 +11,7 @@ version>>24, (version>>16)&0xff, (version>>8)&0xff); --- a/lib/vtls/mbedtls.c +++ b/lib/vtls/mbedtls.c -@@ -712,7 +712,7 @@ void Curl_mbedtls_session_free(void *ptr +@@ -701,7 +701,7 @@ void Curl_mbedtls_session_free(void *ptr size_t Curl_mbedtls_version(char *buffer, size_t size) { diff --git a/package/network/utils/iperf/Makefile b/package/network/utils/iperf/Makefile index 614384916c..cfd069ff54 100644 --- a/package/network/utils/iperf/Makefile +++ b/package/network/utils/iperf/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf -PKG_VERSION:=2.0.5 +PKG_VERSION:=2.0.8 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=44b5536b67719f4250faed632a3cd016 +PKG_SOURCE_URL:=@SF/iperf2 +PKG_MD5SUM:=e5887f799d8dc64a974c6c2f2e5cc339 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_LICENSE:=BSD-3-Clause @@ -24,64 +24,29 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk -define Package/iperf/Default +define Package/iperf SECTION:=net CATEGORY:=Network - DEPENDS:= $(CXX_DEPENDS) + DEPENDS:= $(CXX_DEPENDS) +libpthread TITLE:=Internet Protocol bandwidth measuring tool - URL:=http://sourceforge.net/projects/iperf/ + URL:=http://sourceforge.net/projects/iperf2/ endef -define Package/iperf/Default/description +define Package/iperf/description Iperf is a modern alternative for measuring TCP and UDP bandwidth performance, allowing the tuning of various parameters and characteristics. endef -define Package/iperf -$(call Package/iperf/Default) - TITLE+= (with single thread support) - VARIANT:=single -endef - -define Package/iperf/description -$(call Package/iperf/Default/description) - This package is built with single thread support. -endef - -define Package/iperf-mt -$(call Package/iperf/Default) - DEPENDS+= +libpthread - TITLE+= (with multithread support) - VARIANT:=mt -endef - -define Package/iperf-mt/description -$(call Package/iperf/Default/description) - This package is built with multithread support. -endef - +TARGET_CFLAGS += -D_GNU_SOURCE CONFIGURE_ARGS += --disable-multicast -CONFIGURE_VARS += ac_cv_func_malloc_0_nonnull=yes - -ifeq ($(BUILD_VARIANT),single) - CONFIGURE_ARGS += --disable-threads -else - CONFIGURE_ARGS += --enable-threads=posix - CONFIGURE_VARS += ac_cv_func_pthread_cancel=no -endif CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-rtti" - -ifeq ($(BUILD_VARIANT),mt) - CONFIGURE_VARS += LIBS="-lpthread" -endif +CONFIGURE_VARS += LIBS="-lpthread" define Package/iperf/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/iperf $(1)/usr/bin/iperf endef -Package/iperf-mt/install = $(Package/iperf/install) $(eval $(call BuildPackage,iperf)) -$(eval $(call BuildPackage,iperf-mt)) diff --git a/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch b/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch deleted file mode 100644 index c61c75494a..0000000000 --- a/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/Reporter.c -+++ b/src/Reporter.c -@@ -308,6 +308,11 @@ ReportHeader* InitReport( thread_Setting - #else - // set start time - gettimeofday( &(reporthdr->report.startTime), NULL ); -+ -+ // set next time -+ reporthdr->report.nextTime = reporthdr->report.startTime; -+ TimeAdd( reporthdr->report.nextTime, reporthdr->report.intervalTime ); -+ - /* - * Process the report in this thread - */ diff --git a/package/network/utils/iperf/patches/002-format-security.patch b/package/network/utils/iperf/patches/002-format-security.patch deleted file mode 100644 index 9331e54f5b..0000000000 --- a/package/network/utils/iperf/patches/002-format-security.patch +++ /dev/null @@ -1,96 +0,0 @@ -Description: iperf format string FTBFS with -Werror=format-security - Reported by Didier Raboud <odyx@debian.org> -Author: Simon Paillard <spaillard@debian.org> -Bug-Debian: http://bugs.debian.org/643408 - ---- a/compat/Thread.c -+++ b/compat/Thread.c -@@ -381,7 +381,7 @@ int thread_release_nonterm( int interrup - Condition_Lock( thread_sNum_cond ); - thread_sNum -= nonterminating_num; - if ( thread_sNum > 1 && nonterminating_num > 0 && interrupt != 0 ) { -- fprintf( stderr, wait_server_threads ); -+ fprintf( stderr, "%s", wait_server_threads ); - } - nonterminating_num = 0; - Condition_Signal( &thread_sNum_cond ); ---- a/src/ReportDefault.c -+++ b/src/ReportDefault.c -@@ -78,7 +78,7 @@ void reporter_printstats( Transfer_Info - if ( stats->mUDP != (char)kMode_Server ) { - // TCP Reporting - if( !header_printed ) { -- printf( report_bw_header); -+ printf( "%s", report_bw_header); - header_printed = 1; - } - printf( report_bw_format, stats->transferID, -@@ -87,7 +87,7 @@ void reporter_printstats( Transfer_Info - } else { - // UDP Reporting - if( !header_printed ) { -- printf( report_bw_jitter_loss_header); -+ printf( "%s", report_bw_jitter_loss_header); - header_printed = 1; - } - printf( report_bw_jitter_loss_format, stats->transferID, -@@ -159,7 +159,7 @@ void reporter_reportsettings( ReporterDa - (data->mThreadMode == kMode_Listener ? 0 : 1) ); - win_requested = data->mTCPWin; - -- printf( separator_line ); -+ printf( "%s", separator_line ); - if ( data->mThreadMode == kMode_Listener ) { - printf( server_port, - (isUDP( data ) ? "UDP" : "TCP"), -@@ -198,7 +198,7 @@ void reporter_reportsettings( ReporterDa - printf( warn_window_requested, buffer ); - } - printf( "\n" ); -- printf( separator_line ); -+ printf( "%s", separator_line ); - } - - /* -@@ -286,7 +286,7 @@ void reporter_reportMSS( int inMSS, thre - } else if ( checkMSS_MTU( inMSS, 576 ) ) { - net = "minimum"; - mtu = 576; -- printf( warn_no_pathmtu ); -+ printf( "%s", warn_no_pathmtu ); - } else { - mtu = inMSS + 40; - net = "unknown interface"; ---- a/src/Reporter.c -+++ b/src/Reporter.c -@@ -901,7 +901,7 @@ void PrintMSS( ReporterData *stats ) { - } else if ( checkMSS_MTU( inMSS, 576 ) ) { - net = "minimum"; - mtu = 576; -- printf( warn_no_pathmtu ); -+ printf( "%s", warn_no_pathmtu ); - } else { - mtu = inMSS + 40; - net = "unknown interface"; ---- a/src/Settings.cpp -+++ b/src/Settings.cpp -@@ -375,8 +375,8 @@ void Settings_Interpret( char option, co - break; - - case 'h': // print help and exit -- fprintf(stderr, usage_long1); -- fprintf(stderr, usage_long2); -+ fprintf(stderr, "%s", usage_long1); -+ fprintf(stderr, "%s", usage_long2); - exit(1); - break; - -@@ -482,7 +482,7 @@ void Settings_Interpret( char option, co - break; - - case 'v': // print version and exit -- fprintf( stderr, version ); -+ fprintf( stderr, "%s", version ); - exit(1); - break; - diff --git a/package/network/utils/iw/patches/001-nl80211_h_sync.patch b/package/network/utils/iw/patches/001-nl80211_h_sync.patch index 7de225859b..e5ea8f7c8a 100644 --- a/package/network/utils/iw/patches/001-nl80211_h_sync.patch +++ b/package/network/utils/iw/patches/001-nl80211_h_sync.patch @@ -8,7 +8,17 @@ * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above -@@ -328,7 +329,15 @@ +@@ -321,14 +322,24 @@ + * @NL80211_CMD_GET_SCAN: get scan results + * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters + * %NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the +- * probe requests at CCK rate or not. ++ * probe requests at CCK rate or not. %NL80211_ATTR_MAC can be used to ++ * specify a BSSID to scan for; if not included, the wildcard BSSID will ++ * be used. + * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to + * NL80211_CMD_GET_SCAN and on the "scan" multicast group) + * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons, * partial scan results may be available * * @NL80211_CMD_START_SCHED_SCAN: start a scheduled scan at certain @@ -25,7 +35,82 @@ * Like with normal scans, if SSIDs (%NL80211_ATTR_SCAN_SSIDS) * are passed, they are used in the probe requests. For * broadcast, a broadcast SSID must be passed (ie. an empty -@@ -1761,6 +1770,22 @@ enum nl80211_commands { +@@ -418,7 +429,11 @@ + * @NL80211_CMD_ASSOCIATE: association request and notification; like + * NL80211_CMD_AUTHENTICATE but for Association and Reassociation + * (similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request, +- * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives). ++ * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives). The ++ * %NL80211_ATTR_PREV_BSSID attribute is used to specify whether the ++ * request is for the initial association to an ESS (that attribute not ++ * included) or for reassociation within the ESS (that attribute is ++ * included). + * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like + * NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to + * MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication +@@ -468,6 +483,9 @@ + * set of BSSID,frequency parameters is used (i.e., either the enforcing + * %NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict + * %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT). ++ * %NL80211_ATTR_PREV_BSSID can be used to request a reassociation within ++ * the ESS in case the device is already associated and an association with ++ * a different BSS is desired. + * Background scan period can optionally be + * specified in %NL80211_ATTR_BG_SCAN_PERIOD, + * if not specified default background scan configuration +@@ -811,6 +829,10 @@ + * as an event to indicate changes for devices with wiphy-specific regdom + * management. + * ++ * @NL80211_CMD_ABORT_SCAN: Stop an ongoing scan. Returns -ENOENT if a scan is ++ * not running. The driver indicates the status of the scan through ++ * cfg80211_scan_done(). ++ * + * @NL80211_CMD_MAX: highest used command number + * @__NL80211_CMD_AFTER_LAST: internal use + */ +@@ -997,6 +1019,8 @@ enum nl80211_commands { + + NL80211_CMD_WIPHY_REG_CHANGE, + ++ NL80211_CMD_ABORT_SCAN, ++ + /* add new commands above here */ + + /* used to define NL80211_CMD_MAX below */ +@@ -1270,8 +1294,11 @@ enum nl80211_commands { + * @NL80211_ATTR_RESP_IE: (Re)association response information elements as + * sent by peer, for ROAM and successful CONNECT events. + * +- * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE +- * commands to specify using a reassociate frame ++ * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used in ASSOCIATE and CONNECT ++ * commands to specify a request to reassociate within an ESS, i.e., to use ++ * Reassociate Request frame (with the value of this attribute in the ++ * Current AP address field) instead of Association Request frame which is ++ * used for the initial association to an ESS. + * + * @NL80211_ATTR_KEY: key information in a nested attribute with + * %NL80211_KEY_* sub-attributes +@@ -1712,6 +1739,8 @@ enum nl80211_commands { + * underlying device supports these minimal RRM features: + * %NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES, + * %NL80211_FEATURE_QUIET, ++ * Or, if global RRM is supported, see: ++ * %NL80211_EXT_FEATURE_RRM + * If this flag is used, driver must add the Power Capabilities IE to the + * association request. In addition, it must also set the RRM capability + * flag in the association request's Capability Info field. +@@ -1755,12 +1784,44 @@ enum nl80211_commands { + * over all channels. + * + * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a +- * scheduled scan (or a WoWLAN net-detect scan) is started, u32 +- * in seconds. ++ * scheduled scan is started. Or the delay before a WoWLAN ++ * net-detect scan is started, counting from the moment the ++ * system is suspended. This value is a u32, in seconds. + * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device * is operating in an indoor environment. * @@ -41,6 +126,21 @@ + * thus it must not specify the number of iterations, only the interval + * between scans. The scan plans are executed sequentially. + * Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan. ++ * @NL80211_ATTR_PBSS: flag attribute. If set it means operate ++ * in a PBSS. Specified in %NL80211_CMD_CONNECT to request ++ * connecting to a PCP, and in %NL80211_CMD_START_AP to start ++ * a PCP instead of AP. Relevant for DMG networks only. ++ * @NL80211_ATTR_BSS_SELECT: nested attribute for driver supporting the ++ * BSS selection feature. When used with %NL80211_CMD_GET_WIPHY it contains ++ * attributes according &enum nl80211_bss_select_attr to indicate what ++ * BSS selection behaviours are supported. When used with %NL80211_CMD_CONNECT ++ * it contains the behaviour-specific attribute containing the parameters for ++ * BSS selection to be done by driver and/or firmware. ++ * ++ * @NL80211_ATTR_STA_SUPPORT_P2P_PS: whether P2P PS mechanism supported ++ * or not. u8, one of the values of &enum nl80211_sta_p2p_ps_status ++ * ++ * @NL80211_ATTR_PAD: attribute used for padding for 64-bit alignment + * + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce + * transmit power to stay within regulatory limits. u32, dBi. @@ -48,7 +148,7 @@ * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use -@@ -2130,6 +2155,13 @@ enum nl80211_attrs { +@@ -2130,6 +2191,21 @@ enum nl80211_attrs { NL80211_ATTR_REG_INDOOR, @@ -57,30 +157,147 @@ + NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS, + NL80211_ATTR_SCHED_SCAN_PLANS, + ++ NL80211_ATTR_PBSS, ++ ++ NL80211_ATTR_BSS_SELECT, ++ ++ NL80211_ATTR_STA_SUPPORT_P2P_PS, ++ ++ NL80211_ATTR_PAD, ++ + NL80211_ATTR_WIPHY_ANTENNA_GAIN, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, -@@ -3364,6 +3396,9 @@ enum nl80211_bss_scan_width { +@@ -2273,6 +2349,20 @@ enum nl80211_sta_flags { + NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1 + }; + ++/** ++ * enum nl80211_sta_p2p_ps_status - station support of P2P PS ++ * ++ * @NL80211_P2P_PS_UNSUPPORTED: station doesn't support P2P PS mechanism ++ * @@NL80211_P2P_PS_SUPPORTED: station supports P2P PS mechanism ++ * @NUM_NL80211_P2P_PS_STATUS: number of values ++ */ ++enum nl80211_sta_p2p_ps_status { ++ NL80211_P2P_PS_UNSUPPORTED = 0, ++ NL80211_P2P_PS_SUPPORTED, ++ ++ NUM_NL80211_P2P_PS_STATUS, ++}; ++ + #define NL80211_STA_FLAG_MAX_OLD_API NL80211_STA_FLAG_TDLS_PEER + + /** +@@ -2430,6 +2520,9 @@ enum nl80211_sta_bss_param { + * TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames; + * each one of those is again nested with &enum nl80211_tid_stats + * attributes carrying the actual values. ++ * @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames ++ * received from the station (u64, usec) ++ * @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment + * @__NL80211_STA_INFO_AFTER_LAST: internal + * @NL80211_STA_INFO_MAX: highest possible station info attribute + */ +@@ -2466,6 +2559,8 @@ enum nl80211_sta_info { + NL80211_STA_INFO_BEACON_RX, + NL80211_STA_INFO_BEACON_SIGNAL_AVG, + NL80211_STA_INFO_TID_STATS, ++ NL80211_STA_INFO_RX_DURATION, ++ NL80211_STA_INFO_PAD, + + /* keep last */ + __NL80211_STA_INFO_AFTER_LAST, +@@ -2482,6 +2577,7 @@ enum nl80211_sta_info { + * transmitted MSDUs (not counting the first attempt; u64) + * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted + * MSDUs (u64) ++ * @NL80211_TID_STATS_PAD: attribute used for padding for 64-bit alignment + * @NUM_NL80211_TID_STATS: number of attributes here + * @NL80211_TID_STATS_MAX: highest numbered attribute here + */ +@@ -2491,6 +2587,7 @@ enum nl80211_tid_stats { + NL80211_TID_STATS_TX_MSDU, + NL80211_TID_STATS_TX_MSDU_RETRIES, + NL80211_TID_STATS_TX_MSDU_FAILED, ++ NL80211_TID_STATS_PAD, + + /* keep last */ + NUM_NL80211_TID_STATS, +@@ -2927,6 +3024,7 @@ enum nl80211_user_reg_hint_type { + * transmitting data (on channel or globally) + * @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan + * (on this channel or globally) ++ * @NL80211_SURVEY_INFO_PAD: attribute used for padding for 64-bit alignment + * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number + * currently defined + * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use +@@ -2942,6 +3040,7 @@ enum nl80211_survey_info { + NL80211_SURVEY_INFO_TIME_RX, + NL80211_SURVEY_INFO_TIME_TX, + NL80211_SURVEY_INFO_TIME_SCAN, ++ NL80211_SURVEY_INFO_PAD, + + /* keep last */ + __NL80211_SURVEY_INFO_AFTER_LAST, +@@ -3364,6 +3463,10 @@ enum nl80211_bss_scan_width { * (not present if no beacon frame has been received yet) * @NL80211_BSS_PRESP_DATA: the data in @NL80211_BSS_INFORMATION_ELEMENTS and * @NL80211_BSS_TSF is known to be from a probe response (flag attribute) + * @NL80211_BSS_LAST_SEEN_BOOTTIME: CLOCK_BOOTTIME timestamp when this entry + * was last updated by a received frame. The value is expected to be + * accurate to about 10ms. (u64, nanoseconds) ++ * @NL80211_BSS_PAD: attribute used for padding for 64-bit alignment * @__NL80211_BSS_AFTER_LAST: internal * @NL80211_BSS_MAX: highest BSS attribute */ -@@ -3383,6 +3418,7 @@ enum nl80211_bss { +@@ -3383,6 +3486,8 @@ enum nl80211_bss { NL80211_BSS_CHAN_WIDTH, NL80211_BSS_BEACON_TSF, NL80211_BSS_PRESP_DATA, + NL80211_BSS_LAST_SEEN_BOOTTIME, ++ NL80211_BSS_PAD, /* keep last */ __NL80211_BSS_AFTER_LAST, -@@ -4589,4 +4625,28 @@ enum nl80211_tdls_peer_capability { +@@ -3568,11 +3673,15 @@ enum nl80211_txrate_gi { + * @NL80211_BAND_2GHZ: 2.4 GHz ISM band + * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz) + * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz) ++ * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace ++ * since newer kernel versions may support more bands + */ + enum nl80211_band { + NL80211_BAND_2GHZ, + NL80211_BAND_5GHZ, + NL80211_BAND_60GHZ, ++ ++ NUM_NL80211_BANDS, + }; + + /** +@@ -4358,12 +4467,18 @@ enum nl80211_feature_flags { + /** + * enum nl80211_ext_feature_index - bit index of extended features. + * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates. ++ * @NL80211_EXT_FEATURE_RRM: This driver supports RRM. When featured, user can ++ * can request to use RRM (see %NL80211_ATTR_USE_RRM) with ++ * %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set ++ * the ASSOC_REQ_USE_RRM flag in the association request even if ++ * NL80211_FEATURE_QUIET is not advertized. + * + * @NUM_NL80211_EXT_FEATURES: number of extended features. + * @MAX_NL80211_EXT_FEATURES: highest extended feature index. + */ + enum nl80211_ext_feature_index { + NL80211_EXT_FEATURE_VHT_IBSS, ++ NL80211_EXT_FEATURE_RRM, + + /* add new features before the definition below */ + NUM_NL80211_EXT_FEATURES, +@@ -4589,4 +4704,72 @@ enum nl80211_tdls_peer_capability { NL80211_TDLS_PEER_WMM = 1<<2, }; @@ -108,4 +325,48 @@ + __NL80211_SCHED_SCAN_PLAN_AFTER_LAST - 1 +}; + ++/** ++ * struct nl80211_bss_select_rssi_adjust - RSSI adjustment parameters. ++ * ++ * @band: band of BSS that must match for RSSI value adjustment. ++ * @delta: value used to adjust the RSSI value of matching BSS. ++ */ ++struct nl80211_bss_select_rssi_adjust { ++ __u8 band; ++ __s8 delta; ++} __attribute__((packed)); ++ ++/** ++ * enum nl80211_bss_select_attr - attributes for bss selection. ++ * ++ * @__NL80211_BSS_SELECT_ATTR_INVALID: reserved. ++ * @NL80211_BSS_SELECT_ATTR_RSSI: Flag indicating only RSSI-based BSS selection ++ * is requested. ++ * @NL80211_BSS_SELECT_ATTR_BAND_PREF: attribute indicating BSS ++ * selection should be done such that the specified band is preferred. ++ * When there are multiple BSS-es in the preferred band, the driver ++ * shall use RSSI-based BSS selection as a second step. The value of ++ * this attribute is according to &enum nl80211_band (u32). ++ * @NL80211_BSS_SELECT_ATTR_RSSI_ADJUST: When present the RSSI level for ++ * BSS-es in the specified band is to be adjusted before doing ++ * RSSI-based BSS selection. The attribute value is a packed structure ++ * value as specified by &struct nl80211_bss_select_rssi_adjust. ++ * @NL80211_BSS_SELECT_ATTR_MAX: highest bss select attribute number. ++ * @__NL80211_BSS_SELECT_ATTR_AFTER_LAST: internal use. ++ * ++ * One and only one of these attributes are found within %NL80211_ATTR_BSS_SELECT ++ * for %NL80211_CMD_CONNECT. It specifies the required BSS selection behaviour ++ * which the driver shall use. ++ */ ++enum nl80211_bss_select_attr { ++ __NL80211_BSS_SELECT_ATTR_INVALID, ++ NL80211_BSS_SELECT_ATTR_RSSI, ++ NL80211_BSS_SELECT_ATTR_BAND_PREF, ++ NL80211_BSS_SELECT_ATTR_RSSI_ADJUST, ++ ++ /* keep last */ ++ __NL80211_BSS_SELECT_ATTR_AFTER_LAST, ++ NL80211_BSS_SELECT_ATTR_MAX = __NL80211_BSS_SELECT_ATTR_AFTER_LAST - 1 ++}; ++ #endif /* __LINUX_NL80211_H */ diff --git a/package/network/utils/iw/patches/300-display_interface_TX_power.patch b/package/network/utils/iw/patches/300-display_interface_TX_power.patch index 574c490318..2cdf360cc5 100644 --- a/package/network/utils/iw/patches/300-display_interface_TX_power.patch +++ b/package/network/utils/iw/patches/300-display_interface_TX_power.patch @@ -12,11 +12,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> interface.c | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/interface.c b/interface.c -index 73ccecd..4f0821d 100644 --- a/interface.c +++ b/interface.c -@@ -368,6 +368,13 @@ static int print_iface_handler(struct nl_msg *msg, void *arg) +@@ -368,6 +368,13 @@ static int print_iface_handler(struct nl printf("\n"); } diff --git a/package/network/utils/iw/patches/301-ibss_add_VHT80.patch b/package/network/utils/iw/patches/301-ibss_add_VHT80.patch index 709fbb2914..0627bccb46 100644 --- a/package/network/utils/iw/patches/301-ibss_add_VHT80.patch +++ b/package/network/utils/iw/patches/301-ibss_add_VHT80.patch @@ -14,8 +14,6 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> ibss.c | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) -diff --git a/ibss.c b/ibss.c -index 7a0b707..a99a262 100644 --- a/ibss.c +++ b/ibss.c @@ -16,6 +16,39 @@ @@ -58,7 +56,7 @@ index 7a0b707..a99a262 100644 static int join_ibss(struct nl80211_state *state, struct nl_msg *msg, int argc, char **argv, -@@ -30,12 +63,8 @@ static int join_ibss(struct nl80211_state *state, +@@ -30,12 +63,8 @@ static int join_ibss(struct nl80211_stat int bintval; int i; unsigned long freq; @@ -73,7 +71,7 @@ index 7a0b707..a99a262 100644 { .name = "HT20", .width = NL80211_CHAN_WIDTH_20, .freq1_diff = 0, -@@ -60,6 +89,10 @@ static int join_ibss(struct nl80211_state *state, +@@ -60,6 +89,10 @@ static int join_ibss(struct nl80211_stat .width = NL80211_CHAN_WIDTH_10, .freq1_diff = 0, .chantype = -1 }, @@ -84,7 +82,7 @@ index 7a0b707..a99a262 100644 }; if (argc < 2) -@@ -90,7 +123,7 @@ static int join_ibss(struct nl80211_state *state, +@@ -90,7 +123,7 @@ static int join_ibss(struct nl80211_stat NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH, chanmode_selected->width); NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1, diff --git a/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch b/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch index fc4442792d..f96d5eafda 100644 --- a/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch +++ b/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch @@ -7,11 +7,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> ibss.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/ibss.c b/ibss.c -index a99a262..23bda70 100644 --- a/ibss.c +++ b/ibss.c -@@ -81,15 +81,15 @@ static int join_ibss(struct nl80211_state *state, +@@ -81,15 +81,15 @@ static int join_ibss(struct nl80211_stat .width = NL80211_CHAN_WIDTH_20_NOHT, .freq1_diff = 0, .chantype = NL80211_CHAN_NO_HT }, diff --git a/package/network/utils/iw/patches/303-mesh_add_VHT80.patch b/package/network/utils/iw/patches/303-mesh_add_VHT80.patch index fe8dc21a19..956b0505e6 100644 --- a/package/network/utils/iw/patches/303-mesh_add_VHT80.patch +++ b/package/network/utils/iw/patches/303-mesh_add_VHT80.patch @@ -15,8 +15,6 @@ Signed-off-by: Sven Eckelmann <sven@open-mesh.com> util.c | 26 ++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 41 deletions(-) -diff --git a/ibss.c b/ibss.c -index 23bda70..ac06fc5 100644 --- a/ibss.c +++ b/ibss.c @@ -16,39 +16,6 @@ @@ -59,8 +57,6 @@ index 23bda70..ac06fc5 100644 static int join_ibss(struct nl80211_state *state, struct nl_msg *msg, int argc, char **argv, -diff --git a/iw.h b/iw.h -index cef9da8..8e1a37a 100644 --- a/iw.h +++ b/iw.h @@ -59,6 +59,13 @@ struct cmd { @@ -77,7 +73,7 @@ index cef9da8..8e1a37a 100644 #define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0])) #define DIV_ROUND_UP(x, y) (((x) + (y - 1)) / (y)) -@@ -174,6 +181,8 @@ void print_ies(unsigned char *ie, int ielen, bool unknown, +@@ -174,6 +181,8 @@ void print_ies(unsigned char *ie, int ie void parse_bitrate(struct nlattr *bitrate_attr, char *buf, int buflen); void iw_hexdump(const char *prefix, const __u8 *data, size_t len); @@ -86,11 +82,9 @@ index cef9da8..8e1a37a 100644 #define SCHED_SCAN_OPTIONS "interval <in_msecs> [delay <in_secs>] " \ "[freqs <freq>+] [matches [ssid <ssid>]+]] [active [ssid <ssid>]+|passive] [randomise[=<addr>/<mask>]]" int parse_sched_scan(struct nl_msg *msg, int *argc, char ***argv); -diff --git a/mesh.c b/mesh.c -index 0090530..930d58f 100644 --- a/mesh.c +++ b/mesh.c -@@ -439,12 +439,8 @@ static int join_mesh(struct nl80211_state *state, +@@ -439,12 +439,8 @@ static int join_mesh(struct nl80211_stat int bintval, dtim_period, i, n_rates = 0; char *end, *value = NULL, *sptr = NULL; unsigned long freq = 0; @@ -105,7 +99,7 @@ index 0090530..930d58f 100644 { .name = "HT20", .width = NL80211_CHAN_WIDTH_20, .freq1_diff = 0, -@@ -461,6 +457,10 @@ static int join_mesh(struct nl80211_state *state, +@@ -461,6 +457,10 @@ static int join_mesh(struct nl80211_stat .width = NL80211_CHAN_WIDTH_20_NOHT, .freq1_diff = 0, .chantype = NL80211_CHAN_NO_HT }, @@ -116,7 +110,7 @@ index 0090530..930d58f 100644 }; if (argc < 1) -@@ -497,7 +497,7 @@ static int join_mesh(struct nl80211_state *state, +@@ -497,7 +497,7 @@ static int join_mesh(struct nl80211_stat NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH, chanmode_selected->width); NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1, @@ -125,7 +119,7 @@ index 0090530..930d58f 100644 if (chanmode_selected->chantype != -1) NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, -@@ -599,7 +599,7 @@ static int join_mesh(struct nl80211_state *state, +@@ -599,7 +599,7 @@ static int join_mesh(struct nl80211_stat nla_put_failure: return -ENOBUFS; } @@ -134,11 +128,9 @@ index 0090530..930d58f 100644 " [basic-rates <rate in Mbps,rate2,...>]], [mcast-rate <rate in Mbps>]" " [beacon-interval <time in TUs>] [dtim-period <value>]" " [vendor_sync on|off] [<param>=<value>]*", -diff --git a/util.c b/util.c -index 4efc4c8..d75ffe0 100644 --- a/util.c +++ b/util.c -@@ -728,3 +728,29 @@ void iw_hexdump(const char *prefix, const __u8 *buf, size_t size) +@@ -728,3 +728,29 @@ void iw_hexdump(const char *prefix, cons } printf("\n\n"); } |