mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Update MLVPN

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-09-25 07:21:54 +02:00
parent 527197973f
commit 63b58f3f76
5 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js
View file

@ -82,6 +82,12 @@ return L.view.extend({
o.rmempty = false; o.rmempty = false;
o.modalonly = true; o.modalonly = true;
o = s.taboption('advanced', form.Value, 'latency_tolerance', _('Latency tolerance'));
o.default = '300';
o.datatype = "uinteger";
o.rmempty = false;
o.modalonly = true;
return m.render(); return m.render();
} }
}); });

6
mlvpn/Makefile
View file

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mlvpn PKG_NAME:=mlvpn
PKG_VERSION:=2263bab PKG_VERSION:=8aa1b16
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git
PKG_SOURCE_VERSION:=2263bab7e5f983e1daa33887b53120c12646398f PKG_SOURCE_VERSION:=8aa1b16d843ea68734e2520e39a34cb7f3d61b2b
PKG_SOURCE_DATE:=2020-12-16 PKG_SOURCE_DATE:=2021-08-14
#PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git #PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git
#PKG_SOURCE_VERSION:=8f9720978b28c1954f9f229525333547283316d2 #PKG_SOURCE_VERSION:=8f9720978b28c1954f9f229525333547283316d2
#PKG_SOURCE_DATE:=2018-09-03 #PKG_SOURCE_DATE:=2018-09-03

3
mlvpn/files/etc/config/mlvpn
View file

@ -8,4 +8,5 @@ config mlvpn 'general'
option host '128.128.128.128' option host '128.128.128.128'
option firstport '65201' option firstport '65201'
option interface_name 'mlvpn0' option interface_name 'mlvpn0'
option loss_tolerance '50' option loss_tolerance '50'
option latency_tolerance '300'

8
mlvpn/files/etc/init.d/mlvpn
View file

@ -33,14 +33,15 @@ interface_multipath_settings() {
} }
start() { start() {
local enable timeout mode password reorder_buffer_size interface_name host firstport loss_tolerence local enable timeout mode password reorder_buffer_size interface_name host firstport loss_tolerance latency_tolerance
[ "$(uci -q get mlvpn.general.enable)" = "1" ] || return 1 [ "$(uci -q get mlvpn.general.enable)" = "1" ] || return 1
interface_name="$(uci -q get mlvpn.general.interface_name)" interface_name="$(uci -q get mlvpn.general.interface_name)"
timeout="$(uci -q get mlvpn.general.timeout)" timeout="$(uci -q get mlvpn.general.timeout)"
mode="$(uci -q get mlvpn.general.mode)" mode="$(uci -q get mlvpn.general.mode)"
password="$(uci -q get mlvpn.general.password)" password="$(uci -q get mlvpn.general.password)"
reorder_buffer_size="$(uci -q get mlvpn.general.reorder_buffer_size)" reorder_buffer_size="$(uci -q get mlvpn.general.reorder_buffer_size)"
loss_tolerence="$(uci -q get mlvpn.general.loss_tolerence)" loss_tolerance="$(uci -q get mlvpn.general.loss_tolerance)"
latency_tolerance="$(uci -q get mlvpn.general.latency_tolerance)"
cleartext_data="$(uci -q get mlvpn.general.cleartext_data)" cleartext_data="$(uci -q get mlvpn.general.cleartext_data)"
[ -z "$cleartext_data" ] && cleartext_data="0" [ -z "$cleartext_data" ] && cleartext_data="0"
host="$(uci -q get mlvpn.general.host)" host="$(uci -q get mlvpn.general.host)"
@ -59,7 +60,8 @@ start() {
timeout = ${timeout} timeout = ${timeout}
reorder_buffer = yes reorder_buffer = yes
reorder_buffer_size = ${reorder_buffer_size} reorder_buffer_size = ${reorder_buffer_size}
loss_tolerence = ${loss_tolerence} loss_tolerence = ${loss_tolerance}
latency_tolerence = ${latency_tolerance}
cleartext_data = ${cleartext_data} cleartext_data = ${cleartext_data}
password = "${password}" password = "${password}"
mtu = 1452 mtu = 1452

33
mlvpn/patches/020-remove-cdefs.patch Normal file
View file

@ -0,0 +1,33 @@
--- a/src/vis.h.anc 2021-09-24 22:00:03.900321816 +0200
+++ b/src/vis.h 2021-09-24 22:00:21.500028958 +0200
@@ -79,7 +79,6 @@
*/
#define UNVIS_END 1 /* no more characters */
-#include <sys/cdefs.h>
__BEGIN_DECLS
char *vis(char *, int, int, int);
--- a/src/vis.h.anc 2021-09-24 22:05:19.543069573 +0200
+++ b/src/vis.h 2021-09-24 22:06:00.430389216 +0200
@@ -80,7 +80,9 @@
#define UNVIS_END 1 /* no more characters */
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
char *vis(char *, int, int, int);
int strvis(char *, const char *, int);
int stravis(char **, const char *, int);
@@ -93,6 +95,8 @@
ssize_t strnunvis(char *, const char *, size_t)
__attribute__ ((__bounded__(__string__,1,3)));
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
#endif /* !HAVE_STRNVIS || BROKEN_STRNVIS */