Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix: upgrade iperf to iperf3 (#105) 

* bugfix: upgrade iperf to iperf3

* updated port to 5201

iperf3 default port is 5201

* adjust patch paths
This commit is contained in:
dman776 2018-08-04 09:38:58 -05:00 committed by GitHub
parent 560070d2d1
commit 15130a62f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/common.config
View File

@ -12,7 +12,7 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6=n
CONFIG_BUSYBOX_CONFIG_TELNETD=y CONFIG_BUSYBOX_CONFIG_TELNETD=y
CONFIG_PACKAGE_dnsmasq=y CONFIG_PACKAGE_dnsmasq=y
CONFIG_PACKAGE_dropbear=y CONFIG_PACKAGE_dropbear=y
CONFIG_PACKAGE_iperf=m CONFIG_PACKAGE_iperf3=m
CONFIG_PACKAGE_iptables=y CONFIG_PACKAGE_iptables=y
CONFIG_PACKAGE_kmod-ipt-nathelper=y CONFIG_PACKAGE_kmod-ipt-nathelper=y
CONFIG_PACKAGE_kmod-usb-core=m CONFIG_PACKAGE_kmod-usb-core=m

40
patches/709-iperf-fw-restart.patch
View File

@ -1,20 +1,20 @@
--- a/package/network/utils/iperf/Makefile --- a/package/network/utils/iperf3/Makefile
+++ b/package/network/utils/iperf/Makefile +++ b/package/network/utils/iperf3/Makefile
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iperf PKG_NAME:=iperf
PKG_VERSION:=2.0.10 PKG_VERSION:=3.5
-PKG_RELEASE:=1 -PKG_RELEASE:=1
+PKG_RELEASE:=1AREDN +PKG_RELEASE:=1AREDN
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2 PKG_SOURCE_URL:=http://downloads.es.net/pub/iperf
@@ -46,6 +46,18 @@ @@ -72,6 +72,18 @@ endef
define Package/iperf/install define Package/iperf3/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/iperf $(1)/usr/bin/iperf $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/iperf3 $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/etc/local/mesh-firewall + $(INSTALL_DIR) $(1)/etc/local/mesh-firewall
+ $(INSTALL_BIN) ./files/iperf.firewall $(1)/etc/local/mesh-firewall/20-iperf2 + $(INSTALL_BIN) ./files/iperf.firewall $(1)/etc/local/mesh-firewall/20-iperf3
+endef +endef
+ +
+define Package/iperf/postinst +define Package/iperf/postinst
@ -27,20 +27,16 @@
+exit 0 +exit 0
endef endef
$(eval $(call BuildPackage,iperf)) define Package/iperf3-ssl/install
--- /dev/null --- /dev/null
+++ b/package/network/utils/iperf/files/iperf.firewall +++ b/package/network/utils/iperf3/files/iperf.firewall
@@ -0,0 +1,13 @@ @@ -0,0 +1,9 @@
+#!/bin/sh +#!/bin/sh
+ +iptables -I zone_wifi_input -p udp -m udp --dport 5201 -j ACCEPT
+ +iptables -I zone_wifi_input -p tcp -m tcp --dport 5201 -j ACCEPT
+iptables -I zone_wifi_input -p udp -m udp --dport 5001 -j ACCEPT +iptables -I zone_dtdlink_input -p udp -m udp --dport 5201 -j ACCEPT
+iptables -I zone_wifi_input -p tcp -m tcp --dport 5001 -j ACCEPT +iptables -I zone_dtdlink_input -p tcp -m tcp --dport 5201 -j ACCEPT
+iptables -I zone_dtdlink_input -p udp -m udp --dport 5001 -j ACCEPT
+iptables -I zone_dtdlink_input -p tcp -m tcp --dport 5001 -j ACCEPT
+
+if [ "$MESHFW_TUNNELS_ENABLED" == "1" ]; then +if [ "$MESHFW_TUNNELS_ENABLED" == "1" ]; then
+ iptables -I zone_vpn_input -p udp -m udp --dport 5001 -j ACCEPT + iptables -I zone_vpn_input -p udp -m udp --dport 5201 -j ACCEPT
+ iptables -I zone_vpn_input -p tcp -m tcp --dport 5001 -j ACCEPT + iptables -I zone_vpn_input -p tcp -m tcp --dport 5201 -j ACCEPT
+fi +fi
+