remove unused files

update 3rd party
add -w options to every iptables command
2025-09-16 04:04:27 +08:00 · 2018-01-11 17:49:16 -06:00 · 2018-01-11 17:38:01 -06:00 · 2018-01-11 17:26:30 -06:00 · 2018-01-04 01:27:52 -06:00 · 2018-01-04 01:22:29 -06:00
51 changed files with 2566 additions and 154 deletions
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,6 @@
+For English speaking user：
+https://github.com/wangyu-/UDPspeeder/wiki/Issue-Guide
+
+中文用户请看：
+https://github.com/wangyu-/UDPspeeder/wiki/发Issue前请看
+(否则Issue可能被忽略，或被直接关掉)
--- a/README.md
+++ b/README.md
@@ -1,16 +1,21 @@
 # Udp2raw-tunnel
-![image0](images/image0.PNG)
+

 A Tunnel which turns UDP Traffic into Encrypted FakeTCP/UDP/ICMP Traffic by using Raw Socket, helps you Bypass UDP FireWalls(or Unstable UDP Environment). It can defend Replay-Attack and supports Multiplexing. It also acts as a Connection Stabilizer.

-It can tunnel any traffic when used together with a UDP-based VPN(such as OpenVPN).Check [this link](https://github.com/wangyu-/udp2raw-tunnel#tunneling-any-traffic-via-raw-traffic-by-using-udp2raw-openvpn) for more info.
+![image0](images/image0.PNG)

-[简体中文](/doc/README.zh-cn.md)
+When used alone,udp2raw tunnels only UDP traffic. Nevertheless,if you used udp2raw + any UDP-based VPN together,you can tunnel any traffic(include TCP/UDP/ICMP),currently OpenVPN/L2TP/ShadowVPN and [tinyFecVPN](https://github.com/wangyu-/tinyFecVPN) are confirmed to be supported. 
+
+![image_vpn](images/udp2rawopenvpn.PNG)
+
+[简体中文](/doc/README.zh-cn.md)(内容更丰富)

 # Support Platforms
 Linux host (including desktop Linux,Android phone/tablet,OpenWRT router,or Raspberry PI) with root access.

-For Winodws/MacOS,the 4.4mb virtual image with udp2raw pre-installed has been released,you can load it with Vmware/VirtualBox.The virtual image has been set to auto obtain ip,udp2raw can be run imidiately after boot finished(make sure network mode of virtual machine has been set to bridged)(only udp2raw has to be run under virtual machine,all other programs runs under Windows/MacOS as usual).
+For Windows and MacOS You can run udp2raw inside [this](https://github.com/wangyu-/udp2raw-tunnel/releases/download/20171108.0/lede-17.01.2-x86_virtual_machine_image.zip) 7.5mb virtual machine image(make sure network adapter runs at bridged mode).
+


 # Features 
@@ -76,6 +81,8 @@ Assume your UDP is blocked or being QOS-ed or just poorly supported. Assume your
 # Run at client side
 ./udp2raw_amd64 -c -l0.0.0.0:3333  -r44.55.66.77:4096 -a -k "passwd" --raw-mode faketcp
 ```
+(The above commands need to be run as root. For better security, with some extra steps, you can run udp2raw as non-root. Check [this link](https://github.com/wangyu-/udp2raw-tunnel/wiki/run-udp2raw-as-non-root) for more info  )
+
 ###### Server Output:
 ![](images/output_server.PNG)
 ###### Client Output:
@@ -88,7 +95,7 @@ To run on Android, check [Android_Guide](/doc/android_guide.md)

 If you have connection problems. Take a look at `--seq-mode` option.

-You can run udp2raw with a non-root account(for better security).Take a look at [#26](https://github.com/wangyu-/udp2raw-tunnel/issues/26) for more info. 
+

 # Advanced Topic
 ### Usage
@@ -226,7 +233,7 @@ raw_mode: faketcp  cipher_mode: aes128cbc  auth_mode: md5

 # Application
 ## Tunneling any traffic via raw traffic by using udp2raw +openvpn
-![image_vpn](images/openvpn.PNG)
+![image_vpn](images/udp2rawopenvpn.PNG)
 1. Bypasses UDP block/UDP QOS

 2. No TCP over TCP problem (TCP over TCP problem http://sites.inka.de/bigred/devel/tcp-tcp.html ,https://community.openvpn.net/openvpn/ticket/2 )
--- a/common.cpp
+++ b/common.cpp
@@ -16,7 +16,7 @@ u64_t get_current_time()
 {
 	timespec tmp_time;
 	clock_gettime(CLOCK_MONOTONIC, &tmp_time);
-	return tmp_time.tv_sec*1000+tmp_time.tv_nsec/(1000*1000l);
+	return ((u64_t)tmp_time.tv_sec)*1000llu+((u64_t)tmp_time.tv_nsec)/(1000*1000llu);
 }

 u64_t pack_u64(u32_t a,u32_t b)
--- a/common.h
+++ b/common.h
@@ -80,10 +80,7 @@ struct ip_port_t
 	char * to_s();
 };

-struct fd_info_t
-{
-	ip_port_t ip_port;
-};
+


 typedef u64_t fd64_t;
--- a/connection.cpp
+++ b/connection.cpp
@@ -297,6 +297,7 @@ conv_manager_t::~conv_manager_t()
 				assert(oppsite_const_id==0);
 			}
 		}
+		assert(timer_fd64==0);
 		//if(oppsite_const_id!=0)     //do this at conn_manager 's deconstuction function
 			//conn_manager.const_id_mp.erase(oppsite_const_id);
 		if(blob!=0)
@@ -388,6 +389,7 @@ conv_manager_t::~conv_manager_t()

 			fd_manager.fd64_close(erase_it->second->timer_fd64);

+			erase_it->second->timer_fd64=0;
 			//timer_fd_mp.erase(erase_it->second->timer_fd);
 			//close(erase_it->second->timer_fd);// close will auto delte it from epoll
 			delete(erase_it->second);
@@ -709,7 +711,17 @@ int parse_safer(conn_info_t &conn_info,const char * input,int input_len,char &ty
 		conn_info.oppsite_roller=roller;
 		conn_info.last_oppsite_roller_time=get_current_time();
 	}
+	if(hb_mode==0)
 		conn_info.my_roller++;//increase on a successful recv
+	else if(hb_mode==1)
+	{
+		if(type=='h')
+			conn_info.my_roller++;
+	}
+	else
+	{
+		assert(0==1);
+	}


 	if(after_recv_raw0(conn_info.raw_info)!=0) return -1;
@@ -732,9 +744,9 @@ int recv_safer(conn_info_t &conn_info,char &type,char* &data,int &len)///safer t
 void server_clear_function(u64_t u64)//used in conv_manager in server mode.for server we have to use one udp fd for one conv(udp connection),
 //so we have to close the fd when conv expires
 {
-	int fd=int(u64);
-	int ret;
-	assert(fd!=0);
+	//int fd=int(u64);
+//	int ret;
+	//assert(fd!=0);
 	/*
 	epoll_event ev;

@@ -747,16 +759,18 @@ void server_clear_function(u64_t u64)//used in conv_manager in server mode.for s
 		mylog(log_fatal,"fd:%d epoll delete failed!!!!\n",fd);
 		myexit(-1);   //this shouldnt happen
 	}*/                //no need
-	ret= close(fd);  //closed fd should be auto removed from epoll
+
+	/*ret= close(fd);  //closed fd should be auto removed from epoll

 	if (ret!=0)
 	{
 		mylog(log_fatal,"close fd %d failed !!!!\n",fd);
 		myexit(-1);  //this shouldnt happen
-	}
+	}*/
 	//mylog(log_fatal,"size:%d !!!!\n",conn_manager.udp_fd_mp.size());
-	assert(fd_manager.exist(u64));
-	fd_manager.fd64_close(u64);
+	fd64_t fd64=u64;
+	assert(fd_manager.exist(fd64));
+	fd_manager.fd64_close(fd64);

 	//assert(conn_manager.udp_fd_mp.find(fd)!=conn_manager.udp_fd_mp.end());
 	//conn_manager.udp_fd_mp.erase(fd);
--- a/connection.h
+++ b/connection.h
@@ -95,7 +95,7 @@ struct conn_info_t     //stores info for a raw connection.for client ,there is o
 	uint8_t oppsite_roller;
 	u64_t last_oppsite_roller_time;

-	ip_port_t ip_port;
+//	ip_port_t ip_port;

 /*
 	const uint32_t &ip=raw_info.recv_info.src_ip;
--- a/doc/README.zh-cn.md
+++ b/doc/README.zh-cn.md
@@ -1,25 +1,36 @@
-Udp2raw-tunnel 
-![image2](/images/image2.PNG)
+# Udp2raw-tunnel 
+![image2](/images/image0.PNG)
 udp2raw tunnel，通过raw socket给UDP包加上TCP或ICMP header，进而绕过UDP屏蔽或QoS，或在UDP不稳定的环境下提升稳定性。可以有效防止在使用kcptun或者finalspeed的情况下udp端口被运营商限速。

 支持心跳保活、自动重连，重连后会恢复上次连接，在底层掉线的情况下可以保持上层不掉线。同时有加密、防重放攻击、信道复用的功能。

-**欢迎任何形式的转载**
-
 [English](/README.md)

 [udp2raw+kcptun step_by_step教程](kcptun_step_by_step.md)

 [udp2raw+finalspeed step_by_step教程](finalspeed_step_by_step.md)

-如果你需要加速跨国网游、网页浏览，解决方案在另一个repo：
+**提示：**
+
+udp2raw不是加速器，只是一个帮助你绕过UDP限制的工具。如果你需要UDP加速器，请看UDPspeeder。
+
+UDPspeeder的repo:

 https://github.com/wangyu-/UDPspeeder
 # 支持的平台
 Linux主机，有root权限。可以是PC、android手机/平板、openwrt路由器、树莓派。主机上最好安装了iptables命令(apt/yum很容易安装)。

-在windows和mac上预装了udp2raw的虚拟机镜像已发布，可以用Vmware或VirtualBox加载，容量4.4mb，已经配置好了自动获取网卡ip，开机即用，稳定，性能很好。
-（udp2raw跑在虚拟机里，其他应用照常跑在windows上）（确保虚拟机网卡工作在桥接模式）（Vmware player 75mb,VirtualBox 118mb,很容易安装）。
+Release中提供了`amd64`、`x86`、`arm`、`mips_be`、`mips_le`的预编译binary.
+
+##### 对于windows和mac用户：
+
+在虚拟机中可以稳定使用（udp2raw跑在Linux里，其他应用照常跑在window里；确保虚拟机网卡工作在桥接模式）。可以使用[这个](https://github.com/wangyu-/udp2raw-tunnel/releases/download/20171108.0/lede-17.01.2-x86_virtual_machine_image.zip)虚拟机镜像，大小只有7.5mb，免去在虚拟机里装系统的麻烦；虚拟机自带ssh server，可以scp拷贝文件，可以ssh进去，可以复制粘贴，root密码123456。
+
+如果你的网络不允许桥接，也是有办法用的，具体方法请看wiki。
+
+##### 对于ios和游戏主机用户：
+
+可以把udp2raw运行在局域网的其他机器上。最好的办法是买个能刷OpenWrt/LEDE/梅林的路由器，把udp2raw运行在路由器上。

 # 功能特性
 ### 把udp流量伪装成tcp /icmp
@@ -49,9 +60,9 @@ NAT 穿透 ，tcp icmp udp模式都支持nat穿透。

 支持Openvz，配合finalspeed使用，可以在openvz上用tcp模式的finalspeed

-支持Openwrt，没有编译依赖，容易编译到任何平台上。release中提供了ar71xx版本的binary
+支持Openwrt，没有编译依赖，容易编译到任何平台上。

-epoll纯异步，高并发，除了回收过期连接外，所有操作的时间复杂度都跟连接数无关。回收过期连接的操做也是柔和进行的，不会因为消耗太多cpu时间造成延迟抖动。
+epoll实现，高并发，除了回收过期连接外，所有操作的时间复杂度都跟连接数无关。回收过期连接的操做也是柔和进行的，不会因为消耗太多cpu时间造成延迟抖动。

 ### 关键词
 突破udp qos,突破udp屏蔽，openvpn tcp over tcp problem,openvpn over icmp,udp to icmp tunnel,udp to tcp tunnel,udp via icmp,udp via tcp
@@ -68,11 +79,13 @@ https://github.com/wangyu-/udp2raw-tunnel/releases

 ```
 在server端运行:
-./udp2raw_amd64 -s -l0.0.0.0:4096 -r 127.0.0.1:7777  -a -k "passwd" --raw-mode faketcp
+./udp2raw_amd64 -s -l0.0.0.0:4096  -r127.0.0.1:7777   -a -k "passwd" --raw-mode faketcp   --cipher-mode xor

 在client端运行:
-./udp2raw_amd64 -c -l0.0.0.0:3333  -r44.55.66.77:4096 -a -k "passwd" --raw-mode faketcp
+./udp2raw_amd64 -c -l0.0.0.0:3333  -r44.55.66.77:4096 -a -k "passwd" --raw-mode faketcp   --cipher-mode xor
 ```
+(以上例子需要用root账号运行。 用非root运行udp2raw需要一些额外的步骤，具体方法请看 [这个](https://github.com/wangyu-/udp2raw-tunnel/wiki/run-udp2raw-as-non-root) 链接。用非root运行更安全)
+
 ###### Server端输出:
 ![](/images/output_server.PNG)
 ###### Client端输出:
@@ -85,14 +98,14 @@ https://github.com/wangyu-/udp2raw-tunnel/releases
 不论你用udp2raw来加速kcptun还是vpn,为了稳定使用,都需要设置合理的MTU（在kcptun/vpn里设置，而不是在udp2raw里），建议把MTU设置成1200。client和server端都要设置。

 ### 提醒
+`--cipher-mode xor`表示仅使用简单的XOR加密，这样可以节省CPU占用，以免CPU成为速度瓶颈。如果你需要更强的加密，可以去掉此选项，使用默认的AES加密。加密相关的选项见后文的`--cipher-mode`和`--auth-mode`。
+
 如果要在anroid上运行，请看[Android简明教程](/doc/android_guide.md)

 如果要在梅林固件的路由器上使用，添加`--lower-level auto` `--keep-rule`

 如果client和server无法连接，或者连接经常断开，请看一下`--seq-mode`的用法，尝试不同的seq-mode。

-udp2raw可以用非root账号运行，这样更安全。具体方法见：[#26](https://github.com/wangyu-/udp2raw-tunnel/issues/26) 
-
 # 进阶操作说明

 ### 命令选项
@@ -153,7 +166,7 @@ other options:

 用raw收发udp包也类似，只是内核回复的是icmp unreachable。而用raw 收发icmp，内核会自动回复icmp echo。都需要相应的iptables规则。
 ### `--cipher-mode` 和 `--auth-mode` 
-如果要最大的安全性建议用aes128cbc+md5。如果要运行再路由器上，建议xor+simple。但是注意xor+simple只能骗过防火墙的包检测，不能防止真正的攻击者。
+如果要最大的安全性建议用aes128cbc+md5。如果要运行在路由器上，建议用xor+simple，可以节省CPU。但是注意xor+simple只能骗过防火墙的包检测，不能防止真正的攻击者。

 ### `--seq-mode`
 facktcp模式并没有模拟tcp的全部。所以理论上有办法把faketcp和真正的tcp流量区分开来（虽然大部分ISP不太可能做这种程度的包检测）。seq-mode可以改变一些seq ack的行为。如果遇到了连接问题，可以尝试更改。在我这边的移动线路用3种模式都没问题。
@@ -161,14 +174,14 @@ facktcp模式并没有模拟tcp的全部。所以理论上有办法把faketcp和
 ### `--keep-rule`
 定期主动检查iptables，如果udp2raw添加的iptables规则丢了，就重新添加。在一些iptables可能会被其他程序清空的情况下(比如梅林固件和openwrt的路由器)格外有用。

-### `--lower-level`
-大部分udp2raw不能连通的情况都是设置了不兼容的iptables造成的。--lower-level选项允许绕过本地iptables。在一些iptables不好改动的情况下尤其有效（比如你用的是梅林固件，iptables全是固件自己生成的）。
-
 ### `--fifo`
 指定一个fifo(named pipe)来向运行中的程序发送命令，例如`--fifo fifo.file`：

 在client端,可以用`echo reconnect >fifo.file`来强制client换端口重连（上层不断线）.对Server，目前没有效果。

+### `--lower-level`
+大部分udp2raw不能连通的情况都是设置了不兼容的iptables造成的。--lower-level选项允许绕过本地iptables。在一些iptables不好改动的情况下尤其有效（比如你用的是梅林固件，iptables全是固件自己生成的）。
+
 ##### 格式
 `if_name#dest_mac_adress`,例如 `eth0#00:23:45:67:89:b9` 。`eth0`换成你的出口网卡名。`00:23:45:67:89:b9`换成网关的mac地址（如果client和server在同一个局域网内，可能不需要网关，这时候直接用对方主机的mac地址，这个属于罕见的应用场景，可以忽略）。

--- a/doc/build_guide.md
+++ b/doc/build_guide.md
@@ -1,8 +1,10 @@
 # udp2raw build guide

-the guide on how to build udp2raw to you own platform
+the guide on how to build udp2raw

-## linux platform which supports local compile
+## Build udp2raw for a specific platform
+
+### linux platform which supports local compile
 such as PC,raspberry pi

 ##### install git
@@ -36,7 +38,7 @@ sudo yum groupinstall 'Development Tools'

 run 'make'，compilation done. the udp2raw file is the just compiled binary

-## platform which needs cross-compile
+### platform which needs cross-compile
 such as openwrt router,run following instructions on your PC

 ##### install git
@@ -74,3 +76,17 @@ cc_cross=/home/wangyu/Desktop/OpenWrt-SDK-15.05-ar71xx-generic_gcc-4.8-linaro_uC
 run `make cross`，the just generated `udp2raw_cross` is the binary,compile done. copy it to your router to run.

 `make cross` generates non-static binary. If you have any problem on running it,try to compile a static binary by using `make cross2` or `make cross3`.If your toolchain supports static compiling, usually one of them will succeed. The generated file is still named `udp2raw_cross`.
+
+
+
+## Build a full release (include all binaries supported in the makefile)
+
+1. make sure your linux is amd64 version
+
+2. clone the repo
+
+3. make sure you have g++ , make sure your g++ support the `-m32` option; make your your have installed libraries for `-m32` option
+
+4. download https://github.com/wangyu-/files/releases/download/files/toolchains.tar.gz , and extract it to the right position (according to the makefile)
+
+5. run `make release` inside udp2raw's directory
--- a/fd_manager.cpp
+++ b/fd_manager.cpp
@@ -0,0 +1,63 @@
+/*
+ * fd_manager.cpp
+ *
+ *  Created on: Sep 25, 2017
+ *      Author: root
+ */
+
+
+#include "fd_manager.h"
+int fd_manager_t::fd_exist(int fd)
+{
+	return fd_to_fd64_mp.find(fd)!=fd_to_fd64_mp.end();
+}
+int fd_manager_t::exist(fd64_t fd64)
+{
+	return fd64_to_fd_mp.find(fd64)!=fd64_to_fd_mp.end();
+}
+int fd_manager_t::to_fd(fd64_t fd64)
+{
+	assert(exist(fd64));
+	return fd64_to_fd_mp[fd64];
+}
+void fd_manager_t::fd64_close(fd64_t fd64)
+{
+	assert(exist(fd64));
+	int fd=fd64_to_fd_mp[fd64];
+	fd64_to_fd_mp.erase(fd64);
+	fd_to_fd64_mp.erase(fd);
+	if(exist_info(fd64))
+	{
+		fd_info_mp.erase(fd64);
+	}
+	assert(close(fd)==0);
+}
+void fd_manager_t::reserve(int n)
+{
+	fd_to_fd64_mp.reserve(n);
+	fd64_to_fd_mp.reserve(n);
+	fd_info_mp.reserve(n);
+}
+u64_t fd_manager_t::create(int fd)
+{
+	assert(!fd_exist(fd));
+	fd64_t fd64=counter++;
+	fd_to_fd64_mp[fd]=fd64;
+	fd64_to_fd_mp[fd64]=fd;
+	return fd64;
+}
+fd_manager_t::fd_manager_t()
+{
+	counter=u32_t(-1);
+	counter+=100;
+	reserve(10007);
+}
+fd_info_t & fd_manager_t::get_info(fd64_t fd64)
+{
+	assert(exist(fd64));
+	return fd_info_mp[fd64];
+}
+int fd_manager_t::exist_info(fd64_t fd64)
+{
+	return fd_info_mp.find(fd64)!=fd_info_mp.end();
+}
--- a/fd_manager.h
+++ b/fd_manager.h
@@ -0,0 +1,43 @@
+/*
+ * fd_manager.h
+ *
+ *  Created on: Sep 25, 2017
+ *      Author: root
+ */
+
+#ifndef FD_MANAGER_H_
+#define FD_MANAGER_H_
+
+#include "common.h"
+//#include "packet.h"
+#include "connection.h"
+
+struct fd_info_t
+{
+	//ip_port_t ip_port;
+	conn_info_t *p_conn_info;
+};
+
+struct fd_manager_t   //conver fd to a uniq 64bit number,avoid fd value conflict caused by close and re-create
+//this class is not strictly necessary,it just makes epoll fd handling easier
+{
+	fd_info_t & get_info(fd64_t fd64);
+	int exist_info(fd64_t);
+	int exist(fd64_t fd64);
+	int to_fd(fd64_t);
+	void fd64_close(fd64_t fd64);
+	void reserve(int n);
+	u64_t create(int fd);
+	fd_manager_t();
+private:
+	u64_t counter;
+	unordered_map<int,fd64_t> fd_to_fd64_mp;
+	unordered_map<fd64_t,int> fd64_to_fd_mp;
+	unordered_map<fd64_t,fd_info_t> fd_info_mp;
+	int fd_exist(int fd);
+	//void remove_fd(int fd);
+	//fd64_t fd_to_fd64(int fd);
+};
+
+extern fd_manager_t fd_manager;
+#endif /* FD_MANAGER_H_ */
--- a/images/udp2rawopenvpn.PNG
+++ b/images/udp2rawopenvpn.PNG
--- a/images/wiki/111
+++ b/images/wiki/111
@@ -0,0 +1 @@
+
--- a/images/wiki/mac_nat_vb1.PNG
+++ b/images/wiki/mac_nat_vb1.PNG
--- a/images/wiki/mac_nat_vb2.PNG
+++ b/images/wiki/mac_nat_vb2.PNG
--- a/images/wiki/mac_nat_vb3.PNG
+++ b/images/wiki/mac_nat_vb3.PNG
--- a/images/wiki/mac_nat_vb4.PNG
+++ b/images/wiki/mac_nat_vb4.PNG
--- a/images/wiki/windows_nat.PNG
+++ b/images/wiki/windows_nat.PNG
--- a/images/wiki/windows_nat_vb1.PNG
+++ b/images/wiki/windows_nat_vb1.PNG
--- a/images/wiki/windows_nat_vb2.PNG
+++ b/images/wiki/windows_nat_vb2.PNG
--- a/images/wiki/windows_nat_vm1.PNG
+++ b/images/wiki/windows_nat_vm1.PNG
--- a/images/wiki/windows_nat_vm2.PNG
+++ b/images/wiki/windows_nat_vm2.PNG
--- a/main.cpp
+++ b/main.cpp
@@ -7,7 +7,9 @@
 #include "encrypt.h"
 #include "fd_manager.h"

-int mtu_warn=1375;//if a packet larger than mtu warn is receviced,there will be a warning
+
+char hb_buf[buf_len];
+

 int server_on_raw_recv_pre_ready(conn_info_t &conn_info,char * ip_port,u32_t tmp_oppsite_const_id);
 int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,char *data,int data_len);
@@ -27,8 +29,6 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
 	mylog(log_trace,"<client_on_timer,send_info.ts_ack= %u>\n",send_info.ts_ack);


-
-
 	if(conn_info.state.client_current_state==client_idle)
 	{
 		fail_time_counter++;
@@ -227,11 +227,6 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
 			return 0;
 		}

-		if(get_current_time()-conn_info.last_hb_sent_time<heartbeat_interval)
-		{
-			return 0;
-		}
-
 		if(get_current_time()- conn_info.last_oppsite_roller_time>client_conn_uplink_timeout)
 		{
 			conn_info.state.client_current_state=client_idle;
@@ -239,10 +234,20 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
 			mylog(log_info,"state back to client_idle from  client_ready bc of client-->server direction timeout\n");
 		}

+
+		if(get_current_time()-conn_info.last_hb_sent_time<heartbeat_interval)
+		{
+			return 0;
+		}
+
+
+
 		mylog(log_debug,"heartbeat sent <%x,%x>\n",conn_info.oppsite_id,conn_info.my_id);

-		send_safer(conn_info,'h',"",0);/////////////send
-
+		if(hb_mode==0)
+			send_safer(conn_info,'h',hb_buf,0);/////////////send
+		else
+			send_safer(conn_info,'h',hb_buf,hb_len);
 		conn_info.last_hb_sent_time=get_current_time();
 		return 0;
 	}
@@ -284,8 +289,10 @@ int server_on_timer_multi(conn_info_t &conn_info,char * ip_port)  //for server.
 			return 0;
 		}

-		send_safer(conn_info,'h',"",0);  /////////////send
-
+		if(hb_mode==0)
+			send_safer(conn_info,'h',hb_buf,0);  /////////////send
+		else
+			send_safer(conn_info,'h',hb_buf,hb_len);
 		conn_info.last_hb_sent_time=get_current_time();

 		mylog(log_debug,"heart beat sent<%x,%x>\n",conn_info.my_id,conn_info.oppsite_id);
@@ -431,9 +438,9 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p
 			conn_info.last_oppsite_roller_time=conn_info.last_hb_recv_time;
 			client_on_timer(conn_info);
 		}
-		if(data_len==0&&type=='h')
+		if(data_len>=0&&type=='h')
 		{
-			mylog(log_debug,"[hb]heart beat received\n");
+			mylog(log_debug,"[hb]heart beat received,oppsite_roller=%d\n",int(conn_info.oppsite_roller));
 			conn_info.last_hb_recv_time=get_current_time();
 			return 0;
 		}
@@ -441,6 +448,7 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p
 		{
 			mylog(log_trace,"received a data from fake tcp,len:%d\n",data_len);

+			if(hb_mode==0)
 				conn_info.last_hb_recv_time=get_current_time();

 			//u32_t tmp_conv_id= ntohl(* ((u32_t *)&data[0]));
@@ -603,8 +611,8 @@ int server_on_raw_recv_multi() //called when server received an raw packet
 		conn_info_t &conn_info=conn_manager.find_insert(ip,port);
 		conn_info.raw_info=tmp_raw_info;

-		conn_info.ip_port.ip=ip;
-		conn_info.ip_port.port=port;
+		//conn_info.ip_port.ip=ip;
+		//conn_info.ip_port.port=port;

 		packet_info_t &send_info=conn_info.raw_info.send_info;
 		packet_info_t &recv_info=conn_info.raw_info.recv_info;
@@ -775,7 +783,7 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha
 		return 0;
 	}*/

-	if (type == 'h' && data_len == 0) {
+	if (type == 'h' && data_len >= 0) {
 		//u32_t tmp = ntohl(*((u32_t *) &data[sizeof(u32_t)]));
 		mylog(log_debug,"[%s][hb]received hb \n",ip_port);
 		conn_info.last_hb_recv_time = get_current_time();
@@ -789,6 +797,7 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha
 		tmp_conv_id=ntohl(tmp_conv_id);


+		if(hb_mode==0)
 			conn_info.last_hb_recv_time = get_current_time();

 		mylog(log_trace, "conv:%u\n", tmp_conv_id);
@@ -826,6 +835,7 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha
 			struct epoll_event ev;

 			fd64_t new_udp_fd64 =  fd_manager.create(new_udp_fd);
+			fd_manager.get_info(new_udp_fd64).p_conn_info=&conn_info;

 			mylog(log_trace, "[%s]u64: %lld\n",ip_port, new_udp_fd64);
 			ev.events = EPOLLIN;
@@ -842,7 +852,7 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha

 			conn_info.blob->conv_manager.insert_conv(tmp_conv_id, new_udp_fd64);

-			fd_manager.get_info(new_udp_fd64).ip_port=conn_info.ip_port;
+

 			//assert(conn_manager.udp_fd_mp.find(new_udp_fd)==conn_manager.udp_fd_mp.end());

@@ -857,11 +867,11 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha

 		}

-		u64_t u64 = conn_info.blob->conv_manager.find_u64_by_conv(tmp_conv_id);
+		fd64_t fd64 = conn_info.blob->conv_manager.find_u64_by_conv(tmp_conv_id);

 		conn_info.blob->conv_manager.update_active_time(tmp_conv_id);

-		int fd = int((u64 << 32u) >> 32u);
+		int fd = fd_manager.to_fd(fd64);

 		mylog(log_trace, "[%s]received a data from fake tcp,len:%d\n",ip_port, data_len);
 		int ret = send(fd, data + sizeof(u32_t),
@@ -914,21 +924,23 @@ int server_on_raw_recv_pre_ready(conn_info_t &conn_info,char * ip_port,u32_t tmp

 		//my_id=conn_info.my_id;
 		//oppsite_id=conn_info.oppsite_id;
-
 		conn_info.last_hb_recv_time = get_current_time();
+
 		conn_info.last_hb_sent_time = conn_info.last_hb_recv_time;//=get_current_time()

-		send_safer(conn_info, 'h',"", 0);		/////////////send
+		if(hb_mode==0)
+			send_safer(conn_info,'h',hb_buf,0);/////////////send
+		else
+			send_safer(conn_info,'h',hb_buf,hb_len);

 		mylog(log_info, "[%s]changed state to server_ready\n",ip_port);
 		conn_info.blob->anti_replay.re_init();

 		//g_conn_info=conn_info;
 		int new_timer_fd;
-		set_timer_server(epollfd, new_timer_fd);
-		conn_info.timer_fd64=fd_manager.create(new_timer_fd);
+		set_timer_server(epollfd, new_timer_fd,conn_info.timer_fd64);

-		fd_manager.get_info(conn_info.timer_fd64).ip_port=conn_info.ip_port;
+		fd_manager.get_info(conn_info.timer_fd64).p_conn_info=&conn_info;
 		//assert(conn_manager.timer_fd_mp.find(new_timer_fd)==conn_manager.timer_fd_mp.end());
 		//conn_manager.timer_fd_mp[new_timer_fd] = &conn_info;//pack_u64(ip,port);

@@ -979,8 +991,14 @@ int server_on_raw_recv_pre_ready(conn_info_t &conn_info,char * ip_port,u32_t tmp
 			//ori_conn_info.state.server_current_state=server_ready;
 			ori_conn_info.recover(conn_info);

-			send_safer(ori_conn_info, 'h',"", 0);
+			//send_safer(ori_conn_info, 'h',hb_buf, hb_len);
 			//ori_conn_info.blob->anti_replay.re_init();
+			if(hb_mode==0)
+				send_safer(ori_conn_info,'h',hb_buf,0);/////////////send
+			else
+				send_safer(ori_conn_info,'h',hb_buf,hb_len);
+
+			ori_conn_info.last_hb_recv_time=get_current_time();



@@ -1178,13 +1196,13 @@ int client_event_loop()
 		if (nfds < 0) {  //allow zero
 			if(errno==EINTR  )
 			{
-				mylog(log_info,"epoll interrupted by signal\n");
+				mylog(log_info,"epoll interrupted by signal,continue\n");
 				//close(fifo_fd);
-				myexit(0);
+				//myexit(0);
 			}
 			else
 			{
-				mylog(log_fatal,"epoll_wait return %d\n", nfds);
+				mylog(log_fatal,"epoll_wait return %d,%s\n", nfds,strerror(errno));
 				myexit(-1);
 			}
 		}
@@ -1422,12 +1440,12 @@ int server_event_loop()
 		if (nfds < 0) {  //allow zero
 			if(errno==EINTR  )
 			{
-				mylog(log_info,"epoll interrupted by signal\n");
-				myexit(0);
+				mylog(log_info,"epoll interrupted by signal,continue\n");
+				//myexit(0);
 			}
 			else
 			{
-				mylog(log_fatal,"epoll_wait return %d\n", nfds);
+				mylog(log_fatal,"epoll_wait return %d,%s\n", nfds,strerror(errno));
 				myexit(-1);
 			}
 		}
@@ -1484,7 +1502,7 @@ int server_event_loop()

 				fd64_t fd64=events[idx].data.u64;

-				if(fd_manager.exist(fd64))
+				if(!fd_manager.exist(fd64))
 				{
 					mylog(log_trace ,"fd64 no longer exist\n");
 					continue;
@@ -1492,23 +1510,21 @@ int server_event_loop()

 				assert(fd_manager.exist_info(fd64));

-				ip_port_t ip_port=fd_manager.get_info(fd64).ip_port;
-				u32_t ip=ip_port.ip;
-				u32_t port=ip_port.port;
-
-				assert(conn_manager.exist(ip,port));
-
-				conn_info_t* p_conn_info=conn_manager.find_insert_p(ip,port);
-
+				conn_info_t* p_conn_info=fd_manager.get_info(fd64).p_conn_info;
+				u32_t ip=p_conn_info->raw_info.send_info.dst_ip;
+				u32_t port=p_conn_info->raw_info.send_info.dst_port;

+				//assert(conn_manager.exist(ip,port));

+				///conn_info_t* p_conn_info=conn_manager.find_insert_p(ip,port);


 				if(fd64==p_conn_info->timer_fd64)//////////timer_fd64
 				{

 				if(debug_flag)begin_time=get_current_time();
-				int fd=get_u64_l(events[idx].data.u64);
+				//int fd=get_u64_l(events[idx].data.u64);
+				int fd=fd_manager.to_fd(fd64);
 				u64_t dummy;
 				read(fd, &dummy, 8);

@@ -1660,7 +1676,11 @@ int main(int argc, char *argv[])

 	if(geteuid() != 0)
 	{
-		mylog(log_error,"root check failed,make sure you run this program with root,we can try to continue,but it will likely fail\n");
+		mylog(log_error,"root check failed, it seems like you are using a non-root account. we can try to continue, but it may fail. If you want to run udp2raw as non-root, you have to add iptables rule manually, and grant udp2raw CAP_NET_RAW capability, check README.md in repo for more info.\n");
+	}
+	else
+	{
+		mylog(log_warn,"you can run udp2raw with non-root account for better security. check README.md in repo for more info.\n");
 	}

 	local_ip_uint32=inet_addr(local_ip);
--- a/12
+++ b/12
@@ -1,10 +1,12 @@
 cc_cross=/home/wangyu/Desktop/arm-2014.05/bin/arm-none-linux-gnueabi-g++
 cc_local=g++
+#cc_local=/opt/cross/x86_64-linux-musl/bin/x86_64-linux-musl-g++
 #cc_mips34kc=/toolchains/OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/bin/mips-openwrt-linux-g++
 cc_mips24kc_be=/toolchains/lede-sdk-17.01.2-ar71xx-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mips_24kc_gcc-5.4.0_musl-1.1.16/bin/mips-openwrt-linux-musl-g++
 cc_mips24kc_le=/toolchains/lede-sdk-17.01.2-ramips-mt7621_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mipsel_24kc_gcc-5.4.0_musl-1.1.16/bin/mipsel-openwrt-linux-musl-g++
 #cc_arm= /toolchains/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabi/bin/arm-linux-gnueabi-g++ -march=armv6 -marm 
 cc_arm= /toolchains/arm-2014.05/bin/arm-none-linux-gnueabi-g++
+#cc_arm=/toolchains/lede-sdk-17.01.2-brcm2708-bcm2708_gcc-5.4.0_musl-1.1.16_eabi.Linux-x86_64/staging_dir/toolchain-arm_arm1176jzf-s+vfp_gcc-5.4.0_musl-1.1.16_eabi/bin/arm-openwrt-linux-muslgnueabi-g++
 #cc_bcm2708=/home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++ 
 FLAGS= -std=c++11 -Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers

@@ -15,7 +17,7 @@ SOURCES_AES_ACC=$(COMMON) $(wildcard lib/aes_acc/aes*.c)

 NAME=udp2raw
 TARGETS=amd64 arm amd64_hw_aes arm_asm_aes mips24kc_be mips24kc_be_asm_aes x86 x86_asm_aes mips24kc_le mips24kc_le_asm_aes
-TAR=${NAME}_binaries.tar.gz `echo ${TARGETS}|sed -r 's/([^ ]+)/udp2raw_\1/g'`
+TAR=${NAME}_binaries.tar.gz `echo ${TARGETS}|sed -r 's/([^ ]+)/udp2raw_\1/g'` version.txt

 all:git_version
 	rm -f ${NAME}
@@ -47,6 +49,10 @@ mips24kc_le_asm_aes: git_version
 #	${cc_bcm2708} -o ${NAME}_bcm2708  -I. ${SOURCES} ${FLAGS} -lrt -static -O3
 amd64:git_version
 	${cc_local}   -o ${NAME}_$@    -I. ${SOURCES} ${FLAGS} -lrt -static -O3
+
+amd64_perf:git_version
+	${cc_local}   -o ${NAME}_$@    -I. ${SOURCES} ${FLAGS} -lrt -static -O0 -fno-omit-frame-pointer -g
+
 amd64_hw_aes:git_version
 	${cc_local}   -o ${NAME}_$@   -I. ${SOURCES_AES_ACC} ${FLAGS} -lrt -static -O3 lib/aes_acc/asm/x64.S
 x86:git_version
@@ -56,6 +62,9 @@ x86_asm_aes:git_version
 arm:git_version
 	${cc_arm}   -o ${NAME}_$@      -I. ${SOURCES} ${FLAGS} -lrt -static -O3

+arm_perf:git_version
+	${cc_arm}   -o ${NAME}_$@      -I. ${SOURCES} ${FLAGS} -lrt -static -mapcs-frame -fno-omit-frame-pointer -g -O0 -lgcc_eh
+
 arm_asm_aes:git_version
 	${cc_arm}   -o ${NAME}_$@    -I. ${SOURCES_AES_ACC} ${FLAGS} -lrt -static -O3 lib/aes_acc/asm/arm.S

@@ -69,6 +78,7 @@ cross3:git_version
 	${cc_cross}   -o ${NAME}_cross    -I. ${SOURCES} ${FLAGS} -lrt -static -O3

 release: ${TARGETS} 
+	cp git_version.h version.txt
 	tar -zcvf ${TAR}

 clean:	
--- a/misc.cpp
+++ b/misc.cpp
@@ -13,6 +13,12 @@
 #include "fd_manager.h"


+int hb_mode=1;
+int hb_len=1200;
+
+int mtu_warn=1375;//if a packet larger than mtu warn is receviced,there will be a warning
+
+
 fd_manager_t fd_manager;

 char local_ip[100]="0.0.0.0", remote_ip[100]="255.255.255.255",source_ip[100]="0.0.0.0";//local_ip is for -l option,remote_ip for -r option,source for --source-ip
@@ -44,6 +50,8 @@ char key_string[1000]= "secret key";// -k option

 char fifo_file[1000]="";

+string iptables_command0="iptables ";
+string iptables_command="iptables -w ";
 string iptables_pattern="";
 int iptables_rule_added=0;
 int iptables_rule_keeped=0;
@@ -149,6 +157,8 @@ void print_help()
 	printf("                                          the parameter automatically,specify it manually if 'auto' failed\n");
 	printf("    --gen-add                             generate iptables rule and add it permanently,then exit.overrides -g\n");
 	printf("    --keep-rule                           monitor iptables and auto re-add if necessary.implys -a\n");
+	printf("    --hb-len              <number>        length of heart-beat packet, >=0 and <=1500\n");
+	printf("    --mtu-warn            <number>        mtu warning threshold, unit:byte, default:1375\n");
 	printf("    --clear                               clear any iptables rules added by this program.overrides everything\n");
 	printf("    -h,--help                             print this help message\n");

@@ -247,6 +257,9 @@ void process_arg(int argc, char *argv[])  //process all options
 		{"force-sock-buf", no_argument,   0, 1},
 		{"random-drop", required_argument,    0, 1},
 		{"fifo", required_argument,    0, 1},
+		{"hb-mode", required_argument,    0, 1},
+		{"hb-len", required_argument,    0, 1},
+		{"mtu-warn", required_argument,    0, 1},
 		{NULL, 0, 0, 0}
 	  };

@@ -417,9 +430,9 @@ void process_arg(int argc, char *argv[])  //process all options
 			{
 				char *output;
 				//int ret =system("iptables-save |grep udp2raw_dWRwMnJhdw|sed -n 's/^-A/iptables -D/p'|sh");
-				int ret =run_command("iptables -S|sed -n '/udp2rawDwrW/p'|sed -n 's/^-A/iptables -D/p'|sh",output);
+				int ret =run_command(iptables_command+"-S|sed -n '/udp2rawDwrW/p'|sed -n 's/^-A/"+iptables_command+"-D/p'|sh",output);

-				int ret2 =run_command("iptables -S|sed -n '/udp2rawDwrW/p'|sed -n 's/^-N/iptables -X/p'|sh",output);
+				int ret2 =run_command(iptables_command+"-S|sed -n '/udp2rawDwrW/p'|sed -n 's/^-N/"+iptables_command+"-X/p'|sh",output);
 				//system("iptables-save |grep udp2raw_dWRwMnJhdw|sed 's/^-A/iptables -D/'|sh");
 				//system("iptables-save|grep -v udp2raw_dWRwMnJhdw|iptables-restore");
 				mylog(log_info,"tried to clear all iptables rule created previously,return value %d %d\n",ret,ret2);
@@ -589,7 +602,24 @@ void process_arg(int argc, char *argv[])  //process all options
 			{
 				mylog(log_info,"configuration loaded from %s\n",optarg);
 			}
-
+			else if(strcmp(long_options[option_index].name,"hb-mode")==0)
+			{
+				sscanf(optarg,"%d",&hb_mode);
+				assert(hb_mode==0||hb_mode==1);
+				mylog(log_info,"hb_mode =%d \n",hb_mode);
+			}
+			else if(strcmp(long_options[option_index].name,"hb-len")==0)
+			{
+				sscanf(optarg,"%d",&hb_len);
+				assert(hb_len>=0&&hb_len<=1500);
+				mylog(log_info,"hb_len =%d \n",hb_len);
+			}
+			else if(strcmp(long_options[option_index].name,"mtu-warn")==0)
+			{
+				sscanf(optarg,"%d",&mtu_warn);
+				assert(mtu_warn>0);
+				mylog(log_info,"mtu_warn=%d \n",mtu_warn);
+			}
 			else
 			{
 				mylog(log_warn,"ignored unknown long option ,option_index:%d code:<%x>\n",option_index, optopt);
@@ -844,7 +874,7 @@ void iptables_rule()  // handles -a -g --gen-add  --keep-rule
 	}
 	if(generate_iptables_rule)
 	{
-		string rule="iptables -I INPUT ";
+		string rule=iptables_command+"-I INPUT ";
 		rule+=pattern;
 		rule+=" -j DROP";

@@ -951,7 +981,7 @@ int set_timer(int epollfd,int &timer_fd)//put a timer_fd into epoll,general func
 }


-int set_timer_server(int epollfd,int &timer_fd)//only for server
+int set_timer_server(int epollfd,int &timer_fd,fd64_t &fd64)//only for server
 {
 	int ret;
 	epoll_event ev;
@@ -969,9 +999,11 @@ int set_timer_server(int epollfd,int &timer_fd)//only for server
 	its.it_value.tv_nsec=1; //imidiately
 	timerfd_settime(timer_fd,0,&its,0);

+	fd64=fd_manager.create(timer_fd);
+

 	ev.events = EPOLLIN;
-	ev.data.u64 = pack_u64(2,timer_fd);////difference
+	ev.data.u64 = fd64;////difference

 	ret=epoll_ctl(epollfd, EPOLL_CTL_ADD, timer_fd, &ev);
 	if (ret < 0) {
@@ -1012,31 +1044,6 @@ int handle_lower_level(raw_info_t &raw_info)//fill lower_level info,when --lower
 }


-
-/*
-int add_iptables_rule(const char * s)
-{
-
-	iptables_pattern=s;
-
-	string rule="iptables -I INPUT ";
-	rule+=iptables_pattern;
-	rule+=" -j DROP";
-
-	char *output;
-	if(run_command(rule.c_str(),output)==0)
-	{
-		mylog(log_warn,"auto added iptables rule by:  %s\n",rule.c_str());
-	}
-	else
-	{
-		mylog(log_fatal,"auto added iptables failed by: %s\n",rule.c_str());
-		//mylog(log_fatal,"reason : %s\n",strerror(errno));
-		myexit(-1);
-	}
-	iptables_rule_added=1;
-	return 0;
-}*/
 string chain[2];
 string rule_keep[2];
 string rule_keep_add[2];
@@ -1051,14 +1058,14 @@ int iptables_gen_add(const char * s,u32_t const_id)
 	iptables_pattern=s;
 	chain[0] =dummy+ "udp2rawDwrW_C";
 	rule_keep[0]=dummy+ iptables_pattern+" -j " +chain[0];
-	rule_keep_add[0]=dummy+"iptables -I INPUT "+rule_keep[0];
+	rule_keep_add[0]=iptables_command+"-I INPUT "+rule_keep[0];

 	char *output;
-	run_command(dummy+"iptables -N "+chain[0],output,show_none);
-	run_command(dummy+"iptables -F "+chain[0],output);
-	run_command(dummy+"iptables -I "+chain[0] + " -j DROP",output);
+	run_command(iptables_command+"-N "+chain[0],output,show_none);
+	run_command(iptables_command+"-F "+chain[0],output);
+	run_command(iptables_command+"-I "+chain[0] + " -j DROP",output);

-	rule_keep_del[0]=dummy+"iptables -D INPUT "+rule_keep[0];
+	rule_keep_del[0]=iptables_command+"-D INPUT "+rule_keep[0];

 	run_command(rule_keep_del[0],output,show_none);
 	run_command(rule_keep_del[0],output,show_none);
@@ -1086,11 +1093,11 @@ int iptables_rule_init(const char * s,u32_t const_id,int keep)
 	rule_keep[0]=dummy+ iptables_pattern+" -j " +chain[0];
 	rule_keep[1]=dummy+ iptables_pattern+" -j " +chain[1];

-	rule_keep_add[0]=dummy+"iptables -I INPUT "+rule_keep[0];
-	rule_keep_add[1]=dummy+"iptables -I INPUT "+rule_keep[1];
+	rule_keep_add[0]=iptables_command+"-I INPUT "+rule_keep[0];
+	rule_keep_add[1]=iptables_command+"-I INPUT "+rule_keep[1];

-	rule_keep_del[0]=dummy+"iptables -D INPUT "+rule_keep[0];
-	rule_keep_del[1]=dummy+"iptables -D INPUT "+rule_keep[1];
+	rule_keep_del[0]=iptables_command+"-D INPUT "+rule_keep[0];
+	rule_keep_del[1]=iptables_command+"-D INPUT "+rule_keep[1];

 	keep_rule_last_time=get_current_time();

@@ -1098,9 +1105,9 @@ int iptables_rule_init(const char * s,u32_t const_id,int keep)

 	for(int i=0;i<=iptables_rule_keeped;i++)
 	{
-		run_command(dummy+"iptables -N "+chain[i],output);
-		run_command(dummy+"iptables -F "+chain[i],output);
-		run_command(dummy+"iptables -I "+chain[i] + " -j DROP",output);
+		run_command(iptables_command+"-N "+chain[i],output);
+		run_command(iptables_command+"-F "+chain[i],output);
+		run_command(iptables_command+"-I "+chain[i] + " -j DROP",output);

 		if(run_command(rule_keep_add[i],output)!=0)
 		{
@@ -1137,12 +1144,12 @@ int keep_iptables_rule()  //magic to work on a machine without grep/iptables --c

 	int i=iptables_rule_keep_index;

-	run_command(dummy + "iptables -N " + chain[i], output,show_none);
+	run_command(iptables_command + "-N " + chain[i], output,show_none);

-	if (run_command(dummy + "iptables -F " + chain[i], output,show_none) != 0)
+	if (run_command(iptables_command + "-F " + chain[i], output,show_none) != 0)
 		mylog(log_warn, "iptables -F failed %d\n",i);

-	if (run_command(dummy + "iptables -I " + chain[i] + " -j DROP",output,show_none) != 0)
+	if (run_command(iptables_command + "-I " + chain[i] + " -j DROP",output,show_none) != 0)
 		mylog(log_warn, "iptables -I failed %d\n",i);

 	if (run_command(rule_keep_del[i], output,show_none) != 0)
@@ -1166,8 +1173,8 @@ int clear_iptables_rule()
 	for(int i=0;i<=iptables_rule_keeped;i++ )
 	{
 		run_command(rule_keep_del[i],output);
-		run_command(dummy+"iptables -F "+chain[i],output);
-		run_command(dummy+"iptables -X "+chain[i],output);
+		run_command(iptables_command+"-F "+chain[i],output);
+		run_command(iptables_command+"-X "+chain[i],output);
 	}
 	return 0;
 }
--- a/misc.h
+++ b/misc.h
@@ -13,7 +13,9 @@
 #include "log.h"
 #include "network.h"

-
+extern int hb_mode;
+extern int hb_len;
+extern int mtu_warn;

 const u32_t max_handshake_conn_num=10000;
 const u32_t max_ready_conn_num=1000;
@@ -25,22 +27,22 @@ const u32_t client_retry_interval=1000;//ms

 const u32_t server_handshake_timeout=client_handshake_timeout+5000;// this should be longer than clients. client retry initially ,server retry passtively

-const int conv_clear_ratio=10;  //conv grabage collecter check 1/10 of all conv one time
-const int conn_clear_ratio=30;
+const int conv_clear_ratio=30;  //conv grabage collecter check 1/30 of all conv one time
+const int conn_clear_ratio=50;
 const int conv_clear_min=1;
 const int conn_clear_min=1;

-const u32_t conv_clear_interval=3000;//ms
-const u32_t conn_clear_interval=3000;//ms
+const u32_t conv_clear_interval=1000;//ms
+const u32_t conn_clear_interval=1000;//ms


 const i32_t max_fail_time=0;//disable

-const u32_t heartbeat_interval=1000;//ms
+const u32_t heartbeat_interval=600;//ms

 const u32_t timer_interval=400;//ms. this should be smaller than heartbeat_interval and retry interval;

-const uint32_t conv_timeout=120000; //ms. 120 second
+const uint32_t conv_timeout=180000; //ms. 120 second
 //const u32_t conv_timeout=30000; //for test

 const u32_t client_conn_timeout=10000;//ms.
@@ -49,7 +51,7 @@ const u32_t client_conn_uplink_timeout=client_conn_timeout+2000;//ms
 const uint32_t server_conn_timeout=conv_timeout+60000;//ms. this should be 60s+ longer than conv_timeout,so that conv_manager can destruct convs gradually,to avoid latency glicth
 //const u32_t server_conn_timeout=conv_timeout+10000;//for test

-const u32_t iptables_rule_keep_interval=15;//unit: second;
+const u32_t iptables_rule_keep_interval=20;//unit: second;

 enum server_current_state_t {server_idle=0,server_handshake1,server_ready};  //server state machine
 enum client_current_state_t {client_idle=0,client_tcp_handshake,client_handshake1,client_handshake2,client_ready};//client state machine
@@ -112,7 +114,7 @@ void iptables_rule();
 void pre_process_arg(int argc, char *argv[]);//mainly for load conf file;
 int unit_test();
 int set_timer(int epollfd,int &timer_fd);
-int set_timer_server(int epollfd,int &timer_fd);
+int set_timer_server(int epollfd,int &timer_fd,fd64_t &fd64);
 int handle_lower_level(raw_info_t &raw_info);

 int add_iptables_rule(const char *);
--- a/network.cpp
+++ b/network.cpp
@@ -1820,17 +1820,17 @@ int get_src_adress(u32_t &ip,u32_t remote_ip_uint32,int remote_port)  //a trick
    return 0;
 }

-int try_to_list_and_bind(int bind_fd,u32_t local_ip_uint32,int port)  //try to bind to a port,may fail.
+int try_to_list_and_bind(int &fd,u32_t local_ip_uint32,int port)  //try to bind to a port,may fail.
 {
-	 int old_bind_fd=bind_fd;
+	 int old_bind_fd=fd;

 	 if(raw_mode==mode_faketcp)
 	 {
-		 bind_fd=socket(AF_INET,SOCK_STREAM,0);
+		 fd=socket(AF_INET,SOCK_STREAM,0);
 	 }
 	 else  if(raw_mode==mode_udp||raw_mode==mode_icmp)
 	 {
-		 bind_fd=socket(AF_INET,SOCK_DGRAM,0);
+		 fd=socket(AF_INET,SOCK_DGRAM,0);
 	 }
     if(old_bind_fd!=-1)
     {
@@ -1844,7 +1844,7 @@ int try_to_list_and_bind(int bind_fd,u32_t local_ip_uint32,int port)  //try to b
     temp_bind_addr.sin_port = htons(port);
     temp_bind_addr.sin_addr.s_addr = local_ip_uint32;

-     if (bind(bind_fd, (struct sockaddr*)&temp_bind_addr, sizeof(temp_bind_addr)) !=0)
+     if (bind(fd, (struct sockaddr*)&temp_bind_addr, sizeof(temp_bind_addr)) !=0)
     {
    	 mylog(log_debug,"bind fail\n");
    	 return -1;
@@ -1852,19 +1852,19 @@ int try_to_list_and_bind(int bind_fd,u32_t local_ip_uint32,int port)  //try to b
 	 if(raw_mode==mode_faketcp)
 	 {

-		if (listen(bind_fd, SOMAXCONN) != 0) {
+		if (listen(fd, SOMAXCONN) != 0) {
 			mylog(log_warn,"listen fail\n");
 			return -1;
 		}
 	 }
     return 0;
 }
-int client_bind_to_a_new_port(int bind_fd,u32_t local_ip_uint32)//find a free port and bind to it.
+int client_bind_to_a_new_port(int &fd,u32_t local_ip_uint32)//find a free port and bind to it.
 {
 	int raw_send_port=10000+get_true_random_number()%(65535-10000);
 	for(int i=0;i<1000;i++)//try 1000 times at max,this should be enough
 	{
-		if (try_to_list_and_bind(bind_fd,local_ip_uint32,raw_send_port)==0)
+		if (try_to_list_and_bind(fd,local_ip_uint32,raw_send_port)==0)
 		{
 			return raw_send_port;
 		}
--- a/network.h
+++ b/network.h
@@ -99,9 +99,9 @@ int find_lower_level_info(u32_t ip,u32_t &dest_ip,string &if_name,string &hw);

 int get_src_adress(u32_t &ip,u32_t remote_ip_uint32,int remote_port);  //a trick to get src adress for a dest adress,so that we can use the src address in raw socket as source ip

-int try_to_list_and_bind(int bind_fd,u32_t local_ip_uint32,int port);  //try to bind to a port,may fail.
+int try_to_list_and_bind(int & bind_fd,u32_t local_ip_uint32,int port);  //try to bind to a port,may fail.

-int client_bind_to_a_new_port(int bind_fd,u32_t local_ip_uint32);//find a free port and bind to it.
+int client_bind_to_a_new_port(int & bind_fd,u32_t local_ip_uint32);//find a free port and bind to it.

 int send_raw_ip(raw_info_t &raw_info,const char * payload,int payloadlen);

--- a/third-party/luci-app-udp2raw/LICENSE
+++ b/third-party/luci-app-udp2raw/LICENSE
@@ -0,0 +1,622 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
--- a/third-party/luci-app-udp2raw/Makefile
+++ b/third-party/luci-app-udp2raw/Makefile
@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2016-2017 Jian Chang <aa65535@live.com>
+#
+# This is free software, licensed under the GNU General Public License v3.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luci-app-udp2raw
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=2
+
+PKG_LICENSE:=GPLv3
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Jian Chang <aa65535@live.com>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+	SECTION:=luci
+	CATEGORY:=LuCI
+	SUBMENU:=3. Applications
+	TITLE:=LuCI Support for udp2raw-tunnel
+	PKGARCH:=all
+	DEPENDS:=+udp2raw-tunnel
+endef
+
+define Package/$(PKG_NAME)/description
+	LuCI Support for udp2raw-tunnel.
+endef
+
+define Build/Prepare
+	$(foreach po,$(wildcard ${CURDIR}/files/luci/i18n/*.po), \
+		po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/$(PKG_NAME)/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	( . /etc/uci-defaults/luci-udp2raw ) && rm -f /etc/uci-defaults/luci-udp2raw
+fi
+exit 0
+endef
+
+define Package/$(PKG_NAME)/conffiles
+	/etc/config/udp2raw
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/udp2raw.*.lmo $(1)/usr/lib/lua/luci/i18n/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
+	$(INSTALL_DATA) ./files/luci/controller/*.lua $(1)/usr/lib/lua/luci/controller/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/udp2raw
+	$(INSTALL_DATA) ./files/luci/model/cbi/udp2raw/*.lua $(1)/usr/lib/lua/luci/model/cbi/udp2raw/
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/udp2raw
+	$(INSTALL_DATA) ./files/luci/view/udp2raw/*.htm $(1)/usr/lib/lua/luci/view/udp2raw/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/root/etc/config/udp2raw $(1)/etc/config/udp2raw
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/root/etc/init.d/udp2raw $(1)/etc/init.d/udp2raw
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/root/etc/uci-defaults/luci-udp2raw $(1)/etc/uci-defaults/luci-udp2raw
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/third-party/luci-app-udp2raw/files/luci/controller/udp2raw.lua
+++ b/third-party/luci-app-udp2raw/files/luci/controller/udp2raw.lua
@@ -0,0 +1,30 @@
+module("luci.controller.udp2raw", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/udp2raw") then
+		return
+	end
+
+	entry({"admin", "services", "udp2raw"},
+		firstchild(), _("udp2raw-tunnel")).dependent = false
+
+	entry({"admin", "services", "udp2raw", "general"},
+		cbi("udp2raw/general"), _("Settings"), 1)
+
+	entry({"admin", "services", "udp2raw", "servers"},
+		arcombine(cbi("udp2raw/servers"), cbi("udp2raw/servers-details")),
+		_("Servers Manage"), 2).leaf = true
+
+	entry({"admin", "services", "udp2raw", "status"}, call("action_status"))
+end
+
+local function is_running(name)
+	return luci.sys.call("pidof %s >/dev/null" %{name}) == 0
+end
+
+function action_status()
+	luci.http.prepare_content("application/json")
+	luci.http.write_json({
+		running = is_running("udp2raw")
+	})
+end
--- a/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.lmo
+++ b/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.lmo
--- a/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.po
+++ b/third-party/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.po
@@ -0,0 +1,120 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8\n"
+
+msgid "udp2raw-tunnel"
+msgstr "udp2raw 隧道"
+
+msgid "Settings"
+msgstr "设置"
+
+msgid "Servers Manage"
+msgstr "服务器管理"
+
+msgid "Running Status"
+msgstr "运行状态"
+
+msgid "Binary Version"
+msgstr "文件版本"
+
+msgid "Build Time"
+msgstr "编译时间"
+
+msgid "Invalid Binary File."
+msgstr "可执行文件无效。"
+
+msgid "RUNNING"
+msgstr "运行中"
+
+msgid "NOT RUNNING"
+msgstr "未运行"
+
+msgid "General Settings"
+msgstr "基本设置"
+
+msgid "Server"
+msgstr "服务器"
+
+msgid "Disable"
+msgstr "停用"
+
+msgid "Run Daemon as User"
+msgstr "以该用户启动"
+
+msgid "Alias"
+msgstr "别名"
+
+msgid "None"
+msgstr "无"
+
+msgid "Server Address"
+msgstr "服务器地址"
+
+msgid "Listen Address"
+msgstr "监听地址"
+
+msgid "Edit Server"
+msgstr "编辑服务器"
+
+msgid "Alias(optional)"
+msgstr "别名(可选)"
+
+msgid "Server Port"
+msgstr "服务器端口"
+
+msgid "Local Listen Host"
+msgstr "本地监听地址"
+
+msgid "Local Listen Port"
+msgstr "本地监听端口"
+
+msgid "Raw Mode"
+msgstr "Raw 方式"
+
+msgid "Password"
+msgstr "密码"
+
+msgid "Cipher Mode"
+msgstr "加密方式"
+
+msgid "Auth Mode"
+msgstr "验证方式"
+
+msgid "Auto Rule"
+msgstr "自动规则"
+
+msgid "Auto add (and delete) iptables rule."
+msgstr "自动添加/删除 iptables 规则。"
+
+msgid "Keep Rule"
+msgstr "保持规则"
+
+msgid "Monitor iptables and auto re-add if necessary."
+msgstr "定期检查 iptables 并在必要时重新添加规则。"
+
+msgid "seq Mode"
+msgstr "seq 模式"
+
+msgid "seq increase mode for faketcp."
+msgstr "用于 faketcp 的 seq 增加方式。"
+
+msgid "Lower Level"
+msgstr ""
+
+msgid "Send packets at OSI level 2, format: \"eth0#00:11:22:33:44:55\", or \"auto\"."
+msgstr "在 OSI 模型第二层发送数据包，格式：\"eth0#00:11:22:33:44:55\"，或 \"auto\"。"
+
+msgid "Source-IP"
+msgstr "源IP"
+
+msgid "Force source-ip for Raw Socket."
+msgstr "在原始数据包中强制指定源IP。"
+
+msgid "Source-Port"
+msgstr "源端口"
+
+msgid "Force source-port for Raw Socket, TCP/UDP only."
+msgstr "在原始数据包中强制指定源端口，仅用于 TCP/UDP。"
+
+msgid "Log Level"
+msgstr "日志级别"
+
--- a/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/general.lua
+++ b/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/general.lua
@@ -0,0 +1,39 @@
+local m, s, o
+local uci = luci.model.uci.cursor()
+local servers = {}
+
+local function has_bin(name)
+	return luci.sys.call("command -v %s >/dev/null" %{name}) == 0
+end
+
+if not has_bin("udp2raw") then
+	return Map("udp2raw", "%s - %s" %{translate("udp2raw-tunnel"),
+		translate("Settings")}, '<b style="color:red">udp2raw-tunnel binary file not found.</b>')
+end
+
+uci:foreach("udp2raw", "servers", function(s)
+	if s.server_addr and s.server_port then
+		servers[#servers+1] = {name = s[".name"], alias = s.alias or "%s:%s" %{s.server_addr, s.server_port}}
+	end
+end)
+
+m = Map("udp2raw", "%s - %s" %{translate("udp2raw-tunnel"), translate("Settings")})
+m:append(Template("udp2raw/status"))
+
+s = m:section(NamedSection, "general", "general", translate("General Settings"))
+s.anonymous = true
+s.addremove = false
+
+o = s:option(DynamicList, "server", translate("Server"))
+o.template = "udp2raw/dynamiclist"
+o:value("nil", translate("Disable"))
+for _, s in ipairs(servers) do o:value(s.name, s.alias) end
+o.default = "nil"
+o.rmempty = false
+
+o = s:option(ListValue, "daemon_user", translate("Run Daemon as User"))
+for u in luci.util.execi("cat /etc/passwd | cut -d ':' -f1") do o:value(u) end
+o.default = "root"
+o.rmempty = false
+
+return m
--- a/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/servers-details.lua
+++ b/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/servers-details.lua
@@ -0,0 +1,96 @@
+local m, s, o
+local sid = arg[1]
+
+local raw_modes = {
+	"faketcp",
+	"udp",
+	"icmp",
+}
+
+local cipher_modes = {
+	"aes128cbc",
+	"xor",
+	"none",
+}
+
+local auth_modes = {
+	"md5",
+	"crc32",
+	"simple",
+	"none",
+}
+
+m = Map("udp2raw", "%s - %s" %{translate("udp2raw-tunnel"), translate("Edit Server")})
+m.redirect = luci.dispatcher.build_url("admin/services/udp2raw/servers")
+m.sid = sid
+
+if m.uci:get("udp2raw", sid) ~= "servers" then
+	luci.http.redirect(m.redirect)
+	return
+end
+
+s = m:section(NamedSection, sid, "servers")
+s.anonymous = true
+s.addremove = false
+
+o = s:option(Value, "alias", translate("Alias(optional)"))
+
+o = s:option(Value, "server_addr", translate("Server"))
+o.datatype = "host"
+o.rmempty = false
+
+o = s:option(Value, "server_port", translate("Server Port"))
+o.datatype = "port"
+o.placeholder = "8080"
+
+o = s:option(Value, "listen_addr", translate("Local Listen Host"))
+o.datatype = "ipaddr"
+o.placeholder = "127.0.0.1"
+
+o = s:option(Value, "listen_port", translate("Local Listen Port"))
+o.datatype = "port"
+o.placeholder = "2080"
+
+o = s:option(ListValue, "raw_mode", translate("Raw Mode"))
+for _, v in ipairs(raw_modes) do o:value(v, v:lower()) end
+o.default = "faketcp"
+o.rmempty = false
+
+o = s:option(Value, "key", translate("Password"))
+o.password = true
+
+o = s:option(ListValue, "cipher_mode", translate("Cipher Mode"))
+for _, v in ipairs(cipher_modes) do o:value(v, v:lower()) end
+o.default = "aes128cbc"
+
+o = s:option(ListValue, "auth_mode", translate("Auth Mode"))
+for _, v in ipairs(auth_modes) do o:value(v, v:lower()) end
+o.default = "md5"
+
+o = s:option(Flag, "auto_rule", translate("Auto Rule"), translate("Auto add (and delete) iptables rule."))
+o.enabled = "1"
+o.disabled = "0"
+o.default = "1"
+
+o = s:option(Flag, "keep_rule", translate("Keep Rule"), translate("Monitor iptables and auto re-add if necessary."))
+o.enabled = "1"
+o.disabled = "0"
+o:depends("auto_rule", "1")
+
+o = s:option(Value, "seq_mode", translate("seq Mode"), translate("seq increase mode for faketcp."))
+o.datatype = "range(0,4)"
+o.placeholder = "3"
+
+o = s:option(Value, "lower_level", translate("Lower Level"), translate("Send packets at OSI level 2, format: \"eth0#00:11:22:33:44:55\", or \"auto\"."))
+
+o = s:option(Value, "source_ip", translate("Source-IP"), translate("Force source-ip for Raw Socket."))
+o.datatype = "ipaddr"
+
+o = s:option(Value, "source_port", translate("Source-Port"), translate("Force source-port for Raw Socket, TCP/UDP only."))
+o.datatype = "port"
+
+o = s:option(Value, "log_level", translate("Log Level"))
+o.datatype = "range(0,6)"
+o.placeholder = "4"
+
+return m
--- a/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/servers.lua
+++ b/third-party/luci-app-udp2raw/files/luci/model/cbi/udp2raw/servers.lua
@@ -0,0 +1,56 @@
+local m, s, o
+
+m = Map("udp2raw", "%s - %s" %{translate("udp2raw-tunnel"), translate("Servers Manage")})
+
+s = m:section(TypedSection, "servers")
+s.anonymous = true
+s.addremove = true
+s.sortable = true
+s.template = "cbi/tblsection"
+s.extedit = luci.dispatcher.build_url("admin/services/udp2raw/servers/%s")
+function s.create(...)
+	local sid = TypedSection.create(...)
+	if sid then
+		luci.http.redirect(s.extedit % sid)
+		return
+	end
+end
+
+o = s:option(DummyValue, "alias", translate("Alias"))
+function o.cfgvalue(...)
+	return Value.cfgvalue(...) or translate("None")
+end
+
+o = s:option(DummyValue, "_server_address", translate("Server Address"))
+function o.cfgvalue(self, section)
+	local server_addr = m.uci:get("udp2raw", section, "server_addr") or "?"
+	local server_port = m.uci:get("udp2raw", section, "server_port") or "8080"
+	return "%s:%s" %{server_addr, server_port}
+end
+
+o = s:option(DummyValue, "_listen_address", translate("Listen Address"))
+function o.cfgvalue(self, section)
+	local listen_addr = m.uci:get("udp2raw", section, "listen_addr") or "127.0.0.1"
+	local listen_port = m.uci:get("udp2raw", section, "listen_port") or "2080"
+	return "%s:%s" %{listen_addr, listen_port}
+end
+
+o = s:option(DummyValue, "raw_mode", translate("Raw Mode"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	return v and v:lower() or "faketcp"
+end
+
+o = s:option(DummyValue, "cipher_mode", translate("Cipher Mode"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	return v and v:lower() or "aes128cbc"
+end
+
+o = s:option(DummyValue, "auth_mode", translate("Auth Mode"))
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	return v and v:lower() or "md5"
+end
+
+return m
--- a/third-party/luci-app-udp2raw/files/luci/view/udp2raw/dynamiclist.htm
+++ b/third-party/luci-app-udp2raw/files/luci/view/udp2raw/dynamiclist.htm
@@ -0,0 +1,98 @@
+<%#
+ Copyright (C) 2017 Jian Chang <aa65535@live.com>
+ Licensed to the public under the GNU General Public License v3.
+-%>
+
+<%+cbi/valueheader%>
+
+<%-
+	local values = self:formvalue(section)
+	if not values then
+		values = self:cfgvalue(section) or {self.default}
+	end
+
+	local function serialize_json(x, cb)
+		local rv, push = nil, cb
+		if not push then
+			rv = { }
+			push = function(tok) rv[#rv+1] = tok end
+		end
+
+		if x == nil then
+			push("null")
+		elseif type(x) == "table" then
+			push("[")
+			for k = 1, #x do
+				if k > 1 then
+					push(",")
+				end
+				serialize_json(x[k], push)
+			end
+			push("]")
+		else
+			push('"%s"' % tostring(x):gsub('["%z\1-\31\\]',
+				function(c) return '\\u%04x' % c:byte(1) end))
+		end
+
+		if not cb then
+			return table.concat(rv, "")
+		end
+	end
+-%>
+
+<div<%=attr("id", cbid .. ".value.field")%>></div>
+<script type="text/javascript">//<![CDATA[
+	(function() {
+		var values = <%=serialize_json(values)%>;
+		var keylist = <%=serialize_json(self.keylist)%>;
+		var vallist = <%=serialize_json(self.vallist)%>;
+		var parent = document.getElementById("<%=cbid%>.value.field");
+
+		var dynamiclist_cbi_init = function() {
+			while (parent.firstChild) {
+				parent.removeChild(parent.firstChild);
+			}
+
+			for (var i = 0; i < values.length; i++) {
+				var sel = document.createElement("select");
+				sel.id = "<%=cbid%>." + (i + 1);
+				sel.name = "<%=cbid%>";
+				sel.index = i;
+				sel.className = "cbi-input-select";
+				sel.onchange = function() {
+					values[this.index] = this.value;
+				};
+				parent.appendChild(sel);
+
+				for (var j = 0; j < keylist.length; j++) {
+					var opt = document.createElement("option");
+					opt.value = keylist[j];
+					if (opt.value == values[i]) {
+						opt.selected = "selected";
+					}
+					opt.appendChild(document.createTextNode(vallist[j]));
+					sel.appendChild(opt);
+				}
+
+				var btn = document.createElement('img');
+				btn.src = "<%=resource%>" + ((i + 1) < values.length ? "/cbi/remove.gif" : "/cbi/add.gif");
+				btn.index = i;
+				btn.className = 'cbi-image-button';
+				btn.onclick = function() {
+					if (this.src.indexOf('remove') > -1) {
+						values.splice(this.index, 1);
+					} else {
+						values.push("<%=self.default%>");
+					}
+					dynamiclist_cbi_init();
+					return false;
+				};
+				parent.appendChild(btn);
+				parent.appendChild(document.createElement('br'));
+			}
+		};
+		dynamiclist_cbi_init();
+	}());
+//]]></script>
+
+<%+cbi/valuefooter%>
--- a/third-party/luci-app-udp2raw/files/luci/view/udp2raw/status.htm
+++ b/third-party/luci-app-udp2raw/files/luci/view/udp2raw/status.htm
@@ -0,0 +1,39 @@
+<%
+local function get_udp2raw_version(name)
+	local info = luci.util.split(luci.sys.exec("%s -h 2>/dev/null" %{name}), "\n")
+	local version = string.match(info[2], "git version:(%w+)")
+	local build = string.match(info[2], "build date:(.+)")
+	return info[1] == "udp2raw-tunnel" and version or "", info[1] == "udp2raw-tunnel" and build or ""
+end
+
+local udp2raw_version, udp2raw_build = get_udp2raw_version("udp2raw")
+-%>
+
+<fieldset class="cbi-section">
+	<legend><%:Running Status%></legend>
+	<table width="100%" cellspacing="10" id="_udp2raw_status_table">
+		<tr>
+			<td width="33%"><%:Binary Version%></td>
+			<td>
+				<% if udp2raw_version == "" then -%>
+				<em><%:Invalid Binary File.%></em>
+				<% else -%>
+				<%=pcdata(udp2raw_version)%>
+				<%- end %>
+			</td>
+		</tr>
+		<% if udp2raw_build ~= "" then -%>
+		<tr><td width="33%"><%:Build Time%></td><td><%=pcdata(udp2raw_build)%></td></tr>
+		<% end -%>
+		<tr><td width="33%"><%:Running Status%></td><td id="_udp2raw_status"><em><%:Collecting data...%></em></td></tr>
+	</table>
+</fieldset>
+
+<script type="text/javascript">//<![CDATA[
+	var udp2raw_status = document.getElementById('_udp2raw_status');
+	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "udp2raw", "status")%>', null, function(x, status) {
+		if ( x && x.status == 200 ) {
+			udp2raw_status.innerHTML = status.running ? '<%:RUNNING%>' : '<%:NOT RUNNING%>';
+		}
+	});
+//]]></script>
--- a/third-party/luci-app-udp2raw/files/root/etc/config/udp2raw
+++ b/third-party/luci-app-udp2raw/files/root/etc/config/udp2raw
@@ -0,0 +1,16 @@
+
+config general 'general'
+	list server 'nil'
+	option daemon_user 'root'
+
+config servers 'default'
+	option server_addr ''
+	option server_port '8080'
+	option listen_addr '127.0.0.1'
+	option listen_port '2080'
+	option raw_mode 'faketcp'
+	option key ''
+	option cipher_mode 'aes128cbc'
+	option auth_mode 'md5'
+	option auto_rule '1'
+
--- a/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw
+++ b/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw
@@ -0,0 +1,116 @@
+#!/bin/sh /etc/rc.common
+
+START=88
+STOP=15
+USE_PROCD=1
+
+NAME=udp2raw
+
+_log() {
+	logger -p "daemon.$1" -t "$NAME" "$2"
+}
+
+has_valid_server() {
+	local server
+	for server in $@; do
+		[ "$(uci_get $NAME $server)" = "servers" ] && return 0
+	done
+	return 1
+}
+
+create_config() {
+	local config_file="$1"
+	echo "# auto-generated config file from /etc/config/udp2raw" > $config_file
+
+	echo "-c" >> $config_file
+	echo "-l ${listen_addr:=127.0.0.1}:${listen_port:=2080}" >> $config_file && _log "info" "listening on: ${listen_addr}:${listen_port}"
+	echo "-r ${server_addr}:${server_port:=8080}" >> $config_file
+
+	[ -n "$raw_mode" ] && echo "--raw-mode ${raw_mode}" >> $config_file && _log "info" "raw-mode: ${raw_mode}"
+	[ -n "$key" ] && echo "--key ${key}" >> $config_file
+	[ -n "$cipher_mode" ] && echo "--cipher-mode ${cipher_mode}" >> $config_file
+	[ -n "$auth_mode" ] && echo "--auth-mode ${auth_mode}" >> $config_file
+
+	[ $auto_rule -eq 1 ] && echo "--auto-rule" >> $config_file
+	[ $auto_rule -eq 1 -a $keep_rule -eq 1 ] && echo "--keep-rule" >> $config_file
+
+	[ -n "$seq_mode" ] && echo "--seq-mode ${seq_mode}" >> $config_file
+	[ -n "$lower_level" ] && echo "--lower-level ${lower_level}" >> $config_file
+	[ -n "$source_ip" ] && echo "--source-ip ${source_ip}" >> $config_file
+	[ -n "$source_port" ] && echo "--source-port ${source_port}" >> $config_file
+
+	[ -n "$log_level" ] && echo "--log-level ${log_level}" >> $config_file
+	echo "--disable-color" >> $config_file
+}
+
+validate_config_section() {
+	uci_validate_section "$NAME" general "$1" \
+		'server:uciname' \
+		'daemon_user:string:root'
+}
+
+validate_server_section() {
+	uci_validate_section "$NAME" servers "$1" \
+		'server_addr:host' \
+		'server_port:port:8080' \
+		'listen_addr:ipaddr:127.0.0.1' \
+		'listen_port:port:2080' \
+		'raw_mode:or("faketcp", "udp", "icmp"):faketcp' \
+		'key:string' \
+		'cipher_mode:or("aes128cbc", "xor", "none"):aes128cbc' \
+		'auth_mode:or("md5", "crc32", "simple", "none"):md5' \
+		'auto_rule:bool:1' \
+		'keep_rule:bool:0' \
+		'seq_mode:range(0,4)' \
+		'lower_level:string' \
+		'source_ip:ipaddr' \
+		'source_port:port' \
+		'log_level:range(0,6)'
+}
+
+start_instance() {
+	local server="$1"
+
+	if [ -z "$server" -o "$server" == "nil" ]; then
+		return 0
+	elif ! validate_server_section "$server"; then
+		_log "err" "Server config validation failed."
+		return 1
+	fi
+
+	/sbin/validate_data "ipaddr" "$server_addr" >/dev/null 2>&1
+	[ $? -ne 0 ] && server_addr=$(nslookup "$server_addr" | \
+		sed -n 's/^Address[[:space:]]*[0-9]*:[[:space:]]*\(\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\)$/\1/p')
+	if [ -z "$server_addr" ]; then
+		_log "err" "Server address validation failed."
+		return 1
+	fi
+
+	[ -d /var/etc ] || mkdir -p /var/etc
+	local config_file="/var/etc/${NAME}.${server}.conf"
+	create_config "$config_file" || return 1
+
+	procd_open_instance
+	procd_set_param command /usr/bin/udp2raw
+	procd_append_param command --conf-file "$config_file"
+	procd_set_param respawn
+	procd_set_param file "$config_file"
+	[ -n "$daemon_user" ] && procd_set_param user "$daemon_user" && _log "info" "running from ${daemon_user} user"
+	procd_set_param pidfile "/var/run/${NAME}.${server}.pid"
+	procd_close_instance
+}
+
+service_triggers() {
+	procd_add_reload_trigger "$NAME"
+}
+
+start_service() {
+	if ! validate_config_section "general" ; then
+		_log "err" "Config validate failed."
+		return 1
+	fi
+	has_valid_server $server || return 1
+	for srv in $server; do
+		start_instance $srv
+	done
+}
--- a/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw.init
+++ b/third-party/luci-app-udp2raw/files/root/etc/init.d/udp2raw.init
@@ -0,0 +1,130 @@
+#!/bin/sh /etc/rc.common
+
+START=88
+STOP=15
+
+NAME=udp2raw
+
+_log() {
+	logger -p "daemon.$1" -t "$NAME" "$2"
+}
+
+has_valid_server() {
+	local server
+	for server in $@; do
+		[ "$(uci_get $NAME $server)" = "servers" ] && return 0
+	done
+	return 1
+}
+
+create_config() {
+	local config_file="$1"
+	echo "# auto-generated config file from /etc/config/udp2raw" > $config_file
+
+	echo "-c" >> $config_file
+	echo "-l ${listen_addr:=127.0.0.1}:${listen_port:=2080}" >> $config_file
+	echo "-r ${server_addr}:${server_port:=8080}" >> $config_file
+
+	[ -n "$raw_mode" ] && echo "--raw-mode ${raw_mode}" >> $config_file
+	[ -n "$key" ] && echo "--key ${key}" >> $config_file
+	[ -n "$cipher_mode" ] && echo "--cipher-mode ${cipher_mode}" >> $config_file
+	[ -n "$auth_mode" ] && echo "--auth-mode ${auth_mode}" >> $config_file
+
+	[ $auto_rule -eq 1 ] && echo "--auto-rule" >> $config_file
+	[ $auto_rule -eq 1 -a $keep_rule -eq 1 ] && echo "--keep-rule" >> $config_file
+
+	[ -n "$seq_mode" ] && echo "--seq-mode ${seq_mode}" >> $config_file
+	[ -n "$lower_level" ] && echo "--lower-level ${lower_level}" >> $config_file
+	[ -n "$source_ip" ] && echo "--source-ip ${source_ip}" >> $config_file
+	[ -n "$source_port" ] && echo "--source-port ${source_port}" >> $config_file
+
+	[ -n "$log_level" ] && echo "--log-level ${log_level}" >> $config_file
+	echo "--disable-color" >> $config_file
+}
+
+validate_config_section() {
+	local ret=$(/sbin/validate_data "$NAME" general "$1" \
+		'server:uciname' \
+		'daemon_user:string:root' \
+		2> /dev/null)
+	[ $? -ne 0 ] && return 1
+	eval "$ret"
+}
+
+validate_server_section() {
+	local ret=$(/sbin/validate_data "$NAME" servers "$1" \
+		'server_addr:host' \
+		'server_port:port:8080' \
+		'listen_addr:ipaddr:127.0.0.1' \
+		'listen_port:port:2080' \
+		'raw_mode:or("faketcp", "udp", "icmp"):faketcp' \
+		'key:string' \
+		'cipher_mode:or("aes128cbc", "xor", "none"):aes128cbc' \
+		'auth_mode:or("md5", "crc32", "simple", "none"):md5' \
+		'auto_rule:bool:1' \
+		'keep_rule:bool:0' \
+		'seq_mode:range(0,4)' \
+		'lower_level:string' \
+		'source_ip:ipaddr' \
+		'source_port:port' \
+		'log_level:range(0,6)' \
+		2> /dev/null)
+	[ $? -ne 0 ] && return 1
+	eval "$ret"
+}
+
+start_instance() {
+	local server="$1"
+
+	if [ -z "$server" -o "$server" == "nil" ]; then
+		return 0
+	elif ! validate_server_section "$server"; then
+		_log "err" "Server config validation failed."
+		return 1
+	fi
+
+	/sbin/validate_data "ipaddr" "$server_addr" >/dev/null 2>&1
+	[ $? -ne 0 ] && server_addr=$(nslookup "$server_addr" | \
+		sed -n 's/^Address[[:space:]]*[0-9]*:[[:space:]]*\(\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\)$/\1/p')
+	if [ -z "$server_addr" ]; then
+		_log "err" "Server address validation failed."
+		return 1
+	fi
+
+	[ -d /var/etc ] || mkdir -p /var/etc
+	local config_file="/var/etc/${NAME}.${server}.conf"
+	create_config "$config_file" || return 1
+	[ -d "/var/log/${NAME}" ] || mkdir -p "/var/log/${NAME}"
+
+	/usr/bin/udp2raw --conf-file "$config_file" >> "/var/log/${NAME}/${NAME}.${server}.log" &
+	echo $! > "/var/run/${NAME}.${server}.pid"
+	return 0
+}
+
+start() {
+	pgrep "/usr/bin/${NAME}" >/dev/null 2>&1 && return
+
+	if ! validate_config_section "general" ; then
+		_log "err" "Config validate failed."
+		return 1
+	fi
+	has_valid_server $server || return 1
+	for srv in $server; do
+		start_instance $srv
+	done
+}
+
+stop() {
+	local pids=$(pgrep "/usr/bin/${NAME}" 2> /dev/null)
+	[ $? -ne 0 ] && return
+	for pid in $pids; do
+		kill $pid >/dev/null 2>&1
+	done
+	return 0
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
--- a/third-party/luci-app-udp2raw/files/root/etc/uci-defaults/luci-udp2raw
+++ b/third-party/luci-app-udp2raw/files/root/etc/uci-defaults/luci-udp2raw
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@udp2raw[-1]
+	add ucitrack udp2raw
+	set ucitrack.@udp2raw[-1].init=udp2raw
+	commit ucitrack
+EOF
+
+general=$(uci -q get udp2raw.@general[-1])
+if [ -z "$general" ]; then
+	uci -q add udp2raw general
+fi
+if [ ."$general" != ."general" ]; then
+	uci -q batch <<-EOF >/dev/null
+		rename udp2raw.@general[-1]="general"
+		set udp2raw.general.server="nil"
+		commit udp2raw
+	EOF
+fi
+
+rm -rf /tmp/luci-indexcache /tmp/luci-modulecache
+exit 0
--- a/third-party/luci-app-udp2raw/luci-app-udp2raw1.jpg
+++ b/third-party/luci-app-udp2raw/luci-app-udp2raw1.jpg
--- a/third-party/luci-app-udp2raw/luci-app-udp2raw2.jpg
+++ b/third-party/luci-app-udp2raw/luci-app-udp2raw2.jpg
--- a/third-party/luci-app-udp2raw/luci-app-udp2raw3.jpg
+++ b/third-party/luci-app-udp2raw/luci-app-udp2raw3.jpg
--- a/third-party/luci-app-udp2raw/tools/po2lmo/Makefile
+++ b/third-party/luci-app-udp2raw/tools/po2lmo/Makefile
@@ -0,0 +1,12 @@
+
+INSTALL = install
+PREFIX  = /usr/bin
+
+po2lmo: src/po2lmo.o src/template_lmo.o
+	$(CC) $(LDFLAGS) -o src/po2lmo src/po2lmo.o src/template_lmo.o
+
+install:
+	$(INSTALL) -m 755 src/po2lmo $(PREFIX)
+
+clean:
+	$(RM) src/po2lmo src/*.o
--- a/third-party/luci-app-udp2raw/tools/po2lmo/src/po2lmo.c
+++ b/third-party/luci-app-udp2raw/tools/po2lmo/src/po2lmo.c
@@ -0,0 +1,247 @@
+/*
+ * lmo - Lua Machine Objects - PO to LMO conversion tool
+ *
+ *   Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "template_lmo.h"
+
+static void die(const char *msg)
+{
+	fprintf(stderr, "Error: %s\n", msg);
+	exit(1);
+}
+
+static void usage(const char *name)
+{
+	fprintf(stderr, "Usage: %s input.po output.lmo\n", name);
+	exit(1);
+}
+
+static void print(const void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+	if( fwrite(ptr, size, nmemb, stream) == 0 )
+		die("Failed to write stdout");
+}
+
+static int extract_string(const char *src, char *dest, int len)
+{
+	int pos = 0;
+	int esc = 0;
+	int off = -1;
+
+	for( pos = 0; (pos < strlen(src)) && (pos < len); pos++ )
+	{
+		if( (off == -1) && (src[pos] == '"') )
+		{
+			off = pos + 1;
+		}
+		else if( off >= 0 )
+		{
+			if( esc == 1 )
+			{
+				switch (src[pos])
+				{
+				case '"':
+				case '\\':
+					off++;
+					break;
+				}
+				dest[pos-off] = src[pos];
+				esc = 0;
+			}
+			else if( src[pos] == '\\' )
+			{
+				dest[pos-off] = src[pos];
+				esc = 1;
+			}
+			else if( src[pos] != '"' )
+			{
+				dest[pos-off] = src[pos];
+			}
+			else
+			{
+				dest[pos-off] = '\0';
+				break;
+			}
+		}
+	}
+
+	return (off > -1) ? strlen(dest) : -1;
+}
+
+static int cmp_index(const void *a, const void *b)
+{
+	uint32_t x = ((const lmo_entry_t *)a)->key_id;
+	uint32_t y = ((const lmo_entry_t *)b)->key_id;
+
+	if (x < y)
+		return -1;
+	else if (x > y)
+		return 1;
+
+	return 0;
+}
+
+static void print_uint32(uint32_t x, FILE *out)
+{
+	uint32_t y = htonl(x);
+	print(&y, sizeof(uint32_t), 1, out);
+}
+
+static void print_index(void *array, int n, FILE *out)
+{
+	lmo_entry_t *e;
+
+	qsort(array, n, sizeof(*e), cmp_index);
+
+	for (e = array; n > 0; n--, e++)
+	{
+		print_uint32(e->key_id, out);
+		print_uint32(e->val_id, out);
+		print_uint32(e->offset, out);
+		print_uint32(e->length, out);
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	char line[4096];
+	char key[4096];
+	char val[4096];
+	char tmp[4096];
+	int state  = 0;
+	int offset = 0;
+	int length = 0;
+	int n_entries = 0;
+	void *array = NULL;
+	lmo_entry_t *entry = NULL;
+	uint32_t key_id, val_id;
+
+	FILE *in;
+	FILE *out;
+
+	if( (argc != 3) || ((in = fopen(argv[1], "r")) == NULL) || ((out = fopen(argv[2], "w")) == NULL) )
+		usage(argv[0]);
+
+	memset(line, 0, sizeof(key));
+	memset(key, 0, sizeof(val));
+	memset(val, 0, sizeof(val));
+
+	while( (NULL != fgets(line, sizeof(line), in)) || (state >= 2 && feof(in)) )
+	{
+		if( state == 0 && strstr(line, "msgid \"") == line )
+		{
+			switch(extract_string(line, key, sizeof(key)))
+			{
+				case -1:
+					die("Syntax error in msgid");
+				case 0:
+					state = 1;
+					break;
+				default:
+					state = 2;
+			}
+		}
+		else if( state == 1 || state == 2 )
+		{
+			if( strstr(line, "msgstr \"") == line || state == 2 )
+			{
+				switch(extract_string(line, val, sizeof(val)))
+				{
+					case -1:
+						state = 4;
+						break;
+					default:
+						state = 3;
+				}
+			}
+			else
+			{
+				switch(extract_string(line, tmp, sizeof(tmp)))
+				{
+					case -1:
+						state = 2;
+						break;
+					default:
+						strcat(key, tmp);
+				}
+			}
+		}
+		else if( state == 3 )
+		{
+			switch(extract_string(line, tmp, sizeof(tmp)))
+			{
+				case -1:
+					state = 4;
+					break;
+				default:
+					strcat(val, tmp);
+			}
+		}
+
+		if( state == 4 )
+		{
+			if( strlen(key) > 0 && strlen(val) > 0 )
+			{
+				key_id = sfh_hash(key, strlen(key));
+				val_id = sfh_hash(val, strlen(val));
+
+				if( key_id != val_id )
+				{
+					n_entries++;
+					array = realloc(array, n_entries * sizeof(lmo_entry_t));
+					entry = (lmo_entry_t *)array + n_entries - 1;
+
+					if (!array)
+						die("Out of memory");
+
+					entry->key_id = key_id;
+					entry->val_id = val_id;
+					entry->offset = offset;
+					entry->length = strlen(val);
+
+					length = strlen(val) + ((4 - (strlen(val) % 4)) % 4);
+
+					print(val, length, 1, out);
+					offset += length;
+				}
+			}
+
+			state = 0;
+			memset(key, 0, sizeof(key));
+			memset(val, 0, sizeof(val));
+		}
+
+		memset(line, 0, sizeof(line));
+	}
+
+	print_index(array, n_entries, out);
+
+	if( offset > 0 )
+	{
+		print_uint32(offset, out);
+		fsync(fileno(out));
+		fclose(out);
+	}
+	else
+	{
+		fclose(out);
+		unlink(argv[2]);
+	}
+
+	fclose(in);
+	return(0);
+}
--- a/third-party/luci-app-udp2raw/tools/po2lmo/src/template_lmo.c
+++ b/third-party/luci-app-udp2raw/tools/po2lmo/src/template_lmo.c
@@ -0,0 +1,328 @@
+/*
+ * lmo - Lua Machine Objects - Base functions
+ *
+ *   Copyright (C) 2009-2010 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "template_lmo.h"
+
+/*
+ * Hash function from http://www.azillionmonkeys.com/qed/hash.html
+ * Copyright (C) 2004-2008 by Paul Hsieh
+ */
+
+uint32_t sfh_hash(const char *data, int len)
+{
+	uint32_t hash = len, tmp;
+	int rem;
+
+	if (len <= 0 || data == NULL) return 0;
+
+	rem = len & 3;
+	len >>= 2;
+
+	/* Main loop */
+	for (;len > 0; len--) {
+		hash  += sfh_get16(data);
+		tmp    = (sfh_get16(data+2) << 11) ^ hash;
+		hash   = (hash << 16) ^ tmp;
+		data  += 2*sizeof(uint16_t);
+		hash  += hash >> 11;
+	}
+
+	/* Handle end cases */
+	switch (rem) {
+		case 3: hash += sfh_get16(data);
+			hash ^= hash << 16;
+			hash ^= data[sizeof(uint16_t)] << 18;
+			hash += hash >> 11;
+			break;
+		case 2: hash += sfh_get16(data);
+			hash ^= hash << 11;
+			hash += hash >> 17;
+			break;
+		case 1: hash += *data;
+			hash ^= hash << 10;
+			hash += hash >> 1;
+	}
+
+	/* Force "avalanching" of final 127 bits */
+	hash ^= hash << 3;
+	hash += hash >> 5;
+	hash ^= hash << 4;
+	hash += hash >> 17;
+	hash ^= hash << 25;
+	hash += hash >> 6;
+
+	return hash;
+}
+
+uint32_t lmo_canon_hash(const char *str, int len)
+{
+	char res[4096];
+	char *ptr, prev;
+	int off;
+
+	if (!str || len >= sizeof(res))
+		return 0;
+
+	for (prev = ' ', ptr = res, off = 0; off < len; prev = *str, off++, str++)
+	{
+		if (isspace(*str))
+		{
+			if (!isspace(prev))
+				*ptr++ = ' ';
+		}
+		else
+		{
+			*ptr++ = *str;
+		}
+	}
+
+	if ((ptr > res) && isspace(*(ptr-1)))
+		ptr--;
+
+	return sfh_hash(res, ptr - res);
+}
+
+lmo_archive_t * lmo_open(const char *file)
+{
+	int in = -1;
+	uint32_t idx_offset = 0;
+	struct stat s;
+
+	lmo_archive_t *ar = NULL;
+
+	if (stat(file, &s) == -1)
+		goto err;
+
+	if ((in = open(file, O_RDONLY)) == -1)
+		goto err;
+
+	if ((ar = (lmo_archive_t *)malloc(sizeof(*ar))) != NULL)
+	{
+		memset(ar, 0, sizeof(*ar));
+
+		ar->fd     = in;
+		ar->size = s.st_size;
+
+		fcntl(ar->fd, F_SETFD, fcntl(ar->fd, F_GETFD) | FD_CLOEXEC);
+
+		if ((ar->mmap = mmap(NULL, ar->size, PROT_READ, MAP_SHARED, ar->fd, 0)) == MAP_FAILED)
+			goto err;
+
+		idx_offset = ntohl(*((const uint32_t *)
+		                     (ar->mmap + ar->size - sizeof(uint32_t))));
+
+		if (idx_offset >= ar->size)
+			goto err;
+
+		ar->index  = (lmo_entry_t *)(ar->mmap + idx_offset);
+		ar->length = (ar->size - idx_offset - sizeof(uint32_t)) / sizeof(lmo_entry_t);
+		ar->end    = ar->mmap + ar->size;
+
+		return ar;
+	}
+
+err:
+	if (in > -1)
+		close(in);
+
+	if (ar != NULL)
+	{
+		if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED))
+			munmap(ar->mmap, ar->size);
+
+		free(ar);
+	}
+
+	return NULL;
+}
+
+void lmo_close(lmo_archive_t *ar)
+{
+	if (ar != NULL)
+	{
+		if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED))
+			munmap(ar->mmap, ar->size);
+
+		close(ar->fd);
+		free(ar);
+
+		ar = NULL;
+	}
+}
+
+
+lmo_catalog_t *_lmo_catalogs = NULL;
+lmo_catalog_t *_lmo_active_catalog = NULL;
+
+int lmo_load_catalog(const char *lang, const char *dir)
+{
+	DIR *dh = NULL;
+	char pattern[16];
+	char path[PATH_MAX];
+	struct dirent *de = NULL;
+
+	lmo_archive_t *ar = NULL;
+	lmo_catalog_t *cat = NULL;
+
+	if (!lmo_change_catalog(lang))
+		return 0;
+
+	if (!dir || !(dh = opendir(dir)))
+		goto err;
+
+	if (!(cat = malloc(sizeof(*cat))))
+		goto err;
+
+	memset(cat, 0, sizeof(*cat));
+
+	snprintf(cat->lang, sizeof(cat->lang), "%s", lang);
+	snprintf(pattern, sizeof(pattern), "*.%s.lmo", lang);
+
+	while ((de = readdir(dh)) != NULL)
+	{
+		if (!fnmatch(pattern, de->d_name, 0))
+		{
+			snprintf(path, sizeof(path), "%s/%s", dir, de->d_name);
+			ar = lmo_open(path);
+
+			if (ar)
+			{
+				ar->next = cat->archives;
+				cat->archives = ar;
+			}
+		}
+	}
+
+	closedir(dh);
+
+	cat->next = _lmo_catalogs;
+	_lmo_catalogs = cat;
+
+	if (!_lmo_active_catalog)
+		_lmo_active_catalog = cat;
+
+	return 0;
+
+err:
+	if (dh) closedir(dh);
+	if (cat) free(cat);
+
+	return -1;
+}
+
+int lmo_change_catalog(const char *lang)
+{
+	lmo_catalog_t *cat;
+
+	for (cat = _lmo_catalogs; cat; cat = cat->next)
+	{
+		if (!strncmp(cat->lang, lang, sizeof(cat->lang)))
+		{
+			_lmo_active_catalog = cat;
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+static lmo_entry_t * lmo_find_entry(lmo_archive_t *ar, uint32_t hash)
+{
+	unsigned int m, l, r;
+	uint32_t k;
+
+	l = 0;
+	r = ar->length - 1;
+
+	while (1)
+	{
+		m = l + ((r - l) / 2);
+
+		if (r < l)
+			break;
+
+		k = ntohl(ar->index[m].key_id);
+
+		if (k == hash)
+			return &ar->index[m];
+
+		if (k > hash)
+		{
+			if (!m)
+				break;
+
+			r = m - 1;
+		}
+		else
+		{
+			l = m + 1;
+		}
+	}
+
+	return NULL;
+}
+
+int lmo_translate(const char *key, int keylen, char **out, int *outlen)
+{
+	uint32_t hash;
+	lmo_entry_t *e;
+	lmo_archive_t *ar;
+
+	if (!key || !_lmo_active_catalog)
+		return -2;
+
+	hash = lmo_canon_hash(key, keylen);
+
+	for (ar = _lmo_active_catalog->archives; ar; ar = ar->next)
+	{
+		if ((e = lmo_find_entry(ar, hash)) != NULL)
+		{
+			*out = ar->mmap + ntohl(e->offset);
+			*outlen = ntohl(e->length);
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+void lmo_close_catalog(const char *lang)
+{
+	lmo_archive_t *ar, *next;
+	lmo_catalog_t *cat, *prev;
+
+	for (prev = NULL, cat = _lmo_catalogs; cat; prev = cat, cat = cat->next)
+	{
+		if (!strncmp(cat->lang, lang, sizeof(cat->lang)))
+		{
+			if (prev)
+				prev->next = cat->next;
+			else
+				_lmo_catalogs = cat->next;
+
+			for (ar = cat->archives; ar; ar = next)
+			{
+				next = ar->next;
+				lmo_close(ar);
+			}
+
+			free(cat);
+			break;
+		}
+	}
+}
--- a/third-party/luci-app-udp2raw/tools/po2lmo/src/template_lmo.h
+++ b/third-party/luci-app-udp2raw/tools/po2lmo/src/template_lmo.h
@@ -0,0 +1,92 @@
+/*
+ * lmo - Lua Machine Objects - General header
+ *
+ *   Copyright (C) 2009-2012 Jo-Philipp Wich <xm@subsignal.org>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#ifndef _TEMPLATE_LMO_H_
+#define _TEMPLATE_LMO_H_
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fnmatch.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <limits.h>
+
+#if (defined(__GNUC__) && defined(__i386__))
+#define sfh_get16(d) (*((const uint16_t *) (d)))
+#else
+#define sfh_get16(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
+					   +(uint32_t)(((const uint8_t *)(d))[0]) )
+#endif
+
+
+struct lmo_entry {
+	uint32_t key_id;
+	uint32_t val_id;
+	uint32_t offset;
+	uint32_t length;
+} __attribute__((packed));
+
+typedef struct lmo_entry lmo_entry_t;
+
+
+struct lmo_archive {
+	int         fd;
+	int	        length;
+	uint32_t    size;
+	lmo_entry_t *index;
+	char        *mmap;
+	char		*end;
+	struct lmo_archive *next;
+};
+
+typedef struct lmo_archive lmo_archive_t;
+
+
+struct lmo_catalog {
+	char lang[6];
+	struct lmo_archive *archives;
+	struct lmo_catalog *next;
+};
+
+typedef struct lmo_catalog lmo_catalog_t;
+
+
+uint32_t sfh_hash(const char *data, int len);
+uint32_t lmo_canon_hash(const char *data, int len);
+
+lmo_archive_t * lmo_open(const char *file);
+void lmo_close(lmo_archive_t *ar);
+
+
+extern lmo_catalog_t *_lmo_catalogs;
+extern lmo_catalog_t *_lmo_active_catalog;
+
+int lmo_load_catalog(const char *lang, const char *dir);
+int lmo_change_catalog(const char *lang);
+int lmo_translate(const char *key, int keylen, char **out, int *outlen);
+void lmo_close_catalog(const char *lang);
+
+#endif
--- a/third-party/udp2raw-cmake-makefile/CMakeLists.txt
+++ b/third-party/udp2raw-cmake-makefile/CMakeLists.txt
--- a/third-party/udp2raw-openwrt-makefile/LICENSE
+++ b/third-party/udp2raw-openwrt-makefile/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Yu Wang (wangyucn at gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/third-party/udp2raw-openwrt-makefile/Makefile
+++ b/third-party/udp2raw-openwrt-makefile/Makefile
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2017 Yu Wang <wangyucn@gmail.com>
+#
+# This is free software, licensed under the MIT.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=udp2raw-tunnel
+PKG_VERSION:=20171125.0
+PKG_RELEASE:=2
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/wangyu-/udp2raw-tunnel.git
+PKG_SOURCE_VERSION:=19b4d456365ea5d44e2fa6e7447e59061f14ef51
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Yu Wang
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/udp2raw-tunnel
+	SECTION:=net
+	CATEGORY:=Network
+	TITLE:=Tunnel which turns UDP Traffic into Encrypted FakeTCP/UDP/ICMP Traffic
+	URL:=https://github.com/wangyu-/udp2raw-tunnel
+endef
+
+define Package/udp2raw-tunnel/description
+	udp2raw-tunnel is a tunnel which turns UDP Traffic into Encrypted FakeTCP/UDP/ICMP Traffic by using Raw Socket.
+endef
+
+MAKE_FLAGS += cross2
+
+define Build/Configure
+	$(call Build/Configure/Default)
+	$(SED) 's/cc_cross[[:space:]]*=.*/cc_cross=$(TARGET_CXX)/' \
+		-e 's/\\".*shell git rev-parse HEAD.*\\"/\\"$(PKG_SOURCE_VERSION)\\"/' \
+		$(PKG_BUILD_DIR)/makefile
+endef
+
+define Package/udp2raw-tunnel/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/udp2raw_cross $(1)/usr/bin/udp2raw
+endef
+
+$(eval $(call BuildPackage,udp2raw-tunnel))
Author	SHA1	Message	Date
wangyu-	31f2015ab7	remove unused files	2018-01-11 17:49:16 -06:00
wangyu-	b0613e5b9b	update 3rd party	2018-01-11 17:38:01 -06:00
wangyu-	7fe8321082	add -w options to every iptables command	2018-01-11 17:26:30 -06:00
wangyu-	2da0de34a2	moved cmake makefile to 3rd-party folder	2018-01-04 01:27:52 -06:00
wangyu-	29708ba43e	added target for linux perf	2018-01-04 01:22:29 -06:00
wangyu-	1e9404e6ec	add luci-app-udp2raw and udp2raw-openwrt-makefile	2017-12-29 05:41:04 -06:00
wangyu-	19b4d45636	Update README.md	2017-12-15 05:01:14 -06:00
wangyu-	c03177b370	changed log for root check	2017-12-14 22:39:38 -06:00
wangyu-	c217854190	Update README.md	2017-12-14 11:26:48 -06:00
wangyu-	dc6fc48941	Update docs	2017-12-04 01:37:43 -06:00
wangyu-	b35edf7486	fixed get_current_time()	2017-11-24 11:05:13 -06:00
wangyu-	3bc07d5c86	more log for epoll_wait	2017-11-23 09:56:20 -06:00
wangyu-	f081ab751d	do not quit after got EINTR	2017-11-23 09:35:33 -06:00
wangyu-	91097eab5d	Create ISSUE_TEMPLATE.md	2017-11-22 18:50:33 -06:00
wangyu-	c22b5e9680	Add files via upload	2017-11-21 14:46:14 -06:00
wangyu-	9162a533d3	changed -h page	2017-11-21 14:46:13 -06:00
wangyu-	b01b087949	Update README.zh-cn.md	2017-11-21 14:46:13 -06:00
wangyu-	51b45c8f39	new option mtu-warn	2017-11-21 14:46:13 -06:00
wangyu-	995ea8c98d	Update README.zh-cn.md	2017-11-21 14:46:13 -06:00
wangyu-	aec81eb0c9	Add files via upload	2017-11-21 14:46:13 -06:00
wangyu-	8b59b4afb9	Delete udp2rawopenvpn.PNG	2017-11-21 14:46:13 -06:00
wangyu-	c33bb552cd	Update README.zh-cn.md	2017-11-21 14:46:13 -06:00
wangyu-	9516cfe99d	increased conv_timeout to 180s	2017-11-21 14:46:13 -06:00
wangyu-	5b1e59cae2	trival	2017-11-21 14:46:13 -06:00
wangyu-	211d7ea4d3	help page	2017-11-21 14:46:12 -06:00
wangyu-	7599d99fcc	new option hb-len	2017-11-21 14:46:12 -06:00
wangyu-	706cb0b583	Update README.md	2017-11-21 14:46:12 -06:00
wangyu-	43ae798e77	improve heartbeat	2017-11-21 14:46:12 -06:00
wangyu-	2f12d55229	tuned parameter	2017-11-21 14:46:12 -06:00
wangyu-	0a4555dd42	Update README.md	2017-11-21 14:46:12 -06:00
wangyu-	14ece87bc3	tune parameter	2017-11-21 14:46:12 -06:00
wangyu-	50f682daf4	new option hb-mode	2017-11-21 14:46:12 -06:00
wangyu-	d487ca57f7	changed parameter	2017-11-21 14:46:12 -06:00
wangyu-	482e658858	increase heart beat length	2017-11-21 14:46:12 -06:00
wangyu-	069a9ba2b4	added version.txt into makefile	2017-11-21 14:46:12 -06:00
wangyu-	c591902be1	added missing files	2017-11-21 14:46:12 -06:00
wangyu-	6a825dc51e	Update README.zh-cn.md	2017-11-21 14:46:12 -06:00
wangyu-	1bdb6a5720	fixed bug of last few commit, and fixed a bug of bind error	2017-11-21 14:46:11 -06:00
wangyu-	1afe8d7317	more fix	2017-11-21 14:46:11 -06:00
wangyu-	a54a0e269b	fix timer of fd64	2017-11-21 14:46:11 -06:00
wangyu-	e8398d0d31	fixed some bug of last commit	2017-11-21 14:46:11 -06:00
wangyu-	dc43cb740b	added an assert	2017-11-21 14:46:11 -06:00
wangyu-	2e6be9e159	Update README.md	2017-11-21 14:46:11 -06:00