From 95385a77a76e086f454d902565fc3717e54ae0aa Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Sun, 1 Jul 2018 20:02:25 +0200
Subject: [PATCH] Working MLVPN markfoodyburton version

---
 mlvpn/Makefile                          | 16 ++++++++--------
 mlvpn/files/etc/init.d/mlvpn            |  4 +++-
 mlvpn/patches/020-config-bindaddr.patch | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 mlvpn/patches/020-config-bindaddr.patch

diff --git a/mlvpn/Makefile b/mlvpn/Makefile
index aeb080cf0..b61c83b9d 100644
--- a/mlvpn/Makefile
+++ b/mlvpn/Makefile
@@ -8,17 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mlvpn
-PKG_VERSION:=6f13423b
-#PKG_VERSION:=8002488
+#PKG_VERSION:=6f13423b
+PKG_VERSION:=54ba2d8
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git
-PKG_SOURCE_VERSION:=6f13423b8108f46edb9f230deee20e3741abe64c
-PKG_SOURCE_DATE:=2017-09-01
-#PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git
-#PKG_SOURCE_VERSION:=8002488c20438c51fb68fa51f7df115dd2f7dafb
-#PKG_SOURCE_DATE:=2018-06-11
+#PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git
+#PKG_SOURCE_VERSION:=6f13423b8108f46edb9f230deee20e3741abe64c
+#PKG_SOURCE_DATE:=2017-09-01
+PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git
+PKG_SOURCE_VERSION:=54ba2d837a20bcb59cf2e690354d132152cdf79f
+PKG_SOURCE_DATE:=2018-07-01
 
 PKG_LICENSE:=BSD-2-Clause
 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
diff --git a/mlvpn/files/etc/init.d/mlvpn b/mlvpn/files/etc/init.d/mlvpn
index f7a813738..a1e1630ae 100755
--- a/mlvpn/files/etc/init.d/mlvpn
+++ b/mlvpn/files/etc/init.d/mlvpn
@@ -42,7 +42,8 @@ start_service() {
 	[ "${enable}" = "1" ] || return 1
 	
 	if [ "$(uci -q get network.omrvpn)" != "" ]; then
-		uci -q set network.omrvpn.ifname=mlvpn0
+		uci -q set network.omrvpn.ifname=${interface_name}
+		uci -q commit
 	fi
 	
 	cat > /tmp/etc/${interface_name}.conf <<-EOF
@@ -51,6 +52,7 @@ start_service() {
 	mode = "${mode}"
 	interface_name = "${interface_name}"
 	timeout = ${timeout}
+	reorder_buffer = yes
 	reorder_buffer_size = ${reorder_buffer_size}
 	loss_tolerence = ${loss_tolerence}
 	password = "${password}"
diff --git a/mlvpn/patches/020-config-bindaddr.patch b/mlvpn/patches/020-config-bindaddr.patch
new file mode 100644
index 000000000..e012d49a0
--- /dev/null
+++ b/mlvpn/patches/020-config-bindaddr.patch
@@ -0,0 +1,16 @@
+--- a/src/config.c	2018-07-01 19:02:09.192210482 +0200
++++ b/src/config.c	2018-07-01 19:03:13.263404635 +0200
+@@ -302,9 +302,11 @@
+                         config, lastSection, "remoteport", &dstport, NULL,
+                         "No remote port specified.\n", 1);
+                 }
+-
+-                bindaddr=ip_from_if(bindaddr);
+                 
++                if (bindaddr)
++                {
++                    bindaddr=ip_from_if(bindaddr);
++                }
+                 
+                 _conf_set_uint_from_conf(
+                     config, lastSection, "bandwidth_upload", &bwlimit, 0,