fix: process unhandle tcp mux header

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
Merge branch 'master' of https://github.com/liudf0716/xfrpc
2022-05-31 17:21:08 +08:00 · 2022-05-28 11:25:39 +08:00 · 2022-05-28 11:09:56 +08:00 · 2022-05-27 08:55:26 +08:00 · 2022-05-27 08:37:05 +08:00 · 2022-05-26 21:11:52 +08:00
55 changed files with 3391 additions and 1536 deletions
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -0,0 +1,31 @@
+name: compile xfrpc in ubuntu-latest 
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+    
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: install other depend lib
+      run: |
+          sudo apt-get update -y
+          sudo apt-get install -y libjson-c-dev
+          sudo apt-get install -y libevent-dev
+          
+    - name: compile xfrpc
+      run: |
+        mkdir build
+        cd build
+        cmake ..
+        make
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ CMakeFiles/
 CMakeCache.txt
 Makefile
 cmake_install.cmake
+install_manifest.txt

 # bin generated
 xfrpc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,26 @@ cmake_minimum_required(VERSION 2.6)

 project(xfrp C)

+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+
+find_package(LibEvent)
+if(NOT LibEvent_FOUND)
+  message(FATAL_ERROR "libevent2 not found!")
+endif(NOT LibEvent_FOUND)
+
+find_package(OpenSSL)
+if(NOT OPENSSL_FOUND)
+  message(FATAL_ERROR "OpenSSL not found!")
+endif(NOT OPENSSL_FOUND)
+
+find_package(JSON-C REQUIRED)
+include_directories(${JSON-C_INCLUDE_DIR})
+
 set(src_xfrpc
 	main.c
  	client.c
  	config.c
  	control.c
-	frame.c
  	ini.c
  	msg.c
 	xfrpc.c
@@ -17,12 +31,12 @@ set(src_xfrpc
 	crypto.c
 	fastpbkdf2.c
 	utils.c
-	session.c
 	common.c
 	login.c
 	proxy_tcp.c
 	proxy_ftp.c
 	proxy.c
+	tcpmux.c
 	)
 	
 set(libs
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 Contributing
 ================================================================================

-If you want to contribute to [xfrp](https://github.com/kuntengrom/xfrp), please follow these simple rules:
+If you want to contribute to [xfrpc](https://github.com/liudf0716/xfrpc), please follow these simple rules:

 1. Press the fork button:

--- a/README.md
+++ b/README.md
@@ -1,73 +1,166 @@
-![xfrp](https://github.com/KunTengRom/xfrp/blob/master/logo.png)
+![xfrpc](https://github.com/liudf0716/xfrpc/blob/master/logo.png)

-[![Build Status][1]][2]
-[![license][3]][4]
-[![Supported][7]][8]
-[![PRs Welcome][5]][6]
-[![Issue Welcome][9]][10]
-[![OpenWRT][11]][12]
-[![KunTeng][13]][14]

-[1]: https://img.shields.io/travis/KunTengRom/xfrp.svg?style=plastic
-[2]: https://travis-ci.org/KunTengRom/xfrp
-[3]: https://img.shields.io/badge/license-GPLV3-brightgreen.svg?style=plastic
-[4]: https://github.com/KunTengRom/xfrp/blob/master/LICENSE
-[5]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=plastic
-[6]: https://github.com/KunTengRom/xfrp/pulls
-[7]: https://img.shields.io/badge/XFRPS-Supported-blue.svg?style=plastic
-[8]: https://github.com/KunTengRom/xfrps
-[9]: https://img.shields.io/badge/Issues-welcome-brightgreen.svg?style=plastic
-[10]: https://github.com/KunTengRom/xfrp/issues/new
-[11]: https://img.shields.io/badge/Platform-%20OpenWRT%20%7CLEDE%20-brightgreen.svg?style=plastic
-[12]: https://github.com/KunTengRom/LEDE
-[13]: https://img.shields.io/badge/KunTeng-Inside-blue.svg?style=plastic
-[14]: http://rom.kunteng.org
+## What is xfrpc 

-## What is xfrp and why start xfrp
+`xfrpc` is [frp](https://github.com/fatedier/frp) client implemented by c language for [OpenWRT](https://github.com/openwrt/openwrt)
+The motivation to start xfrpc project is that we are OpenWRTer, and openwrt usually run in devices which have limit ROM and RAM space, however frpc always need more space and memory; therefore we launched xfrpc project.

-xfrp was [xfrps](https://github.com/KunTengRom/xfrp) client implemented by c for OpenWRT system
+## Development Status

-The motivation to start xfrp project is that we are OpenWRTer, and openwrt usually ran in device which has little ROM and RAM space, however golang always need more space and memory; therefore we start xfrp project
+xfrpc partially compitable with latest frp release feature, It targets to fully compatible with latest frp release.
+
+the following table is detail  compatible feature:
+
+| Feature  | xfrpc | frpc |
+| ------------- | ------------- | ---------|
+| tcp  | Yes |	 Yes  |
+| tcpmux  | Yes |	 Yes  |
+| http  | Yes |	 Yes  |
+| https  | Yes |  Yes  |
+| udp  | No |  Yes  |
+| p2p  | No |  Yes  |
+| xtcp  | No |  Yes  |
+| vistor  | No |  Yes  |
+
+
+
+## Architecture
+
+![Architecture](https://github.com/fatedier/frp/blob/dev/doc/pic/architecture.png?raw=true)
+
+Architecture quote from [frp](https://github.com/fatedier/frp) project, replace frpc with xfrpc.
+
+## Sequence Diagram
+
+```mermaid
+sequenceDiagram
+	title:	xfrpc与frps通信交互时序图
+	participant 本地服务
+	participant xfrpc
+  participant frps
+  participant 远程访问用户
+  
+  xfrpc ->> frps  : TypeLogin Message
+  frps ->> xfrpc  : TypeLoginResp Message
+  Note right of frps  : 根据Login信息里面的pool值，决定给xfrpc发送几条TypeReqWorkConn请求信息
+  frps ->> xfrpc  : frps aes-128-cfb iv[16] data
+  frps -->> xfrpc : TypeReqWorkConn Message
+	loop 根据Login中的PoolCount创建工作连接数
+  	xfrpc -->> frps  : TypeNewWorkConn Message
+  	Note left of xfrpc  : 与服务器创建代理服务工作连接，并请求新的工作连接请求
+  	Note right of frps  : 处理xfrpc端发送的TypeNewWorkConn消息，注册该工作连接到连接池中
+  	frps ->> xfrpc  : TypeStartWorkConn Message
+  	Note left of xfrpc  : 将新创建的工作连接与代理的本地服务连接做绑定
+	end
+  xfrpc ->> frps  : xfrpc aes-128-cfb iv[16] data
+  loop 用户配置的代理服务数
+  	xfrpc -->> frps : TypeNewProxy Message
+  	frps -->> xfrpc : NewProxyResp Message
+  end
+	
+  loop 心跳包检查
+    xfrpc -->> frps : TypePing Message
+    frps -->> xfrpc : TypePong Message
+  end
+  
+  远程访问用户 ->> frps   : 发起访问
+  frps ->> xfrpc	 : TypeStartWorkconn Message
+  loop  远程访问用户与本地服务之间的交互过程
+    frps ->> xfrpc         : 用户数据
+    xfrpc ->> 本地服务      : 用户数据
+    本地服务 ->> xfrpc      : 本地服务数据
+    xfrpc ->> frps         : 本地服务数据
+    frps  ->> 远程访问用户  : 本地服务数据
+  end
+  
+```

 ## Compile

 xfrp need [libevent](https://github.com/libevent/libevent) [openssl-dev](https://github.com/openssl/openssl) and [json-c](https://github.com/json-c/json-c) support

-Before compile xfrp, please install `libevent` `openssl-dev` and `json-c` in your system.
+Before compile xfrp, please install `libevent` and `json-c` in your system.
+
+Install json-c libevent in ubuntu 20.04 LTS

 ```shell
-git clone https://github.com/KunTengRom/xfrp.git
+sudo apt-get install -y libjson-c-dev
+sudo apt-get install -y libevent-dev
+```
+
+```shell
+git clone https://github.com/liudf0716/xfrpc.git
 cd xfrp
-cmake .
+mkdir build
+cmake ..
 make
 ```

 ## Quick start

+**before using xfrpc, you should get frps server: [frps](https://github.com/fatedier/frp/releases)**

-Run in debug mode :
+ frps 
+
+frps use latest release 0.42.0
+
+```
+# frps.ini
+[common]
+bind_port = 7000
+```
+
+run frps
+
+```
+./frps -c frps.ini
+```
+
+ xfrpc tcp
+
+```
+#xfrpc_mini.ini 
+[common]
+server_addr = your_server_ip
+server_port = 7000
+
+[ssh]
+type = tcp
+local_ip = 127.0.0.1
+local_port = 22
+remote_port = 6128
+```
+
+ xfrpc http
+
+```
+# xfrpc_mini.ini 
+[common]
+server_addr = x.x.x.x
+server_port = 7000
+
+[web]
+type = http
+local_port = 80
+custom_domains = www.example.com
+```
+
+ Run in debug mode 

 ```shell
 xfrpc -c frpc_mini.ini -f -d 7 
 ```

-Run in release mode :
+ Run in release mode :

 ```shell
 xfrpc -c frpc_mini.ini -d 0
 ```

----
-
-## Todo list
-
- support compression
- support encrypt
-
-
 ## How to contribute our project

-See [CONTRIBUTING](https://github.com/KunTengRom/xfrp/blob/master/CONTRIBUTING.md) for details on submitting patches and the contribution workflow.
+See [CONTRIBUTING](https://github.com/liudf0716/xfrpc/blob/master/CONTRIBUTING.md) for details on submitting patches and the contribution workflow.

 ## Contact

@@ -75,3 +168,24 @@ QQ群 ： [331230369](https://jq.qq.com/?_wv=1027&k=47QGEhL)


 ## Please support us and star our project
+
+[![Star History Chart](https://api.star-history.com/svg?repos=liudf0716/xfrpc&type=Date)](https://star-history.com/#liudf0716/xfrpc&Date)
+
+## 打赏
+
+支付宝打赏
+
+![支付宝打赏](https://user-images.githubusercontent.com/1182593/169465135-d4522479-4068-4714-ab58-987d7d7eb338.png)
+
+
+微信打赏
+
+
+![微信打赏](https://user-images.githubusercontent.com/1182593/169465249-db1b495e-078e-4cab-91fc-96dab3320b06.png)
+
+
+## 广告
+
+想学习OpenWrt开发，但是摸不着门道？自学没毅力？基础太差？怕太难学不会？跟着佐大学OpenWrt开发入门培训班助你能学有所成
+
+报名地址：https://forgotfun.org/2018/04/openwrt-training-2018.html
--- a/agent.c
+++ b/agent.c
@@ -1,25 +0,0 @@
-/* vim: set et ts=4 sts=4 sw=4 : */
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
- * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-/** @file agent.c
-    @brief agent for router to communicate with frp server
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
-*/
--- a/bin/frpc.ini
+++ b/bin/frpc.ini
@@ -1,10 +0,0 @@
-[common]
-server_addr = 127.0.0.1
-server_port = 7001
-tcp_mux = false
-
-[G_22]
-type = tcp
-local_port = 22
-remote_port = 20099
-
--- a/client.c
+++ b/client.c
@@ -21,7 +21,7 @@

 /** @file client.c
    @brief client surrogate for local service
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #include <string.h>
@@ -29,20 +29,12 @@
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <errno.h>
-
 #include <syslog.h>
-
 #include <zlib.h>

-#include <event2/bufferevent.h>
-#include <event2/buffer.h>
-#include <event2/listener.h>
-#include <event2/util.h>
-#include <event2/event.h>

 #include "debug.h"
 #include "client.h"
@@ -54,98 +46,44 @@
 #include "zip.h"
 #include "common.h"
 #include "proxy.h"
+#include "utils.h"
+#include "tcpmux.h"

-#define MAX_OUTPUT (512*1024)
-
-static void drained_writecb(struct bufferevent *bev, void *ctx);
-static void xfrp_event_cb(struct bufferevent *bev, short what, void *ctx);
+static struct proxy_client 	*all_pc = NULL;

 static void
-xfrp_read_cb(struct bufferevent *bev, void *ctx)
+xfrp_worker_event_cb(struct bufferevent *bev, short what, void *ctx)
 {
-	struct proxy *p = (struct proxy *)ctx;
-	struct bufferevent *partner = p?p->bev:NULL;
-	struct evbuffer *src, *dst;
-	size_t len;
-	src = bufferevent_get_input(bev);
-	len = evbuffer_get_length(src);
-	if (!partner) {
-		evbuffer_drain(src, len);
-		return;
-	}
-	dst = bufferevent_get_output(partner);
-	evbuffer_add_buffer(dst, src);
-	struct proxy *p_l = new_proxy_buf(bev);
-
-	if (evbuffer_get_length(dst) >= MAX_OUTPUT) {
-		/* We're giving the other side data faster than it can
-		 * pass it on.  Stop reading here until we have drained the
-		 * other side to MAX_OUTPUT/2 bytes. */
-		bufferevent_setcb(partner, xfrp_read_cb, drained_writecb,
-		    xfrp_event_cb, p_l);
-		bufferevent_setwatermark(partner, EV_WRITE, MAX_OUTPUT/2,
-		    MAX_OUTPUT);
-		bufferevent_disable(bev, EV_READ);
-	}
-}
-
-static void
-drained_writecb(struct bufferevent *bev, void *ctx)
-{
-	struct proxy *p = (struct proxy *)ctx;
-	struct bufferevent *partner = p?p->bev:NULL;
-
-	/* We were choking the other side until we drained our outbuf a bit.
-	 * Now it seems drained. */
-	bufferevent_setcb(bev, xfrp_read_cb, NULL, xfrp_event_cb, p);
-	bufferevent_setwatermark(bev, EV_WRITE, 0, 0);
-	if (partner)
-		bufferevent_enable(partner, EV_READ);
-}
-
-static void
-close_on_finished_writecb(struct bufferevent *bev, void *ctx)
-{
-	struct evbuffer *b = bufferevent_get_output(bev);
-
-	if (evbuffer_get_length(b) == 0) {
-		bufferevent_free(bev);
-	}
-}
-
-static void
-xfrp_event_cb(struct bufferevent *bev, short what, void *ctx)
-{
-	struct proxy *p = (struct proxy *)ctx;
-	struct bufferevent *partner = p?p->bev:NULL;
-
 	if (what & (BEV_EVENT_EOF|BEV_EVENT_ERROR)) {
 		debug(LOG_DEBUG, "working connection closed!");
-		if (partner) {
-			/* Flush all pending data */
-			xfrp_read_cb(bev, p);
-
-			if (evbuffer_get_length(bufferevent_get_output(partner))) {
-				/* We still have to flush data from the other
-				 * side, but when that's done, close the other
-				 * side. */
-				bufferevent_setcb(partner,
-				    NULL, close_on_finished_writecb,
-				    xfrp_event_cb, NULL);
-
-				bufferevent_disable(partner, EV_READ);
-			} else {
-				/* We have nothing left to say to the other
-				 * side; close it. */
-				bufferevent_free(partner);
-				free_proxy(p);
-			}
-		}
 		bufferevent_free(bev);
 	}
 }

-int is_ftp_proxy(const struct proxy_service *ps)
+static void 
+xfrp_proxy_event_cb(struct bufferevent *bev, short what, void *ctx)
+{
+	struct proxy_client *client = ctx;
+	assert(client);
+
+	if (what & (BEV_EVENT_EOF|BEV_EVENT_ERROR)) {
+		debug(LOG_DEBUG, "xfrpc proxy close connect server [%s:%d] stream_id %d: %s", 
+						client->ps->local_ip, client->ps->local_port, 
+						client->stream_id, strerror(errno));
+		tcp_mux_send_win_update_fin(client->ctl_bev, client->stream_id);
+		client->stream_state = LOCAL_CLOSE;
+	} else if (what & BEV_EVENT_CONNECTED) {
+		debug(LOG_DEBUG, "client [%d] connected", client->stream_id);
+		//client->stream_state = ESTABLISHED;
+		if (client->data_tail_size > 0) {
+			debug(LOG_DEBUG, "send client data ...");
+			send_client_data_tail(client);		
+		}
+	  }
+}
+
+int 
+is_ftp_proxy(const struct proxy_service *ps)
 {
 	if (! ps || ! ps->proxy_type)
 		return 0;
@@ -157,7 +95,8 @@ int is_ftp_proxy(const struct proxy_service *ps)
 }

 // create frp tunnel for service
-void start_xfrp_tunnel(struct proxy_client *client)
+void 
+start_xfrp_tunnel(struct proxy_client *client)
 {
 	if (! client->ctl_bev) {
 		debug(LOG_ERR, "proxy client control bev is invalid!");
@@ -168,25 +107,25 @@ void start_xfrp_tunnel(struct proxy_client *client)
 	struct common_conf *c_conf = get_common_config();
 	struct proxy_service *ps = client->ps;

-	if (! base) {
+	if ( !base ) {
 		debug(LOG_ERR, "service event base get failed");
 		return;
 	}

-	if (! ps) {
+	if ( !ps ) {
 		debug(LOG_ERR, "service tunnel started failed, no proxy service resource.");
 		return;
 	}

-	if (! ps->local_port) {
+	if ( !ps->local_port ) {
 		debug(LOG_ERR, "service tunnel started failed, proxy service resource unvalid.");
 		return;
 	}

 	client->local_proxy_bev = connect_server(base, ps->local_ip, ps->local_port);
-	if (!client->local_proxy_bev) {
+	if ( !client->local_proxy_bev ) {
 		debug(LOG_ERR, "frpc tunnel connect local proxy port [%d] failed!", ps->local_port);
-		bufferevent_free(client->ctl_bev);
+		del_proxy_client(client);
 		return;
 	}
 	
@@ -196,59 +135,58 @@ void start_xfrp_tunnel(struct proxy_client *client)
 		  ps->local_ip ? ps->local_ip:"::1",
 		  ps->local_port);

-	struct proxy *ctl_prox = new_proxy_buf(client->ctl_bev);
-	struct proxy *local_prox = new_proxy_buf(client->local_proxy_bev);
-	bufferevent_data_cb proxy_s2c_cb, proxy_c2s_cb;
+	bufferevent_data_cb proxy_s2c_recv, proxy_c2s_recv;
 	if (is_ftp_proxy(client->ps)) {
-		proxy_c2s_cb = ftp_proxy_c2s_cb;
-		proxy_s2c_cb = ftp_proxy_s2c_cb;
-		ctl_prox->remote_data_port = client->ps->remote_data_port;
-		ctl_prox->proxy_name = strdup(ps->proxy_name);
+		proxy_c2s_recv = ftp_proxy_c2s_cb;
+		proxy_s2c_recv = ftp_proxy_s2c_cb;
 	} else {
-		proxy_c2s_cb = tcp_proxy_c2s_cb;
-		proxy_s2c_cb = tcp_proxy_s2c_cb;
+		proxy_c2s_recv = tcp_proxy_c2s_cb; // local service ---> xfrpc
+		proxy_s2c_recv = tcp_proxy_s2c_cb; // frps ---> xfrpc
+	}
+	
+	if (!c_conf->tcp_mux) {
+		bufferevent_setcb(client->ctl_bev, 
+						proxy_s2c_recv, 
+						NULL, 
+						xfrp_worker_event_cb, 
+						client);
+		bufferevent_enable(client->ctl_bev, EV_READ|EV_WRITE);
 	}

-	bufferevent_setcb(client->ctl_bev, 
-						proxy_s2c_cb, 
-						NULL, 
-						xfrp_event_cb, 
-						local_prox);
-
 	bufferevent_setcb(client->local_proxy_bev, 
-						proxy_c2s_cb, 
+						proxy_c2s_recv, 
 						NULL, 
-						xfrp_event_cb, 
-						ctl_prox);
+						xfrp_proxy_event_cb, 
+						client);
 						
-	bufferevent_enable(client->ctl_bev, EV_READ|EV_WRITE);
 	bufferevent_enable(client->local_proxy_bev, EV_READ|EV_WRITE);
 }

-int send_client_data_tail(struct proxy_client *client)
+int 
+send_client_data_tail(struct proxy_client *client)
 {
 	int send_l = 0;
 	if (client->data_tail && client->data_tail_size && client->local_proxy_bev) {
 		send_l = bufferevent_write(client->local_proxy_bev, client->data_tail, client->data_tail_size);
+		client->data_tail = NULL;
+		client->data_tail_size = 0;
 	}

 	return send_l;
 }

-void free_proxy_client(struct proxy_client *client)
+static void 
+free_proxy_client(struct proxy_client *client)
 {
-	if (client->local_ip) free(client->local_ip);
-	
-	free_base_config(client->bconf);
-	
-	evtimer_del(client->ev_timeout);
+	if (client->local_proxy_bev) bufferevent_free(client->local_proxy_bev);
+	free(client);
 }

-void del_proxy_client(struct proxy_client *client)
+void 
+del_proxy_client(struct proxy_client *client)
 {
-	struct proxy_client *all_pc = get_all_pc();
 	if (!client || !all_pc ) {
-		debug(LOG_INFO, "Error: all_pc or client is NULL");
+		debug(LOG_INFO, "all_pc or client is NULL");
 		return;
 	}
 	
@@ -257,18 +195,35 @@ void del_proxy_client(struct proxy_client *client)
 	free_proxy_client(client);
 }

-// Return NULL if proxy service not found with proxy_name
-struct proxy_service *get_proxy_service(const char *proxy_name)
+struct proxy_client *
+get_proxy_client(uint32_t sid)
 {
-	struct proxy_service *ps = NULL;
-	struct proxy_service *all_ps = get_all_proxy_services();
-	HASH_FIND_STR(all_ps, proxy_name, ps);
-	return ps;
+	struct proxy_client *pc = NULL;
+	HASH_FIND_INT(all_pc, &sid, pc);
+	return pc;
 }

-struct proxy_client *new_proxy_client()
+struct proxy_client *
+new_proxy_client()
 {
 	struct proxy_client *client = calloc(1, sizeof(struct proxy_client));
 	assert(client);
+	client->stream_id   = get_next_session_id();
+	client->send_window	= 128*1024;
+	client->stream_state = INIT;
+	HASH_ADD_INT(all_pc, stream_id, client);
+	
 	return client;
-}
+}
+
+void
+clear_all_proxy_client()
+{
+	if (!all_pc) return;
+	
+	struct proxy_client *client, *tmp;
+	HASH_ITER(hh, all_pc, client, tmp) {
+		HASH_DEL(all_pc, client);
+		free_proxy_client(client);
+	}
+}
--- a/client.h
+++ b/client.h
@@ -20,8 +20,8 @@
 \********************************************************************/

 /** @file client.h
-    @brief xfrp client proxy client related
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @brief xfrpc proxy client related
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #ifndef _CLIENT_H_
@@ -31,6 +31,7 @@

 #include "uthash.h"
 #include "common.h"
+#include "tcpmux.h"

 struct event_base;
 struct base_conf;
@@ -40,29 +41,27 @@ struct proxy_service;

 struct proxy_client {
 	struct event_base 	*base;
-	struct bufferevent	*ctl_bev;
-	struct bufferevent 	*local_proxy_bev;
-	struct event		*ev_timeout;
-
+	struct bufferevent	*ctl_bev; // xfrpc proxy <---> frps
+	struct bufferevent 	*local_proxy_bev; // xfrpc proxy <---> local service
 	struct base_conf	*bconf;
-	char	*local_ip;
-	int		local_port;
-	int		remote_port;
-	
-	char	*host_header_rewrite;
-	
-	//provate arguments
-	UT_hash_handle hh;
+
+	uint32_t				stream_id;
+	uint32_t				send_window;
+	enum tcp_mux_state		stream_state;
 	int						connected;
 	int 					work_started;
 	struct 	proxy_service 	*ps;
-	unsigned char			*data_tail; // storage untrated data
+	unsigned char			*data_tail; // storage untreated data
 	size_t					data_tail_size;
+	
+	// private arguments
+	UT_hash_handle hh;
 };

 struct proxy_service {
 	char 	*proxy_name;
 	char 	*proxy_type;
+	char 	*ftp_cfg_proxy_name;
 	int 	use_encryption;
 	int		use_compression;

@@ -79,7 +78,7 @@ struct proxy_service {
 	char	*http_user;
 	char	*http_pwd;

-	//provate arguments
+	// private arguments
 	UT_hash_handle hh;
 };

@@ -92,13 +91,14 @@ void start_xfrp_tunnel(struct proxy_client *client);

 void del_proxy_client(struct proxy_client *client);

-void free_proxy_client(struct proxy_client *client);
-
-struct proxy_service *get_proxy_service(const char *proxy_name);
+struct proxy_client	*get_proxy_client(uint32_t sid);

 int send_client_data_tail(struct proxy_client *client);

 int is_ftp_proxy(const struct proxy_service *ps);
+
 struct proxy_client *new_proxy_client();

+void clear_all_proxy_client();
+
 #endif //_CLIENT_H_
--- a/cmake/Modules/CMakeParseArguments.cmake
+++ b/cmake/Modules/CMakeParseArguments.cmake
@@ -0,0 +1,161 @@
+#.rst:
+# CMakeParseArguments
+# -------------------
+#
+#
+#
+# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords>
+# <multi_value_keywords> args...)
+#
+# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions
+# for parsing the arguments given to that macro or function.  It
+# processes the arguments and defines a set of variables which hold the
+# values of the respective options.
+#
+# The <options> argument contains all options for the respective macro,
+# i.e.  keywords which can be used when calling the macro without any
+# value following, like e.g.  the OPTIONAL keyword of the install()
+# command.
+#
+# The <one_value_keywords> argument contains all keywords for this macro
+# which are followed by one value, like e.g.  DESTINATION keyword of the
+# install() command.
+#
+# The <multi_value_keywords> argument contains all keywords for this
+# macro which can be followed by more than one value, like e.g.  the
+# TARGETS or FILES keywords of the install() command.
+#
+# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
+# keywords listed in <options>, <one_value_keywords> and
+# <multi_value_keywords> a variable composed of the given <prefix>
+# followed by "_" and the name of the respective keyword.  These
+# variables will then hold the respective value from the argument list.
+# For the <options> keywords this will be TRUE or FALSE.
+#
+# All remaining arguments are collected in a variable
+# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see
+# whether your macro was called with unrecognized parameters.
+#
+# As an example here a my_install() macro, which takes similar arguments
+# as the real install() command:
+#
+# ::
+#
+#    function(MY_INSTALL)
+#      set(options OPTIONAL FAST)
+#      set(oneValueArgs DESTINATION RENAME)
+#      set(multiValueArgs TARGETS CONFIGURATIONS)
+#      cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}"
+#                            "${multiValueArgs}" ${ARGN} )
+#      ...
+#
+#
+#
+# Assume my_install() has been called like this:
+#
+# ::
+#
+#    my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
+#
+#
+#
+# After the cmake_parse_arguments() call the macro will have set the
+# following variables:
+#
+# ::
+#
+#    MY_INSTALL_OPTIONAL = TRUE
+#    MY_INSTALL_FAST = FALSE (this option was not used when calling my_install()
+#    MY_INSTALL_DESTINATION = "bin"
+#    MY_INSTALL_RENAME = "" (was not used)
+#    MY_INSTALL_TARGETS = "foo;bar"
+#    MY_INSTALL_CONFIGURATIONS = "" (was not used)
+#    MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
+#
+#
+#
+# You can then continue and process these variables.
+#
+# Keywords terminate lists of values, e.g.  if directly after a
+# one_value_keyword another recognized keyword follows, this is
+# interpreted as the beginning of the new option.  E.g.
+# my_install(TARGETS foo DESTINATION OPTIONAL) would result in
+# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION
+# would be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
+
+#=============================================================================
+# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
+  return()
+endif()
+set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
+
+
+function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
+  # first set all result variables to empty/FALSE
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
+    set(${prefix}_${arg_name})
+  endforeach()
+
+  foreach(option ${_optionNames})
+    set(${prefix}_${option} FALSE)
+  endforeach()
+
+  set(${prefix}_UNPARSED_ARGUMENTS)
+
+  set(insideValues FALSE)
+  set(currentArgName)
+
+  # now iterate over all arguments and fill the result variables
+  foreach(currentArg ${ARGN})
+    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+
+    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1)
+      if(insideValues)
+        if("${insideValues}" STREQUAL "SINGLE")
+          set(${prefix}_${currentArgName} ${currentArg})
+          set(insideValues FALSE)
+        elseif("${insideValues}" STREQUAL "MULTI")
+          list(APPEND ${prefix}_${currentArgName} ${currentArg})
+        endif()
+      else()
+        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
+      endif()
+    else()
+      if(NOT ${optionIndex} EQUAL -1)
+        set(${prefix}_${currentArg} TRUE)
+        set(insideValues FALSE)
+      elseif(NOT ${singleArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "SINGLE")
+      elseif(NOT ${multiArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "MULTI")
+      endif()
+    endif()
+
+  endforeach()
+
+  # propagate the result variables to the caller:
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
+    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
+  endforeach()
+  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
+
+endfunction()
--- a/cmake/Modules/FindJSON-C.cmake
+++ b/cmake/Modules/FindJSON-C.cmake
@@ -0,0 +1,21 @@
+# JSON-C_FOUND - true if library and headers were found
+# JSON-C_INCLUDE_DIRS - include directories
+# JSON-C_LIBRARIES - library directories
+
+find_package(PkgConfig)
+pkg_check_modules(PC_JSON-C QUIET json-c)
+
+find_path(JSON-C_INCLUDE_DIR json.h
+	HINTS ${PC_JSON-C_INCLUDEDIR} ${PC_JSON-C_INCLUDE_DIRS} PATH_SUFFIXES json-c json)
+
+find_library(JSON-C_LIBRARY NAMES json-c libjson-c
+	HINTS ${PC_JSON-C_LIBDIR} ${PC_JSON-C_LIBRARY_DIRS})
+
+set(JSON-C_LIBRARIES ${JSON-C_LIBRARY})
+set(JSON-C_INCLUDE_DIRS ${JSON-C_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(JSON-C DEFAULT_MSG JSON-C_LIBRARY JSON-C_INCLUDE_DIR)
+
+mark_as_advanced(JSON-C_INCLUDE_DIR JSON-C_LIBRARY)
--- a/cmake/Modules/FindLibEvent.cmake
+++ b/cmake/Modules/FindLibEvent.cmake
@@ -0,0 +1,39 @@
+# - Find LibEvent (a cross event library)
+# This module defines
+# LIBEVENT_INCLUDE_DIR, where to find LibEvent headers
+# LIBEVENT_LIB, LibEvent libraries
+# LibEvent_FOUND, If false, do not try to use libevent
+
+set(LibEvent_EXTRA_PREFIXES /usr/local /opt/local "$ENV{HOME}")
+foreach(prefix ${LibEvent_EXTRA_PREFIXES})
+  list(APPEND LibEvent_INCLUDE_PATHS "${prefix}/include")
+  list(APPEND LibEvent_LIB_PATHS "${prefix}/lib")
+endforeach()
+
+FIND_PATH(LIBEVENT_INCLUDE_DIR event.h PATHS ${LibEvent_INCLUDE_PATHS})
+
+FIND_LIBRARY(LIBEVENT_LIB          NAMES event          PATHS ${LibEvent_LIB_PATHS})
+FIND_LIBRARY(LIBEVENT_CORE_LIB     NAMES event_core     PATHS ${LibEvent_LIB_PATHS})
+FIND_LIBRARY(LIBEVENT_PTHREADS_LIB NAMES event_pthreads PATHS ${LibEvent_LIB_PATHS})
+FIND_LIBRARY(LIBEVENT_EXTRA_LIB    NAMES event_extra    PATHS ${LibEvent_LIB_PATHS})
+FIND_LIBRARY(LIBEVENT_OPENSSL_LIB  NAMES event_openssl  PATHS ${LibEvent_LIB_PATHS})
+
+if (LIBEVENT_LIB AND LIBEVENT_INCLUDE_DIR)
+  set(LibEvent_FOUND TRUE)
+  set(LIBEVENT_LIB ${LIBEVENT_LIB})
+else ()
+  set(LibEvent_FOUND FALSE)
+endif ()
+
+if (LibEvent_FOUND)
+  if (NOT LibEvent_FIND_QUIETLY)
+    message(STATUS "Found libevent: ${LIBEVENT_LIB}")
+  endif ()
+else ()
+  if (LibEvent_FIND_REQUIRED)
+    message(FATAL_ERROR "Could NOT find libevent.")
+  endif ()
+  message(STATUS "libevent NOT found.")
+endif ()
+
+MARK_AS_ADVANCED(LIBEVENT_INCLUDE_DIR LIBEVENT_LIB LIBEVENT_PTHREADS_LIB LIBEVENT_OPENSSL_LIB LIBEVENT_CORE_LIB LIBEVENT_EXTRA_LIB)
--- a/cmake/Modules/FindOpenSSL.cmake
+++ b/cmake/Modules/FindOpenSSL.cmake
@@ -0,0 +1,340 @@
+#.rst:
+# FindOpenSSL
+# -----------
+#
+# Try to find the OpenSSL encryption library
+#
+# Once done this will define
+#
+# ::
+#
+#   OPENSSL_ROOT_DIR - Set this variable to the root installation of OpenSSL
+#
+#
+#
+# Read-Only variables:
+#
+# ::
+#
+#   OPENSSL_FOUND - System has the OpenSSL library
+#   OPENSSL_INCLUDE_DIR - The OpenSSL include directory
+#   OPENSSL_CRYPTO_LIBRARY - The OpenSSL crypto library
+#   OPENSSL_SSL_LIBRARY - The OpenSSL SSL library
+#   OPENSSL_LIBRARIES - All OpenSSL libraries
+#   OPENSSL_VERSION - This is set to $major.$minor.$revision$patch (eg. 0.9.8s)
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
+# Copyright 2009-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+if (UNIX)
+  find_package(PkgConfig QUIET)
+  pkg_check_modules(_OPENSSL QUIET openssl)
+endif ()
+
+if (WIN32)
+  # http://www.slproweb.com/products/Win32OpenSSL.html
+  set(_OPENSSL_ROOT_HINTS
+    ${OPENSSL_ROOT_DIR}
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
+    ENV OPENSSL_ROOT_DIR
+    )
+  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+  set(_OPENSSL_ROOT_PATHS
+    "${_programfiles}/OpenSSL"
+    "${_programfiles}/OpenSSL-Win32"
+    "${_programfiles}/OpenSSL-Win64"
+    "C:/OpenSSL/"
+    "C:/OpenSSL-Win32/"
+    "C:/OpenSSL-Win64/"
+    )
+  unset(_programfiles)
+else ()
+  set(_OPENSSL_ROOT_HINTS
+    ${OPENSSL_ROOT_DIR}
+    ENV OPENSSL_ROOT_DIR
+    )
+endif ()
+
+set(_OPENSSL_ROOT_HINTS_AND_PATHS
+    HINTS ${_OPENSSL_ROOT_HINTS}
+    PATHS ${_OPENSSL_ROOT_PATHS}
+    )
+
+find_path(OPENSSL_INCLUDE_DIR
+  NAMES
+    openssl/ssl.h
+  ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+  HINTS
+    ${_OPENSSL_INCLUDEDIR}
+  PATH_SUFFIXES
+    include
+)
+
+if(WIN32 AND NOT CYGWIN)
+  if(MSVC)
+    # /MD and /MDd are the standard values - if someone wants to use
+    # others, the libnames have to change here too
+    # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
+    # TODO: handle /MT and static lib
+    # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
+    #   * MD for dynamic-release
+    #   * MDd for dynamic-debug
+    #   * MT for static-release
+    #   * MTd for static-debug
+
+    # Implementation details:
+    # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
+    # libeay32MD.lib is identical to ../libeay32.lib, and
+    # ssleay32MD.lib is identical to ../ssleay32.lib
+    find_library(LIB_EAY_DEBUG
+      NAMES
+        libeay32MDd
+        libeay32d
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    find_library(LIB_EAY_RELEASE
+      NAMES
+        libeay32MD
+        libeay32
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    find_library(SSL_EAY_DEBUG
+      NAMES
+        ssleay32MDd
+        ssleay32d
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    find_library(SSL_EAY_RELEASE
+      NAMES
+        ssleay32MD
+        ssleay32
+        ssl
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "VC"
+        "lib/VC"
+    )
+
+    set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
+    set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}")
+    set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}")
+    set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}")
+
+    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+    select_library_configurations(LIB_EAY)
+    select_library_configurations(SSL_EAY)
+
+    mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
+                     SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
+    set( OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
+    set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
+    set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
+  elseif(MINGW)
+    # same player, for MinGW
+    set(LIB_EAY_NAMES libeay32)
+    set(SSL_EAY_NAMES ssleay32)
+    if(CMAKE_CROSSCOMPILING)
+      list(APPEND LIB_EAY_NAMES crypto)
+      list(APPEND SSL_EAY_NAMES ssl)
+    endif()
+    find_library(LIB_EAY
+      NAMES
+        ${LIB_EAY_NAMES}
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "lib/MinGW"
+    )
+
+    find_library(SSL_EAY
+      NAMES
+        ${SSL_EAY_NAMES}
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      PATH_SUFFIXES
+        "lib"
+        "lib/MinGW"
+    )
+
+    mark_as_advanced(SSL_EAY LIB_EAY)
+    set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
+    set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+    set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+    unset(LIB_EAY_NAMES)
+    unset(SSL_EAY_NAMES)
+  else()
+    # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
+    find_library(LIB_EAY
+      NAMES
+        libeay32
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      HINTS
+        ${_OPENSSL_LIBDIR}
+      PATH_SUFFIXES
+        lib
+    )
+
+    find_library(SSL_EAY
+      NAMES
+        ssleay32
+      ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+      HINTS
+        ${_OPENSSL_LIBDIR}
+      PATH_SUFFIXES
+        lib
+    )
+
+    mark_as_advanced(SSL_EAY LIB_EAY)
+    set( OPENSSL_SSL_LIBRARY ${SSL_EAY} )
+    set( OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
+    set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+  endif()
+else()
+
+  find_library(OPENSSL_SSL_LIBRARY
+    NAMES
+      ssl
+      ssleay32
+      ssleay32MD
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+    HINTS
+      ${_OPENSSL_LIBDIR}
+    PATH_SUFFIXES
+      lib
+  )
+
+  find_library(OPENSSL_CRYPTO_LIBRARY
+    NAMES
+      crypto
+    ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+    HINTS
+      ${_OPENSSL_LIBDIR}
+    PATH_SUFFIXES
+      lib
+  )
+
+  mark_as_advanced(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)
+
+  # compat defines
+  set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
+  set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
+
+  set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+
+endif()
+
+function(from_hex HEX DEC)
+  string(TOUPPER "${HEX}" HEX)
+  set(_res 0)
+  string(LENGTH "${HEX}" _strlen)
+
+  while (_strlen GREATER 0)
+    math(EXPR _res "${_res} * 16")
+    string(SUBSTRING "${HEX}" 0 1 NIBBLE)
+    string(SUBSTRING "${HEX}" 1 -1 HEX)
+    if (NIBBLE STREQUAL "A")
+      math(EXPR _res "${_res} + 10")
+    elseif (NIBBLE STREQUAL "B")
+      math(EXPR _res "${_res} + 11")
+    elseif (NIBBLE STREQUAL "C")
+      math(EXPR _res "${_res} + 12")
+    elseif (NIBBLE STREQUAL "D")
+      math(EXPR _res "${_res} + 13")
+    elseif (NIBBLE STREQUAL "E")
+      math(EXPR _res "${_res} + 14")
+    elseif (NIBBLE STREQUAL "F")
+      math(EXPR _res "${_res} + 15")
+    else()
+      math(EXPR _res "${_res} + ${NIBBLE}")
+    endif()
+
+    string(LENGTH "${HEX}" _strlen)
+  endwhile()
+
+  set(${DEC} ${_res} PARENT_SCOPE)
+endfunction()
+
+if (OPENSSL_INCLUDE_DIR)
+  if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
+    file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
+         REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
+
+    # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+    # The status gives if this is a developer or prerelease and is ignored here.
+    # Major, minor, and fix directly translate into the version numbers shown in
+    # the string. The patch field translates to the single character suffix that
+    # indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
+    # on.
+
+    string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
+           "\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
+    list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
+    list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
+    from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR)
+    list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
+    from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX)
+    list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
+
+    if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+      from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
+      # 96 is the ASCII code of 'a' minus 1
+      math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
+      unset(_tmp)
+      # Once anyone knows how OpenSSL would call the patch versions beyond 'z'
+      # this should be updated to handle that, too. This has not happened yet
+      # so it is simply ignored here for now.
+      string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
+    endif ()
+
+    set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
+  endif ()
+endif ()
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+
+if (OPENSSL_VERSION)
+  find_package_handle_standard_args(OpenSSL
+    REQUIRED_VARS
+      OPENSSL_LIBRARIES
+      OPENSSL_INCLUDE_DIR
+    VERSION_VAR
+      OPENSSL_VERSION
+    FAIL_MESSAGE
+      "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
+  )
+else ()
+  find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
+    OPENSSL_LIBRARIES
+    OPENSSL_INCLUDE_DIR
+  )
+endif ()
+
+mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
--- a/cmake/Modules/FindPackageHandleStandardArgs.cmake
+++ b/cmake/Modules/FindPackageHandleStandardArgs.cmake
@@ -0,0 +1,382 @@
+#.rst:
+# FindPackageHandleStandardArgs
+# -----------------------------
+#
+#
+#
+# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> ...  )
+#
+# This function is intended to be used in FindXXX.cmake modules files.
+# It handles the REQUIRED, QUIET and version-related arguments to
+# find_package().  It also sets the <packagename>_FOUND variable.  The
+# package is considered found if all variables <var1>...  listed contain
+# valid results, e.g.  valid filepaths.
+#
+# There are two modes of this function.  The first argument in both
+# modes is the name of the Find-module where it is called (in original
+# casing).
+#
+# The first simple mode looks like this:
+#
+# ::
+#
+#     FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name>
+#       (DEFAULT_MSG|"Custom failure message") <var1>...<varN> )
+#
+# If the variables <var1> to <varN> are all valid, then
+# <UPPERCASED_NAME>_FOUND will be set to TRUE.  If DEFAULT_MSG is given
+# as second argument, then the function will generate itself useful
+# success and error messages.  You can also supply a custom error
+# message for the failure case.  This is not recommended.
+#
+# The second mode is more powerful and also supports version checking:
+#
+# ::
+#
+#     FIND_PACKAGE_HANDLE_STANDARD_ARGS(<NAME>
+#       [FOUND_VAR <resultVar>]
+#       [REQUIRED_VARS <var1>...<varN>]
+#       [VERSION_VAR   <versionvar>]
+#       [HANDLE_COMPONENTS]
+#       [CONFIG_MODE]
+#       [FAIL_MESSAGE "Custom failure message"] )
+#
+# In this mode, the name of the result-variable can be set either to
+# either <UPPERCASED_NAME>_FOUND or <OriginalCase_Name>_FOUND using the
+# FOUND_VAR option.  Other names for the result-variable are not
+# allowed.  So for a Find-module named FindFooBar.cmake, the two
+# possible names are FooBar_FOUND and FOOBAR_FOUND.  It is recommended
+# to use the original case version.  If the FOUND_VAR option is not
+# used, the default is <UPPERCASED_NAME>_FOUND.
+#
+# As in the simple mode, if <var1> through <varN> are all valid,
+# <packagename>_FOUND will be set to TRUE.  After REQUIRED_VARS the
+# variables which are required for this package are listed.  Following
+# VERSION_VAR the name of the variable can be specified which holds the
+# version of the package which has been found.  If this is done, this
+# version will be checked against the (potentially) specified required
+# version used in the find_package() call.  The EXACT keyword is also
+# handled.  The default messages include information about the required
+# version and the version which has been actually found, both if the
+# version is ok or not.  If the package supports components, use the
+# HANDLE_COMPONENTS option to enable handling them.  In this case,
+# find_package_handle_standard_args() will report which components have
+# been found and which are missing, and the <packagename>_FOUND variable
+# will be set to FALSE if any of the required components (i.e.  not the
+# ones listed after OPTIONAL_COMPONENTS) are missing.  Use the option
+# CONFIG_MODE if your FindXXX.cmake module is a wrapper for a
+# find_package(...  NO_MODULE) call.  In this case VERSION_VAR will be
+# set to <NAME>_VERSION and the macro will automatically check whether
+# the Config module was found.  Via FAIL_MESSAGE a custom failure
+# message can be specified, if this is not used, the default message
+# will be displayed.
+#
+# Example for mode 1:
+#
+# ::
+#
+#     find_package_handle_standard_args(LibXml2  DEFAULT_MSG
+#       LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
+#
+#
+#
+# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
+# LIBXML2_INCLUDE_DIR are valid.  Then also LIBXML2_FOUND is set to
+# TRUE.  If it is not found and REQUIRED was used, it fails with
+# FATAL_ERROR, independent whether QUIET was used or not.  If it is
+# found, success will be reported, including the content of <var1>.  On
+# repeated Cmake runs, the same message won't be printed again.
+#
+# Example for mode 2:
+#
+# ::
+#
+#     find_package_handle_standard_args(LibXslt
+#       FOUND_VAR LibXslt_FOUND
+#       REQUIRED_VARS LibXslt_LIBRARIES LibXslt_INCLUDE_DIRS
+#       VERSION_VAR LibXslt_VERSION_STRING)
+#
+# In this case, LibXslt is considered to be found if the variable(s)
+# listed after REQUIRED_VAR are all valid, i.e.  LibXslt_LIBRARIES and
+# LibXslt_INCLUDE_DIRS in this case.  The result will then be stored in
+# LibXslt_FOUND .  Also the version of LibXslt will be checked by using
+# the version contained in LibXslt_VERSION_STRING.  Since no
+# FAIL_MESSAGE is given, the default messages will be printed.
+#
+# Another example for mode 2:
+#
+# ::
+#
+#     find_package(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
+#     find_package_handle_standard_args(Automoc4  CONFIG_MODE)
+#
+# In this case, FindAutmoc4.cmake wraps a call to find_package(Automoc4
+# NO_MODULE) and adds an additional search directory for automoc4.  Here
+# the result will be stored in AUTOMOC4_FOUND.  The following
+# FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
+# success/error message.
+
+#=============================================================================
+# Copyright 2007-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
+
+# internal helper macro
+macro(_FPHSA_FAILURE_MESSAGE _msg)
+  if (${_NAME}_FIND_REQUIRED)
+    message(FATAL_ERROR "${_msg}")
+  else ()
+    if (NOT ${_NAME}_FIND_QUIETLY)
+      message(STATUS "${_msg}")
+    endif ()
+  endif ()
+endmacro()
+
+
+# internal helper macro to generate the failure message when used in CONFIG_MODE:
+macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
+  # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
+  if(${_NAME}_CONFIG)
+    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
+  else()
+    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
+    # List them all in the error message:
+    if(${_NAME}_CONSIDERED_CONFIGS)
+      set(configsText "")
+      list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
+      math(EXPR configsCount "${configsCount} - 1")
+      foreach(currentConfigIndex RANGE ${configsCount})
+        list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
+        list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
+        set(configsText "${configsText}    ${filename} (version ${version})\n")
+      endforeach()
+      if (${_NAME}_NOT_FOUND_MESSAGE)
+        set(configsText "${configsText}    Reason given by package: ${${_NAME}_NOT_FOUND_MESSAGE}\n")
+      endif()
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
+
+    else()
+      # Simple case: No Config-file was found at all:
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
+    endif()
+  endif()
+endmacro()
+
+
+function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
+
+# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
+# new extended or in the "old" mode:
+  set(options  CONFIG_MODE  HANDLE_COMPONENTS)
+  set(oneValueArgs  FAIL_MESSAGE  VERSION_VAR  FOUND_VAR)
+  set(multiValueArgs REQUIRED_VARS)
+  set(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
+  list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
+
+  if(${INDEX} EQUAL -1)
+    set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
+    set(FPHSA_REQUIRED_VARS ${ARGN})
+    set(FPHSA_VERSION_VAR)
+  else()
+
+    CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
+
+    if(FPHSA_UNPARSED_ARGUMENTS)
+      message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
+    endif()
+
+    if(NOT FPHSA_FAIL_MESSAGE)
+      set(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
+    endif()
+  endif()
+
+# now that we collected all arguments, process them
+
+  if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
+    set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
+  endif()
+
+  # In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package()
+  # when it successfully found the config-file, including version checking:
+  if(FPHSA_CONFIG_MODE)
+    list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
+    list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
+    set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
+  endif()
+
+  if(NOT FPHSA_REQUIRED_VARS)
+    message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
+  endif()
+
+  list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
+
+  string(TOUPPER ${_NAME} _NAME_UPPER)
+  string(TOLOWER ${_NAME} _NAME_LOWER)
+
+  if(FPHSA_FOUND_VAR)
+    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
+      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
+    else()
+      message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
+    endif()
+  else()
+    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
+  endif()
+
+  # collect all variables which were not found, so they can be printed, so the
+  # user knows better what went wrong (#6375)
+  set(MISSING_VARS "")
+  set(DETAILS "")
+  # check if all passed variables are valid
+  unset(${_FOUND_VAR})
+  foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
+    if(NOT ${_CURRENT_VAR})
+      set(${_FOUND_VAR} FALSE)
+      set(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
+    else()
+      set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
+    endif()
+  endforeach()
+  if(NOT "${${_FOUND_VAR}}" STREQUAL "FALSE")
+    set(${_FOUND_VAR} TRUE)
+  endif()
+
+  # component handling
+  unset(FOUND_COMPONENTS_MSG)
+  unset(MISSING_COMPONENTS_MSG)
+
+  if(FPHSA_HANDLE_COMPONENTS)
+    foreach(comp ${${_NAME}_FIND_COMPONENTS})
+      if(${_NAME}_${comp}_FOUND)
+
+        if(NOT DEFINED FOUND_COMPONENTS_MSG)
+          set(FOUND_COMPONENTS_MSG "found components: ")
+        endif()
+        set(FOUND_COMPONENTS_MSG "${FOUND_COMPONENTS_MSG} ${comp}")
+
+      else()
+
+        if(NOT DEFINED MISSING_COMPONENTS_MSG)
+          set(MISSING_COMPONENTS_MSG "missing components: ")
+        endif()
+        set(MISSING_COMPONENTS_MSG "${MISSING_COMPONENTS_MSG} ${comp}")
+
+        if(${_NAME}_FIND_REQUIRED_${comp})
+          set(${_FOUND_VAR} FALSE)
+          set(MISSING_VARS "${MISSING_VARS} ${comp}")
+        endif()
+
+      endif()
+    endforeach()
+    set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}")
+    set(DETAILS "${DETAILS}[c${COMPONENT_MSG}]")
+  endif()
+
+  # version handling:
+  set(VERSION_MSG "")
+  set(VERSION_OK TRUE)
+  set(VERSION ${${FPHSA_VERSION_VAR}})
+
+  # check with DEFINED here as the requested or found version may be "0"
+  if (DEFINED ${_NAME}_FIND_VERSION)
+    if(DEFINED ${FPHSA_VERSION_VAR})
+
+      if(${_NAME}_FIND_VERSION_EXACT)       # exact version required
+        # count the dots in the version string
+        string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${VERSION}")
+        # add one dot because there is one dot more than there are components
+        string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS)
+        if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT)
+          # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT
+          # is at most 4 here. Therefore a simple lookup table is used.
+          if (${_NAME}_FIND_VERSION_COUNT EQUAL 1)
+            set(_VERSION_REGEX "[^.]*")
+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2)
+            set(_VERSION_REGEX "[^.]*\\.[^.]*")
+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3)
+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*")
+          else ()
+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*")
+          endif ()
+          string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${VERSION}")
+          unset(_VERSION_REGEX)
+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD)
+            set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+            set(VERSION_OK FALSE)
+          else ()
+            set(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
+          endif ()
+          unset(_VERSION_HEAD)
+        else ()
+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL VERSION)
+            set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+            set(VERSION_OK FALSE)
+          else ()
+            set(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
+          endif ()
+        endif ()
+        unset(_VERSION_DOTS)
+
+      else()     # minimum version specified:
+        if (${_NAME}_FIND_VERSION VERSION_GREATER VERSION)
+          set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
+          set(VERSION_OK FALSE)
+        else ()
+          set(VERSION_MSG "(found suitable version \"${VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
+        endif ()
+      endif()
+
+    else()
+
+      # if the package was not found, but a version was given, add that to the output:
+      if(${_NAME}_FIND_VERSION_EXACT)
+         set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
+      else()
+         set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
+      endif()
+
+    endif()
+  else ()
+    if(VERSION)
+      set(VERSION_MSG "(found version \"${VERSION}\")")
+    endif()
+  endif ()
+
+  if(VERSION_OK)
+    set(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]")
+  else()
+    set(${_FOUND_VAR} FALSE)
+  endif()
+
+
+  # print the result:
+  if (${_FOUND_VAR})
+    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
+  else ()
+
+    if(FPHSA_CONFIG_MODE)
+      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
+    else()
+      if(NOT VERSION_OK)
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
+      else()
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}")
+      endif()
+    endif()
+
+  endif ()
+
+  set(${_FOUND_VAR} ${${_FOUND_VAR}} PARENT_SCOPE)
+
+endfunction()
--- a/cmake/Modules/FindPackageMessage.cmake
+++ b/cmake/Modules/FindPackageMessage.cmake
@@ -0,0 +1,57 @@
+#.rst:
+# FindPackageMessage
+# ------------------
+#
+#
+#
+# FIND_PACKAGE_MESSAGE(<name> "message for user" "find result details")
+#
+# This macro is intended to be used in FindXXX.cmake modules files.  It
+# will print a message once for each unique find result.  This is useful
+# for telling the user where a package was found.  The first argument
+# specifies the name (XXX) of the package.  The second argument
+# specifies the message to display.  The third argument lists details
+# about the find result so that if they change the message will be
+# displayed again.  The macro also obeys the QUIET argument to the
+# find_package command.
+#
+# Example:
+#
+# ::
+#
+#   if(X11_FOUND)
+#     FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}"
+#       "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]")
+#   else()
+#    ...
+#   endif()
+
+#=============================================================================
+# Copyright 2008-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+function(FIND_PACKAGE_MESSAGE pkg msg details)
+  # Avoid printing a message repeatedly for the same find result.
+  if(NOT ${pkg}_FIND_QUIETLY)
+    string(REPLACE "\n" "" details "${details}")
+    set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
+    if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
+      # The message has not yet been printed.
+      message(STATUS "${msg}")
+
+      # Save the find details in the cache to avoid printing the same
+      # message again.
+      set("${DETAILS_VAR}" "${details}"
+        CACHE INTERNAL "Details about finding ${pkg}")
+    endif()
+  endif()
+endfunction()
--- a/commandline.c
+++ b/commandline.c
@@ -39,6 +39,7 @@
 #include "commandline.h"
 #include "debug.h"
 #include "version.h"
+#include "utils.h"

 typedef void signal_func (int);

@@ -109,7 +110,7 @@ get_daemon_status()
 /** @internal
 * @brief Print usage
 *
- * Prints usage, called when wifidog is run with -h or with an unknown option
+ * Prints usage, called when xfrpc is run with -h or with an unknown option
 */
 static void
 usage(const char *appname)
@@ -122,6 +123,7 @@ usage(const char *appname)
    fprintf(stdout, "  -d <level>    Debug level\n");
    fprintf(stdout, "  -h            Print usage\n");
    fprintf(stdout, "  -v            Print version information\n");
+    fprintf(stdout, "  -r            Print run id of client\n");
    fprintf(stdout, "\n");
 }

@@ -134,7 +136,7 @@ parse_commandline(int argc, char **argv)
    int c;
 	int flag = 0;
 	
-    while (-1 != (c = getopt(argc, argv, "c:hfd:sw:vx:i:a:"))) {
+    while (-1 != (c = getopt(argc, argv, "c:hfd:sw:vrx:i:a:"))) {


        switch (c) {
@@ -148,7 +150,6 @@ parse_commandline(int argc, char **argv)
            if (optarg) {
 				confile = strdup(optarg); //never free it
                assert(confile);
-
 				flag = 1;
            }
            break;
@@ -165,10 +166,28 @@ parse_commandline(int argc, char **argv)
            break;

        case 'v':
-            fprintf(stdout, "This is %s version " VERSION "\n", argv[0]);
+            fprintf(stdout, "version: " VERSION "\n");
            exit(1);
            break;
+        
+        case 'r':
+            {
+                char ifname[16] = {0};
+            	if(get_net_ifname(ifname, 16)){
+            		debug(LOG_ERR, "error: get device sign ifname failed!");
+            		exit(0);
+            	}

+            	char if_mac[64] = {0};
+            	if(get_net_mac(ifname, if_mac, sizeof(if_mac))) {
+            		debug(LOG_ERR, "error: Hard ware MAC address of [%s] get failed!", ifname);
+            		exit(0);
+            	}
+
+                fprintf(stdout, "run ID:%s\n", if_mac);
+                exit(1);
+                break;
+            }
        default:
            usage(argv[0]);
            exit(1);
--- a/common.c
+++ b/common.c
@@ -1,3 +1,29 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file common.c
+    @brief xfrp common function implemented
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
 #include "uthash.h"
 #include "common.h"

--- a/common.h
+++ b/common.h
@@ -1,3 +1,29 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file common.h
+    @brief xfrp common header
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
 #ifndef _COMMON_H_
 #define _COMMON_H_

@@ -6,10 +32,20 @@
 #include <string.h>
 #include <netinet/in.h>

+#include <event2/bufferevent.h>
+#include <event2/buffer.h>
+#include <event2/listener.h>
+#include <event2/util.h>
+#include <event2/event.h>
+#include <event2/dns.h>
+#include <event2/event_struct.h>
+
+#include <assert.h>
+
 #include "uthash.h"

-// #define BIGENDIAN_64BIT 0
-#define BIGENDIAN_32BIT 1
+#define BIGENDIAN_64BIT 1
+//#define BIGENDIAN_32BIT 1

 #define SAFE_FREE(m) 	\
 if (m) free(m)
@@ -37,4 +73,4 @@ uint64_t hton64(const uint64_t input);

 typedef unsigned short ushort;

-#endif //_COMMON_H_
+#endif //_COMMON_H_
--- a/config.c
+++ b/config.c
@@ -20,8 +20,8 @@
 \********************************************************************/

 /** @file config.c
-    @brief xfrp client config related
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @brief xfrpc client config related
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -42,8 +42,7 @@
 #include "version.h"

 static struct common_conf 	*c_conf;
-static struct proxy_client 	*p_clients;
-static struct proxy_service *p_services;
+static struct proxy_service *all_ps;

 static void new_ftp_data_proxy_service(struct proxy_service *ftp_ps);

@@ -63,8 +62,18 @@ void free_common_config()
 	if (c_conf->log_level) free(c_conf->log_level);
 	if (c_conf->auth_token) free(c_conf->auth_token);
 	if (c_conf->privilege_token) free(c_conf->privilege_token);
+	SAFE_FREE(c_conf->server_ip);
 };

+void set_common_server_ip(const char *ip)
+{
+	struct common_conf *c_conf = get_common_config();
+	c_conf->server_ip = strdup(ip);
+	assert(c_conf->server_ip);
+
+	debug(LOG_DEBUG, "server IP address: [%s]", c_conf->server_ip);
+}
+
 void free_base_config(struct base_conf *bconf)
 {
 	if (bconf->name) free(bconf->name);
@@ -74,16 +83,6 @@ void free_base_config(struct base_conf *bconf)
 	if (bconf->subdomain) free(bconf->subdomain);
 }

-struct proxy_client *get_all_pc()
-{
-	return p_clients;
-}
-
-struct proxy_service *get_all_proxy_services()
-{
-	return p_services;
-}
-
 static int is_true(const char *val)
 {
 	if (val && (strcmp(val, "true") == 0 || strcmp(val, "1") == 0))
@@ -100,9 +99,7 @@ static const char *get_valid_type(const char *val)
 	#define MATCH_VALUE(s) strcmp(val, s) == 0
 	if (MATCH_VALUE("tcp") || 
 		MATCH_VALUE("http") || 
-		MATCH_VALUE("https") || 
-		MATCH_VALUE("udp") || 
-		MATCH_VALUE("ftp")) { 
+		MATCH_VALUE("https")) { 

 		return val;
 	}
@@ -112,7 +109,7 @@ static const char *get_valid_type(const char *val)

 static void dump_common_conf()
 {
-	if(!c_conf) {
+	if(! c_conf) {
 		debug(LOG_ERR, "Error: c_conf is NULL");
 		return;
 	}
@@ -135,18 +132,6 @@ static void dump_proxy_service(const int index, struct proxy_service *ps)
 		ps->proxy_type = strdup("tcp");
 		assert(ps->proxy_type);
 	} else if (strcmp(ps->proxy_type, "ftp") == 0) {
-		if (ps->remote_data_port <= 0) {
-			debug(LOG_ERR, 
-				"Proxy [%s] error: remote_data_port must be exist when type is ftp", 
-				ps->proxy_name);
-			exit(0);
-		}
-
-		if (!is_valid_ip_address((const char *)c_conf->server_addr)){
-			debug(LOG_ERR, "now ftp proxy only support ip address in [server_addr]");
-			exit(0);
-		}
-
 		new_ftp_data_proxy_service(ps);
 	}

@@ -163,7 +148,7 @@ static void dump_all_ps()
 	struct proxy_service *ps = NULL, *tmp = NULL;
 	
 	int index = 0;
-	HASH_ITER(hh, p_services, ps, tmp) {
+	HASH_ITER(hh, all_ps, ps, tmp) {
 		dump_proxy_service(index++, ps);
 	}
 }
@@ -178,6 +163,7 @@ static struct proxy_service *new_proxy_service(const char *name)
 	assert(c_conf);

 	ps->proxy_name 			= strdup(name);
+	ps->ftp_cfg_proxy_name	= NULL;
 	assert(ps->proxy_name);

 	ps->proxy_type 			= NULL;
@@ -204,7 +190,7 @@ static void new_ftp_data_proxy_service(struct proxy_service *ftp_ps)
 	struct proxy_service *ps = NULL;
 	char *ftp_data_proxy_name = get_ftp_data_proxy_name((const char *)ftp_ps->proxy_name);

-	HASH_FIND_STR(p_services, ftp_data_proxy_name, ps);
+	HASH_FIND_STR(all_ps, ftp_data_proxy_name, ps);
 	if (!ps) {
 		ps = new_proxy_service(ftp_data_proxy_name);
 		if (! ps) {
@@ -212,13 +198,16 @@ static void new_ftp_data_proxy_service(struct proxy_service *ftp_ps)
 				"cannot create ftp data proxy service, it should not happenned!");
 			exit(0);
 		}
+		
+		ps->ftp_cfg_proxy_name = strdup(ftp_ps->proxy_name);
+		assert(ps->ftp_cfg_proxy_name);

 		ps->proxy_type = strdup("tcp");
 		ps->remote_port = ftp_ps->remote_data_port;
 		ps->local_ip = ftp_ps->local_ip;
 		ps->local_port = 0; //will be init in working tunnel connectting

-		HASH_ADD_KEYPTR(hh, p_services, ps->proxy_name, strlen(ps->proxy_name), ps);
+		HASH_ADD_KEYPTR(hh, all_ps, ps->proxy_name, strlen(ps->proxy_name), ps);
 	}

 	free(ftp_data_proxy_name);
@@ -238,7 +227,7 @@ proxy_service_handler(void *user, const char *sect, const char *nm, const char *
 		return 0;
 	}

-	HASH_FIND_STR(p_services, section, ps);
+	HASH_FIND_STR(all_ps, section, ps);
 	if (!ps) {
 		ps = new_proxy_service(section);
 		if (! ps) {
@@ -246,7 +235,7 @@ proxy_service_handler(void *user, const char *sect, const char *nm, const char *
 			exit(0);
 		}

-		HASH_ADD_KEYPTR(hh, p_services, ps->proxy_name, strlen(ps->proxy_name), ps);
+		HASH_ADD_KEYPTR(hh, all_ps, ps->proxy_name, strlen(ps->proxy_name), ps);
 	} 
 	
 	#define MATCH_NAME(s) strcmp(nm, s) == 0
@@ -306,8 +295,15 @@ static int common_handler(void *user, const char *section, const char *name, con
 	#define MATCH(s, n) strcmp(section, s) == 0 && strcmp(name, n) == 0
 	if (MATCH("common", "server_addr")) {
 		SAFE_FREE(config->server_addr);
-		config->server_addr = strdup(value);
+		int addr_len = strlen(value) + 1;
+		config->server_addr = (char *)calloc(1, addr_len);
 		assert(config->server_addr);
+		if(dns_unified(value, config->server_addr, addr_len)) {
+			debug(LOG_ERR, "error: server_addr [%s] is invalid!", value);
+			exit(0);
+		}
+		if (is_valid_ip_address(value))
+			set_common_server_ip(value);
 	} else if (MATCH("common", "server_port")) {
 		config->server_port = atoi(value);
 	} else if (MATCH("common", "http_proxy")) {
@@ -336,7 +332,7 @@ static int common_handler(void *user, const char *section, const char *name, con
 		config->heartbeat_interval = atoi(value);
 	} else if (MATCH("common", "heartbeat_timeout")) {
 		config->heartbeat_timeout = atoi(value);
-	} else if (MATCH("common", "auth_token")) {
+	} else if (MATCH("common", "token")) {
 		SAFE_FREE(config->auth_token);
 		config->auth_token = strdup(value);
 		assert(config->auth_token);
@@ -345,7 +341,8 @@ static int common_handler(void *user, const char *section, const char *name, con
 		config->user = strdup(value);
 		assert(config->user);
 	} else if (MATCH("common", "tcp_mux")) {
-		config->tcp_mux = 0;	// set tcp_mux to default: false
+		config->tcp_mux = atoi(value);
+		config->tcp_mux = !!config->tcp_mux;
 	}
 	return 1;
 }
@@ -367,15 +364,17 @@ static void init_common_conf(struct common_conf *config)
 	config->log_max_days		= 3;
 	config->heartbeat_interval 	= 30;
 	config->heartbeat_timeout	= 60;
-	config->tcp_mux				= 0;
+	config->tcp_mux				= 1;
 	config->user				= NULL;
+	config->server_ip			= NULL;
+	config->is_router			= 0;
 }

 // it should be free after using
 // because of assert it will never return NULL
 char *get_ftp_data_proxy_name(const char *ftp_proxy_name)
 {
-	char *ftp_tail_data_name = FTP_DATA_PROXY_SUFFIX;
+	char *ftp_tail_data_name = FTP_RMT_CTL_PROXY_SUFFIX;
 	char *ftp_data_proxy_name = (char *)calloc(1, 
 								strlen(ftp_proxy_name)+strlen(ftp_tail_data_name)+1);
 	assert(ftp_data_proxy_name);
@@ -419,3 +418,22 @@ void load_config(const char *confile)
 	
 	dump_all_ps();
 }
+
+int is_running_in_router()
+{
+	return c_conf->is_router;
+}
+
+struct proxy_service *
+get_proxy_service(const char *proxy_name)
+{
+	struct proxy_service *ps = NULL;
+	HASH_FIND_STR(all_ps, proxy_name, ps);
+	return ps;
+}
+
+struct proxy_service *
+get_all_proxy_services()
+{
+	return all_ps;
+}
--- a/config.h
+++ b/config.h
@@ -20,8 +20,8 @@
 \********************************************************************/

 /** @file config.h
-    @brief xfrp client config related
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @brief xfrpc client config related
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"

-#define FTP_DATA_PROXY_SUFFIX	"_ftp_data_proxy"
+#define FTP_RMT_CTL_PROXY_SUFFIX	"_ftp_remote_ctl_proxy"

 struct base_conf{
 	char	*name;
@@ -45,31 +45,41 @@ struct base_conf{

 // common config
 struct common_conf {
-	char	*server_addr; /* default 0.0.0.0 */
-	int		server_port; /* default 7000 */
+	char	*server_addr; 	/* default 0.0.0.0 */
+	char 	*server_ip;
+	int		server_port; 	/* default 7000 */
 	char	*http_proxy;
-	char	*log_file; /* default consol */
-	char	*log_way; /* default console */
-	char	*log_level; /* default info */
+	char	*log_file; 		/* default consol */
+	char	*log_way; 		/* default console */
+	char	*log_level; 	/* default info */
 	int		log_max_days;	/* default 3 */
 	char	*privilege_token;
 	char	*auth_token;
 	int		heartbeat_interval; /* default 10 */
 	int		heartbeat_timeout;	/* default 30 */
-	int 	tcp_mux;	/* default 0 */
+	int 	tcp_mux;		/* default 0 */
 	char	*user;
+
+	/* private fields */
+	int 	is_router;	// to sign router (Openwrt/LEDE) or not
 };

 struct common_conf *get_common_config();
-struct proxy_service *get_all_proxy_services();

 void free_common_config();

 void free_base_config(struct base_conf *bconf);

-struct proxy_client *get_all_pc();
-
 void load_config(const char *confile);
+
 char *get_ftp_data_proxy_name(const char *ftp_proxy_name);

+void set_common_server_ip(const char *ip);
+
+int is_running_in_router();
+
+struct proxy_service *get_proxy_service(const char *proxy_name);
+
+struct proxy_service *get_all_proxy_services();
+
 #endif //_CONFIG_H_
--- a/const.h
+++ b/const.h
@@ -20,8 +20,8 @@
 \********************************************************************/

 /** @file const.h
-    @brief xfrp constant parameter define
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @brief xfrpc constant parameter define
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #ifndef	_CONST_H_
@@ -34,15 +34,5 @@ enum server_status {
 	Closed
 };

-// msg type
-// enum msg_type {
-// 	NewCtlConn = 0,
-// 	NewWorkConn,
-// 	NoticeUserConn,
-// 	NewCtlConnRes,
-// 	HeartbeatReq,
-// 	HeartbeatRes,
-// 	NewWorkConnUdp
-// };

 #endif
--- a/control.c
+++ b/control.c
--- a/control.h
+++ b/control.h
@@ -21,7 +21,7 @@

 /** @file control.h
    @brief control related
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #ifndef	_CONTROL_H_
@@ -40,34 +40,47 @@ struct control {
 	struct event_base 	*connect_base;  	//main netevent 
 	struct evdns_base  	*dnsbase;
    struct bufferevent  *connect_bev;    	//main io evet buf
-    char                session_id;
    struct event		*ticker_ping;    	//heartbeat timer
+
+	struct event		*tcp_mux_ping_event;	
+	uint32_t			tcp_mux_ping_id;	
+	uint32_t			stream_id;	
 };

 void connect_eventcb(struct bufferevent *bev, short events, void *ptr);
-void sync_iv(unsigned char *iv);
+
 void start_base_connect();
-void sync_session_id(uint32_t sid);
+
 void init_main_control();
+
 void run_control();
+
 struct control *get_main_control();
+
 void close_main_control();
+
 void start_login_frp_server(struct event_base *base);
+
 void send_login_frp_server(struct bufferevent *bev);
+
 void login();
-void free_control();
-void sync_session_id(uint32_t sid);

 void send_msg_frp_server(struct bufferevent *bev, 
-					const enum msg_type type, 
-					const char *msg, 
-					const size_t msg_len, 
-					uint32_t sid);
+			const enum msg_type type, 
+			const char *msg, 
+			const size_t msg_len, 
+			uint32_t sid);
+
+void send_enc_msg_frp_server(struct bufferevent *bev, 
+			const enum msg_type type, 
+			const char *msg, 
+			const size_t msg_len, 
+			uint32_t sid);

 void control_process(struct proxy_client *client);
+
 void send_new_proxy(struct proxy_service *ps);

-struct bufferevent 
-*connect_server(struct event_base *base, const char *name, const int port);
+struct bufferevent *connect_server(struct event_base *base, const char *name, const int port);

-#endif //_CONTROL_H_
+#endif //_CONTROL_H_
--- a/crypto.c
+++ b/crypto.c
@@ -1,3 +1,30 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file crypto.c
+    @brief xfrpc crypto implement
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -12,124 +39,120 @@
 #include "common.h"
 #include "debug.h"

-// #define ENC_DEBUG 1
-
 static const char *default_salt = "frp";
 static const size_t block_size = 16;
 static struct frp_coder *main_encoder = NULL;
 static struct frp_coder *main_decoder = NULL;

-size_t get_block_size()
+size_t 
+get_block_size()
 {
 	return block_size;
 }

-// TODO: NEED free
-struct frp_coder *new_coder(const char *privilege_token, const char *salt)
+struct frp_coder *
+new_coder(const char *privilege_token, const char *salt)
 {
 	struct frp_coder *enc = calloc(sizeof(struct frp_coder), 1);
 	assert(enc);

 	enc->privilege_token = privilege_token ? strdup(privilege_token):"\0";
-	assert(enc->privilege_token);
-	enc->key_len = block_size;
 	enc->salt = strdup(salt);
-	assert(enc->salt);
-	enc->key = encrypt_key(enc->privilege_token, strlen(enc->privilege_token), enc->salt);
-	enc->iv = calloc(block_size, 1);
+	encrypt_key(enc->privilege_token, strlen(enc->privilege_token), enc->salt, enc->key, block_size);
 	encrypt_iv(enc->iv, block_size);
 	return enc;
 }

-size_t get_encrypt_block_size()
+struct frp_coder *
+clone_coder(const struct frp_coder *coder)
+{
+	assert(coder);
+	struct frp_coder *enc = calloc(sizeof(struct frp_coder), 1);
+	memcpy(enc, coder, sizeof(*coder));
+	enc->privilege_token = strdup(coder->privilege_token);
+	enc->salt 	= strdup(coder->salt);
+
+	return enc;
+}
+
+size_t 
+get_encrypt_block_size()
 {
 	return block_size;
 }

-struct frp_coder *init_main_encoder() 
+struct frp_coder *
+init_main_encoder() 
 {
-	struct common_conf *c_conf = get_common_config();
-	main_encoder = new_coder(c_conf->privilege_token, default_salt);
-	assert(main_encoder);
-	assert(main_encoder->key);
-
+	if (main_decoder) {
+		main_encoder = clone_coder(main_decoder);
+	} else {
+		struct common_conf *c_conf = get_common_config();
+		main_encoder = new_coder(c_conf->auth_token, default_salt);
+	}
 	return main_encoder;
 }

-struct frp_coder *init_main_decoder(unsigned char *iv)
+struct frp_coder *
+init_main_decoder(const uint8_t *iv)
 {
 	struct common_conf *c_conf = get_common_config();
-	main_decoder = new_coder(c_conf->privilege_token, default_salt);
-	assert(main_encoder);
-	assert(main_encoder->key);
+	main_decoder = new_coder(c_conf->auth_token, default_salt);
 	memcpy(main_decoder->iv, iv, block_size);
-
 	return main_decoder;
 }

-struct frp_coder *get_main_encoder() 
+struct frp_coder *
+get_main_encoder() 
 {
 	return main_encoder;
 }

-struct frp_coder *get_main_decoder()
+struct frp_coder *
+get_main_decoder()
 {
 	return main_decoder;
 }

-int is_encoder_inited()
+int 
+is_encoder_inited()
 {
 	struct frp_coder *e = get_main_encoder();
 	return e != NULL;
 }

-int is_decoder_inited()
+int 
+is_decoder_inited()
 {
 	struct frp_coder *d = get_main_decoder();
 	return d != NULL;
 }

-// 29 201 136 254 206 150 233 65 13 82 120 149 203 228 122 128 
 // key_ret buffer len must be 16
 // the result should be free after using
-unsigned char *encrypt_key(const char *token, size_t token_len, const char *salt) 
+unsigned char *
+encrypt_key(const char *token, size_t token_len, const char *salt, uint8_t *key, size_t block_size) 
 {
-	unsigned char *key_ret = calloc(block_size, 1);
+	unsigned char *key_ret = key;
 	fastpbkdf2_hmac_sha1((void *)token, 
 						token_len, (void *)salt, 
 						strlen(salt), 
 						64, 
 						(void *)key_ret, 
 						block_size);
-	
-	/* debug */
-#ifdef ENC_DEBUG
-	printf("encrypt_key = ");
-	int i = 0;
-	for(i=0; i<block_size; i++ ) {
-		printf("%u ", *(key_ret + i));
-	}
-
-	printf("\n");
-	/* debug end */
-#endif //ENC_DEBUG
-
-	if (! key_ret)
-		fprintf(stderr, "key result buffer not applied!\n");
-	
 	return key_ret;
 }

 // the result should be free after using
-unsigned char *encrypt_iv(unsigned char *iv_buf, size_t iv_len)
+unsigned char *
+encrypt_iv(unsigned char *iv_buf, size_t iv_len)
 {
 	if (iv_len < block_size || iv_buf == NULL) {
 		return NULL;
 	}

 	srand((unsigned int) time(NULL));
-	size_t i;
-	for(i=0; i<iv_len; i++) {
+	for(size_t i=0; i<iv_len; i++) {
 		iv_buf[i] = (rand() % 254 ) + 1;
 	}

@@ -137,145 +160,81 @@ unsigned char *encrypt_iv(unsigned char *iv_buf, size_t iv_len)
 }

 // using aes-128-cfb and nopadding
-size_t encrypt_data(const unsigned char *src_data, size_t srclen, struct frp_coder *encoder, unsigned char **ret)
+size_t 
+encrypt_data(const uint8_t *src_data, size_t srclen, struct frp_coder *encoder, unsigned char **ret)
 {
-	unsigned char *intext = calloc(srclen, 1);	// free in func
+	uint8_t *intext = (uint8_t *)src_data;
 	assert(intext);
-	memcpy(intext, src_data, srclen);
+	assert(encoder);
+	struct frp_coder *c = encoder;
+	int outlen = 0, tmplen = 0;
+	uint8_t *outbuf = NULL;
+	assert(c);

-	unsigned char *outbuf = calloc(srclen, 1);
+	outbuf = calloc(srclen, 1);
 	assert(outbuf);
 	*ret = outbuf;

-	int outlen = 0, tmplen = 0;
-	struct frp_coder *c = encoder;
-	EVP_CIPHER_CTX ctx;
-	EVP_CIPHER_CTX_init(&ctx);
-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cfb(), NULL, c->key, c->iv);
-	if(!EVP_EncryptUpdate(&ctx, outbuf, &outlen, intext, (int)srclen)) {
+	static EVP_CIPHER_CTX *ctx = NULL;
+	if (!ctx) {
+		ctx = EVP_CIPHER_CTX_new();
+		EVP_EncryptInit_ex(ctx, EVP_aes_128_cfb(), NULL, c->key, c->iv);
+	}
+
+	if(!EVP_EncryptUpdate(ctx, outbuf, &tmplen, intext, (int)srclen)) {
 		debug(LOG_ERR, "EVP_EncryptUpdate error!");
 		goto E_END;
 	}
-
-	if(!EVP_EncryptFinal_ex(&ctx, outbuf+outlen, &tmplen)) {
+	outlen += tmplen;
+	if(!EVP_EncryptFinal_ex(ctx, outbuf+tmplen, &tmplen)) {
 		debug(LOG_ERR, "EVP_EncryptFinal_ex error!");
 		goto E_END;
 	}

 	outlen += tmplen;
-	EVP_CIPHER_CTX_cleanup(&ctx);
-
-#ifdef ENC_DEBUG
-	int j = 0;
-	debug(LOG_DEBUG, "encoder iv=");
-	for (j=0; j<16; j++){
-		printf("%u ", (unsigned char)c->iv[j]) ;
-	}
-	printf("\n");
-
-	debug(LOG_DEBUG, "encoder KEY=");
-	for (j=0; j<16; j++){
-		printf("%u ", (unsigned char)c->key[j]);
-	}
-	printf("\n");
-
-	debug(LOG_DEBUG, "encoder result 10 =");
-	for (j = 0; j<outlen; j++) {
-		printf("%d ", (unsigned char)outbuf[j]);
-	}
-	printf("\n");
-#endif //ENC_DEBUG
-
 E_END:
-	free(intext);
 	return outlen;
 }

-size_t decrypt_data(const unsigned char *enc_data, size_t enc_len, struct frp_coder *decoder, unsigned char **ret)
+size_t 
+decrypt_data(const uint8_t *enc_data, size_t enclen, struct frp_coder *decoder, uint8_t **ret)
 {
-	unsigned char *inbuf = malloc(enc_len);
+	uint8_t *inbuf = (uint8_t *)enc_data;
+	uint8_t *outbuf = calloc(enclen+1, 1);
+	struct frp_coder *c = decoder;
 	assert(inbuf);
-	memcpy(inbuf, enc_data, enc_len);
-
-	unsigned char *outbuf = malloc(enc_len);
 	assert(outbuf);
 	*ret = outbuf;
-
+	assert(decoder);
+	
 	int outlen = 0, tmplen = 0;
-	struct frp_coder *c = decoder;
-	EVP_CIPHER_CTX ctx;
-	EVP_CIPHER_CTX_init(&ctx);
-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cfb(), NULL, c->key, c->iv);
-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
-
-	int loop_times = enc_len / 10;
-	int latest_len = enc_len % 10;
-	int i = 0;
-	int totol_len = 0;
-	int enc_per_len;
-	for(i=0; i<=loop_times; i++) {
-		if (i == loop_times) {
-			enc_per_len = latest_len;
-		} else {
-			enc_per_len = 10;
-		}
-
-		if(!EVP_DecryptUpdate(&ctx, outbuf + (i*10), &outlen, inbuf + (i*10), enc_per_len)) {
-			debug(LOG_ERR, "EVP_DecryptUpdate error!");
-			goto D_END;
-		}
-		totol_len += outlen;
+	static EVP_CIPHER_CTX *ctx= NULL;
+	if (!ctx) {
+		ctx= EVP_CIPHER_CTX_new();
+		EVP_DecryptInit_ex(ctx, EVP_aes_128_cfb(), NULL, c->key, c->iv);
 	}

+	if(!EVP_DecryptUpdate(ctx, outbuf, &tmplen, inbuf, enclen)) {
+		debug(LOG_ERR, "EVP_DecryptUpdate error!");
+		goto D_END;
+	}
+	outlen += tmplen;

-	if(!EVP_DecryptFinal_ex(&ctx, outbuf+totol_len, &tmplen)) {
+	if(!EVP_DecryptFinal_ex(ctx, outbuf+outlen, &tmplen)) {
 		debug(LOG_ERR, "EVP_DecryptFinal_ex error");
 		goto D_END;
 	}
-
-	totol_len += tmplen;
-	EVP_CIPHER_CTX_cleanup(&ctx);
-
-#ifdef ENC_DEBUG
-	debug(LOG_DEBUG, "DEC_LEN:%lu", enc_len);
-	int j = 0;
-	debug(LOG_DEBUG, "decoder IV=");
-	for (j=0; j<16; j++){
-		printf("%u ", (unsigned char)c->iv[j] );
-	}
-	printf("\n");
-
-	debug(LOG_DEBUG, "decoder KEY=");
-	for (j=0; j<16; j++){
-		printf("%u ", (unsigned char)c->key[j] );
-	}
-	printf("\n");
-
-	debug(LOG_DEBUG, "decoder source=");
-	for (j=0; j<enc_len; j++){
-		printf("%u ", (unsigned char)inbuf[j]);
-	}
-	printf("\n");
-
-	debug(LOG_DEBUG, "decoder result=");
-	for (j = 0; j<totol_len; j++) {
-		printf("%u ", (unsigned char)(*ret)[j]);
-	}
-	printf("\n");
-
-	debug(LOG_DEBUG, "decode string=%s", outbuf);
-#endif //ENC_DEBUG
+	outlen += tmplen;

 D_END:
-	return totol_len;
+	return outlen;
 }

-void free_encoder(struct frp_coder *encoder) {
+void 
+free_encoder(struct frp_coder *encoder) {
 	if (encoder) {
 		SAFE_FREE(encoder->privilege_token);
 		SAFE_FREE(encoder->salt);
-		SAFE_FREE(encoder->key);
-		SAFE_FREE(encoder->iv);
-		SAFE_FREE(encoder);
+		free(encoder);
 	}
 }
--- a/crypto.h
+++ b/crypto.h
@@ -1,3 +1,30 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file crypto.h
+    @brief xfrpc crypto header
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
+
 #ifndef _CRYPTO_H_
 #define _CRYPTO_H_

@@ -8,26 +35,25 @@
 #include "common.h"

 struct frp_coder {
-	unsigned char 	*key;
-	ushort 			key_len;
-	char 			*salt;
-	unsigned char 	*iv;
-	char 			*privilege_token;
+	uint8_t 	key[16];
+	char 		*salt;
+	uint8_t 	iv[16];
+	char 		*privilege_token;
 };

 size_t get_encrypt_block_size();
-size_t decrypt_data(const unsigned char *enc_data, size_t enc_len, struct frp_coder *decoder, unsigned char **ret);
+size_t decrypt_data(const uint8_t *enc_data, size_t enc_len, struct frp_coder *decoder, uint8_t **ret);
 int is_encoder_inited();
 int is_decoder_inited();
 struct frp_coder *init_main_encoder();
-struct frp_coder *init_main_decoder(unsigned char *iv);
+struct frp_coder *init_main_decoder(const uint8_t *iv);
 struct frp_coder *new_coder(const char *privilege_token, const char *salt);
-unsigned char *encrypt_key(const char *token, size_t token_len, const char *salt);
-unsigned char *encrypt_iv(unsigned char *iv_buf, size_t iv_len);
-size_t encrypt_data(const unsigned char *src_data, size_t srclen, struct frp_coder *encoder, unsigned char **ret);
+uint8_t *encrypt_key(const char *token, size_t token_len, const char *salt, uint8_t *key, size_t key_len);
+uint8_t *encrypt_iv(uint8_t *iv_buf, size_t iv_len);
+size_t encrypt_data(const uint8_t *src_data, size_t srclen, struct frp_coder *encoder, uint8_t **ret);
 struct frp_coder *get_main_encoder();
 struct frp_coder *get_main_decoder();
 size_t get_block_size();
 void free_encoder(struct frp_coder *encoder);

-#endif // _CRYPTO_H_
+#endif // _CRYPTO_H_
--- a/debug.c
+++ b/debug.c
@@ -34,6 +34,8 @@

 #include "debug.h"

+#define	PROGNAME	"xfrpc"
+
 debugconf_t debugconf = {
    .debuglevel = LOG_INFO,
    .log_stderr = 1,
@@ -46,7 +48,7 @@ Do not use directly, use the debug macro */
 void
 _debug(const char *filename, int line, int level, const char *format, ...)
 {
-    char buf[28];
+    char buf[32] = {0};
    va_list vlist;
    time_t ts;
    sigset_t block_chld;
@@ -75,7 +77,7 @@ _debug(const char *filename, int line, int level, const char *format, ...)
        }

        if (debugconf.log_syslog) {
-            openlog("wifidog", LOG_PID, debugconf.syslog_facility);
+            openlog(PROGNAME, LOG_PID, debugconf.syslog_facility);
            va_start(vlist, format);
            vsyslog(level, format, vlist);
            va_end(vlist);
--- a/debug.h
+++ b/debug.h
@@ -28,6 +28,7 @@
 #define _WIFIDOG_DEBUG_H_

 #include <string.h>
+#include <syslog.h>

 #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)

--- a/frame.c
+++ b/frame.c
@@ -1,70 +0,0 @@
-#include "frame.h"
-#include "session.h"
-#include "version.h"
-#include "common.h"
-
-const static int  	size_of_ver = 1;
-const static int  	size_of_cmd = 1;
-const static int  	size_of_length = 2;
-const static int  	size_of_sid = 4;
-const static char 	version = 1;
-
-int get_header_size() {
-	return size_of_ver + size_of_cmd + size_of_length + size_of_sid;
-}
-
-struct frame *new_frame(char cmd, uint32_t sid) {
-	struct frame *f = calloc(sizeof(struct frame), 1);
-	if (f != NULL) {
-		f->ver = version;
-		f->cmd = cmd;
-		f->sid = sid;
-		f->len = 0;
-		f->data = NULL;
-	}
-
-	return f;
-}
-
-// f->len is rawed in this func
-struct frame *raw_frame(unsigned char *buf, const size_t buf_len)
-{
-	int header_size = get_header_size();
-	if (buf_len < header_size) {
-		return NULL;
-	}
-	char ver = buf[VERI];
-	char cmd = buf[CMDI];
-	uint32_t sid = htonl(*(uint32_t *)(buf + SIDI));
-
-	struct frame *f = new_frame(cmd, sid);
-	f->ver = ver;
-	f->len = *(ushort *)(buf + LENI);
-	f->data = buf_len > header_size ? (unsigned char *)(buf + header_size) : NULL;
-
-	return f;
-}
-
-struct frame *raw_frame_only_msg(unsigned char *buf, const size_t buf_len)
-{
-	struct frame *f = new_frame(0, 0);
-	f->ver = CLIENT_V;
-	f->len = (ushort)buf_len;
-	f->data = buf;
-
-	return f;
-}
-
-void set_frame_cmd(struct frame *f, char cmd) 
-{
-	f->cmd = cmd;
-}
-
-void set_frame_len(struct frame *f, ushort data_len)
-{
-	f->len = data_len;
-}
-
-void free_frame(struct frame *f) {
-	SAFE_FREE(f);
-}
--- a/frame.h
+++ b/frame.h
@@ -1,40 +0,0 @@
-#ifndef	_FRAME_H_
-#define	_FRAME_H_
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "uthash.h"
-#include "common.h"
-
-#define VERI 0
-#define CMDI 1
-#define LENI 2
-#define SIDI 4
-#define DATAI 8
-
-// cmds
-enum cmd_type {
-	cmdSYN  = 0, 		// stream open
-	cmdFIN,             // stream close, a.k.a EOF mark
-	cmdPSH,             // data push
-	cmdNOP,             // no operation
-};
-
-struct frame {
-	char ver;
-	char cmd;
-	ushort len;
-	uint32_t sid;
-	unsigned char *data;
-};
-
-struct frame *new_frame(char cmd, uint32_t sid);
-int get_header_size();
-struct frame *raw_frame(unsigned char *buf, const size_t buf_len);
-struct frame *raw_frame_only_msg(unsigned char *buf, const size_t buf_len);
-void set_frame_cmd(struct frame *f, char cmd);
-void set_frame_len(struct frame *f, ushort data_len);
-void free_frame(struct frame *f);
-
-#endif //_FRAME_H_
--- a/install_manifest.txt
+++ b/install_manifest.txt
@@ -1,2 +0,0 @@
-/usr/bin/xfrpc
-/usr/bin/xfrp_test_server
--- a/login.c
+++ b/login.c
@@ -1,3 +1,29 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file login.c
+    @brief xfrpc login protocol implemented
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,6 +41,7 @@
 #include "msg.h"
 #include "version.h"
 #include "login.h"
+#include "utils.h"

 static struct login 		*c_login;

@@ -37,12 +64,12 @@ void init_login()
 {
 	if (! c_login) 
 		c_login = calloc(sizeof(struct login), 1);
-		
+
 	assert(c_login);

 	struct common_conf *c_conf = get_common_config();
 	assert(c_conf);
-	
+
 	struct utsname uname_buf;
 	if (uname(&uname_buf)) {
 		return;
@@ -59,11 +86,33 @@ void init_login()

 	c_login->timestamp 		= 0;
 	c_login->run_id 		= NULL;
+	c_login->metas			= NULL;
 	c_login->pool_count 	= 1;
 	c_login->privilege_key 	= NULL;
 	c_login->user			= c_conf->user;

 	c_login->logged 		= 0;
+
+	/* start to init login->run_id */
+	char ifname[16] = {0};
+	if(get_net_ifname(ifname, 16)){
+		debug(LOG_ERR, "error: get device sign ifname failed!");
+		exit(0);
+	}
+
+	if (strcmp(ifname, "br-lan") == 0) {
+		c_conf->is_router = 1;
+		debug(LOG_DEBUG, "working in router");
+	}
+
+	char if_mac[64] = {0};
+	if(get_net_mac(ifname, if_mac, sizeof(if_mac))) {
+		debug(LOG_ERR, "error: Hard ware MAC address of [%s] get failed!", ifname);
+		exit(0);
+	}
+
+	c_login->run_id = strdup(if_mac);
+	assert(c_login->run_id);
 }

 int login_resp_check(struct login_resp *lr)
@@ -86,4 +135,4 @@ int login_resp_check(struct login_resp *lr)
 	}

 	return c_login->logged;
-}
+}
--- a/login.h
+++ b/login.h
@@ -1,3 +1,29 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file login.h
+    @brief xfrp login header
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
 #ifndef _LOGIN_H_
 #define _LOGIN_H_

@@ -17,6 +43,7 @@ struct login {
 	char 		*privilege_key;
 	long int 	timestamp;
 	char 		*run_id;
+	char		*metas;
 	int 		pool_count;

 	/* fields not need json marshal */
@@ -35,4 +62,4 @@ struct login *get_common_login_config();
 int is_logged();
 int login_resp_check(struct login_resp *lr);

-#endif //_LOGIN_H_
+#endif //_LOGIN_H_
--- a/main.c
+++ b/main.c
@@ -21,7 +21,7 @@

 /** @file main.c
    @brief xfrp client main
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #include "xfrpc.h"
--- a/msg.c
+++ b/msg.c
@@ -20,14 +20,13 @@
 \********************************************************************/

 /** @file msg.c
-    @brief xfrp client msg related
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @brief xfrpc client msg related
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #include <string.h>
 #include <stdio.h>
 #include <json-c/json.h>
-#include <json-c/bits.h>
 #include <openssl/md5.h>
 #include <time.h>
 #include <assert.h>
@@ -37,11 +36,11 @@
 #include "msg.h"
 #include "const.h"
 #include "config.h"
-#include "frame.h"
 #include "debug.h"
 #include "common.h"
 #include "login.h"
 #include "client.h"
+#include "utils.h"

 #define JSON_MARSHAL_TYPE(jobj,key,jtype,item)		\
 json_object_object_add(jobj, key, json_object_new_##jtype((item)));
@@ -49,10 +48,19 @@ json_object_object_add(jobj, key, json_object_new_##jtype((item)));
 #define SAFE_JSON_STRING(str_target) \
 str_target?str_target:"\0"

-const char msg_typs[] = {TypeLogin, TypeLoginResp, TypeNewProxy, TypeNewProxyResp, 
-	TypeNewWorkConn, TypeReqWorkConn, TypeStartWorkConn, TypePing, TypePong, TypeUdpPacket};
+const char msg_types[] = {TypeLogin, 
+						 TypeLoginResp, 
+						 TypeNewProxy, 
+						 TypeNewProxyResp, 
+						 TypeNewWorkConn, 
+						 TypeReqWorkConn, 
+						 TypeStartWorkConn, 
+						 TypePing, 
+						 TypePong, 
+						 TypeUDPPacket};

-char *calc_md5(const char *data, int datalen)
+char *
+calc_md5(const char *data, int datalen)
 {
 	unsigned char digest[16] = {0};
 	char *out = (char*)malloc(33);
@@ -71,7 +79,8 @@ char *calc_md5(const char *data, int datalen)
    return out;
 }

-static void fill_custom_domains(struct json_object *j_ctl_req, const char *custom_domains)
+static void 
+fill_custom_domains(struct json_object *j_ctl_req, const char *custom_domains)
 {
 	struct json_object *jarray_cdomains = json_object_new_array();
 	assert(jarray_cdomains);
@@ -80,7 +89,14 @@ static void fill_custom_domains(struct json_object *j_ctl_req, const char *custo
 	char *tok = tmp, *end = tmp;
 	while (tok != NULL) {
 		strsep(&end, ",");
-		json_object_array_add(jarray_cdomains, json_object_new_string(tok));
+
+		int dname_len = strlen(tok) + 1;
+		char *dname_buf = (char *)calloc(1, dname_len);
+		assert(dname_buf);
+		dns_unified(tok, dname_buf, dname_len);
+		json_object_array_add(jarray_cdomains, json_object_new_string(dname_buf));
+
+		free(dname_buf);
 		tok = end;
 	}
 	SAFE_FREE(tmp);
@@ -88,27 +104,18 @@ static void fill_custom_domains(struct json_object *j_ctl_req, const char *custo
 	json_object_object_add(j_ctl_req, "custom_domains", jarray_cdomains);
 }

-// NEED FREE
-struct message *new_message() {
-	struct message *msg = calloc(1, sizeof(struct message)); //TODO: FREE
-	if (msg)
-	{
-		msg->data_p = NULL;
-		msg->data_len = 0;
-	}
-
-	return msg;
-}
-
-struct work_conn *new_work_conn() {
+struct work_conn *
+new_work_conn() {
 	struct work_conn *work_c = calloc(1, sizeof(struct work_conn));
+	assert(work_c);
 	if (work_c) 
 		work_c->run_id = NULL;

 	return work_c;
 }

-char *get_auth_key(const char *token, long int *timestamp)
+char *
+get_auth_key(const char *token, long int *timestamp)
 {
 	char seed[128] = {0};
 	*timestamp = time(NULL);
@@ -120,11 +127,12 @@ char *get_auth_key(const char *token, long int *timestamp)
 	return calc_md5(seed, strlen(seed));
 }

-size_t login_request_marshal(char **msg)
+size_t 
+login_request_marshal(char **msg)
 {
 	size_t nret = 0;
 	struct json_object *j_login_req = json_object_new_object();
-	if (is_error(j_login_req))
+	if (j_login_req == NULL)
 		return 0;
 	
 	struct login *lg = get_common_login_config();
@@ -133,7 +141,7 @@ size_t login_request_marshal(char **msg)
 	
 	SAFE_FREE(lg->privilege_key);
 	struct common_conf *cf = get_common_config();
-	char *auth_key = get_auth_key(cf->privilege_token, &lg->timestamp);
+	char *auth_key = get_auth_key(cf->auth_token, &lg->timestamp);
 	lg->privilege_key = strdup(auth_key);
 	assert(lg->privilege_key);
 	
@@ -147,7 +155,8 @@ size_t login_request_marshal(char **msg)
 	JSON_MARSHAL_TYPE(j_login_req, "timestamp", int64, lg->timestamp);
 	JSON_MARSHAL_TYPE(j_login_req, "run_id", string, SAFE_JSON_STRING(lg->run_id));
 	JSON_MARSHAL_TYPE(j_login_req, "pool_count", int, lg->pool_count);
-
+	json_object_object_add(j_login_req, "metas", NULL);
+	
 	const char *tmp = NULL;
 	tmp = json_object_to_json_string(j_login_req);
 	if (tmp && strlen(tmp) > 0) {
@@ -160,7 +169,8 @@ size_t login_request_marshal(char **msg)
 	return nret;
 }

-int new_proxy_service_marshal(const struct proxy_service *np_req, char **msg)
+int 
+new_proxy_service_marshal(const struct proxy_service *np_req, char **msg)
 {
 	const char *tmp = NULL;
 	int  nret = 0;
@@ -172,7 +182,6 @@ int new_proxy_service_marshal(const struct proxy_service *np_req, char **msg)
 	JSON_MARSHAL_TYPE(j_np_req, "proxy_type", string, np_req->proxy_type);
 	JSON_MARSHAL_TYPE(j_np_req, "use_encryption", boolean, np_req->use_encryption);
 	JSON_MARSHAL_TYPE(j_np_req, "use_compression", boolean, np_req->use_compression);
-	JSON_MARSHAL_TYPE(j_np_req, "remote_port", int, np_req->remote_port);

 	if (is_ftp_proxy(np_req)) {
 		JSON_MARSHAL_TYPE(j_np_req, "remote_data_port", int, np_req->remote_data_port);
@@ -180,8 +189,14 @@ int new_proxy_service_marshal(const struct proxy_service *np_req, char **msg)

 	if (np_req->custom_domains) {
 		fill_custom_domains(j_np_req, np_req->custom_domains);
+		json_object_object_add(j_np_req, "remote_port", NULL);
 	} else {
 		json_object_object_add(j_np_req, "custom_domains", NULL);
+		if (np_req->remote_port != -1) {
+			JSON_MARSHAL_TYPE(j_np_req, "remote_port", int, np_req->remote_port);
+		} else {
+			json_object_object_add(j_np_req, "remote_port", NULL);
+		}
 	}

 	JSON_MARSHAL_TYPE(j_np_req, "subdomain", string, SAFE_JSON_STRING(np_req->subdomain));
@@ -208,7 +223,8 @@ int new_proxy_service_marshal(const struct proxy_service *np_req, char **msg)
 	return nret;
 }

-int new_work_conn_marshal(const struct work_conn *work_c, char **msg)
+int 
+new_work_conn_marshal(const struct work_conn *work_c, char **msg)
 {
 	const char *tmp = NULL;
 	int nret = 0;
@@ -229,11 +245,55 @@ int new_work_conn_marshal(const struct work_conn *work_c, char **msg)
 	return nret;
 }

+// result returned of this func need be free
+struct new_proxy_response *
+new_proxy_resp_unmarshal(const char *jres)
+{
+	struct json_object *j_np_res = json_tokener_parse(jres);
+	if (j_np_res == NULL)
+		return NULL;
+	
+	struct new_proxy_response *npr = calloc(1, sizeof(struct new_proxy_response));
+	assert(npr);
+
+	struct json_object *npr_run_id = NULL;
+	if (json_object_object_get_ex(j_np_res, "run_id", &npr_run_id))
+		npr->run_id = strdup(json_object_get_string(npr_run_id));
+
+	struct json_object *npr_proxy_remote_addr = NULL;
+	if (! json_object_object_get_ex(j_np_res, "remote_addr", &npr_proxy_remote_addr))
+		goto END_ERROR;
+	const char *remote_addr = json_object_get_string(npr_proxy_remote_addr);
+	char *port = strrchr(remote_addr, ':');
+	if (port) {
+		port++;
+		npr->remote_port = atoi(port);
+	}else
+		goto END_ERROR;
+
+	struct json_object *npr_proxy_name = NULL;
+	if (! json_object_object_get_ex(j_np_res, "proxy_name", &npr_proxy_name))
+		goto END_ERROR;
+	npr->proxy_name = strdup(json_object_get_string(npr_proxy_name));
+	assert(npr->proxy_name);
+
+	struct json_object *npr_error = NULL;
+	if(! json_object_object_get_ex(j_np_res, "error", &npr_error))
+		goto END_ERROR;
+	npr->error = strdup(json_object_get_string(npr_error));
+	assert(npr->error);
+
+END_ERROR:
+	json_object_put(j_np_res);
+	return npr;
+}
+
 // login_resp_unmarshal NEED FREE
-struct login_resp *login_resp_unmarshal(const char *jres)
+struct login_resp *
+login_resp_unmarshal(const char *jres)
 {
 	struct json_object *j_lg_res = json_tokener_parse(jres);
-	if (is_error(j_lg_res))
+	if (j_lg_res == NULL)
 		return NULL;
 	
 	struct login_resp *lr = calloc(1, sizeof(struct login_resp));
@@ -262,10 +322,11 @@ END_ERROR:
 	return lr;
 }

-struct start_work_conn_resp *start_work_conn_resp_unmarshal(const char *resp_msg)
+struct start_work_conn_resp *
+start_work_conn_resp_unmarshal(const char *resp_msg)
 {
 	struct json_object *j_start_w_res = json_tokener_parse(resp_msg);
-	if (is_error(j_start_w_res))
+	if (j_start_w_res == NULL)
 		return NULL;

 	struct start_work_conn_resp *sr = calloc(1, sizeof(struct start_work_conn_resp));
@@ -283,10 +344,11 @@ START_W_C_R_END:
 	return sr;
 }

-struct control_response *control_response_unmarshal(const char *jres)
+struct control_response *
+control_response_unmarshal(const char *jres)
 {
 	struct json_object *j_ctl_res = json_tokener_parse(jres);
-	if (is_error(j_ctl_res))
+	if (j_ctl_res == NULL)
 		return NULL;
 	struct control_response *ctl_res = calloc(sizeof(struct control_response), 1);
 	assert(ctl_res);
@@ -312,7 +374,8 @@ END_ERROR:
 	return ctl_res;
 }

-void control_response_free(struct control_response *res)
+void 
+control_response_free(struct control_response *res)
 {
 	if (!res)
 		return;
@@ -321,60 +384,21 @@ void control_response_free(struct control_response *res)
 	SAFE_FREE(res);
 }

-int msg_type_valid_check(char msg_type)
+int 
+msg_type_valid_check(char msg_type)
 {
 	int i = 0;
-	for(i = 0; i<(sizeof(msg_typs) / sizeof(*msg_typs)); i++) {
-		if (msg_typs[i] == msg_type)
+	for(i = 0; i<(sizeof(msg_types) / sizeof(*msg_types)); i++) {
+		if (msg_types[i] == msg_type)
 			return 1;
 	}

 	return 0;
 }

-// only handle recved message with right message type 
-struct message *unpack(unsigned char *recv_msg, const ushort len)
+char *
+get_msg_type(uint8_t type) 
 {
-	struct message *msg = new_message();
-	msg->type = *(recv_msg + MSG_TYPE_I);
-
-	if (! msg_type_valid_check(msg->type) ) {
-		debug(LOG_ERR, "message recved type is invalid!");
-		return NULL;
-	}
-
-	msg_size_t  data_len_bigend;
-	data_len_bigend = *(msg_size_t *)(recv_msg + MSG_LEN_I);
-	msg->data_len = msg_ntoh(data_len_bigend);
-
-	if (msg->data_len > 0) {
-		msg->data_p = calloc(msg->data_len + 1, 1);
-		assert(msg->data_p);
-		
-		memcpy(msg->data_p, recv_msg + MSG_DATA_I, msg->data_len);
-	}
-	
-	return msg;
+	return NULL;
 }

-size_t pack(struct message *req_msg, unsigned char **ret_buf)
-{
-	int endian_check = 1;
-	// little endian if true
-
-	msg_size_t data_len_bigend;
-	if(*(char *)&endian_check == 1)
-		data_len_bigend = msg_hton(req_msg->data_len);
-	else 
-		data_len_bigend = req_msg->data_len;
-
-	size_t buf_len = TYPE_LEN + sizeof(data_len_bigend) + req_msg->data_len;
-	*ret_buf = calloc(1, buf_len);
-	assert(*ret_buf);
-
-	*(*ret_buf + MSG_TYPE_I) = req_msg->type;
-	*(msg_size_t *)(*ret_buf + MSG_LEN_I) = data_len_bigend;
-	memcpy((char *)*ret_buf+TYPE_LEN+sizeof(data_len_bigend), req_msg->data_p, req_msg->data_len);
-
-	return buf_len;
-}
--- a/msg.h
+++ b/msg.h
@@ -20,8 +20,8 @@
 \********************************************************************/

 /** @file msg.h
-    @brief xfrp msg struct
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @brief xfrpc msg struct
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #ifndef _MSG_H_
@@ -40,41 +40,56 @@

 #define MSG_TYPE_I 	0
 #define MSG_LEN_I 	1
-#define MSG_DATA_I	5
+#define MSG_DATA_I	9

 // msg_type match frp v0.10.0
 enum msg_type {
-	TypeLogin         = 'o',
-	TypeLoginResp     = '1',
-	TypeNewProxy      = 'p',
-	TypeNewProxyResp  = '2',
-	TypeNewWorkConn   = 'w',
-	TypeReqWorkConn   = 'r',
-	TypeStartWorkConn = 's',
-	TypePing          = 'h',
-	TypePong          = '4',
-	TypeUdpPacket     = 'u',
+	TypeLogin                 = 'o',
+	TypeLoginResp             = '1',
+	TypeNewProxy              = 'p',
+	TypeNewProxyResp          = '2',
+	TypeCloseProxy            = 'c',
+	TypeNewWorkConn           = 'w',
+	TypeReqWorkConn           = 'r',
+	TypeStartWorkConn         = 's',
+	TypeNewVisitorConn        = 'v',
+	TypeNewVisitorConnResp    = '3',
+	TypePing                  = 'h',
+	TypePong                  = '4',
+	TypeUDPPacket             = 'u',
+	TypeNatHoleVisitor        = 'i',
+	TypeNatHoleClient         = 'n',
+	TypeNatHoleResp           = 'm',
+	TypeNatHoleClientDetectOK = 'd',
+	TypeNatHoleSid            = '5',
 };

 struct general_response {
-	int		code;
+	int	code;
 	char	*msg;
 };

 struct control_response {
-	int		type;
-	int		code;
+	int	type;
+	int	code;
 	char	*msg;
 };

+struct new_proxy_response {
+	char 	*run_id;
+	char 	*proxy_name;
+	char	*error;
+	int	remote_port;
+};
+
 struct work_conn {
 	char *run_id;
 };

-struct message {
-	char 	type;
-	char	*data_p;
-	size_t	data_len;
+struct __attribute__((__packed__)) msg_hdr {
+	char		type;
+	uint64_t	length;
+	uint8_t		data[];
 };

 struct start_work_conn_resp {
@@ -83,14 +98,12 @@ struct start_work_conn_resp {

 int new_proxy_service_marshal(const struct proxy_service *np_req, char **msg);
 int msg_type_valid_check(char msg_type);
-struct message *new_message();
 char *calc_md5(const char *data, int datalen);
 char *get_auth_key(const char *token, long int *timestamp);
 size_t login_request_marshal(char **msg);
-size_t pack(struct message *req_msg, unsigned char **ret_buf);
-struct message *unpack(unsigned char *recv_msg, const ushort len);

 // tranlate control request to json string
+struct new_proxy_response *new_proxy_resp_unmarshal(const char *jres);
 struct login_resp *login_resp_unmarshal(const char *jres);
 struct start_work_conn_resp *start_work_conn_resp_unmarshal(const char *resp_msg);

@@ -101,4 +114,6 @@ int new_work_conn_marshal(const struct work_conn *work_c, char **msg);

 void control_response_free(struct control_response *res);

-#endif //_MSG_H_
+char *get_msg_type(uint8_t type);
+
+#endif //_MSG_H_
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2022 Dengfeng Liu
+#
+# This is free software, licensed under the GNU General Public License v3.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xfrpc
+PKG_VERSION:=master
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/liudf0716/xfrpc.git
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_MIRROR_HASH:=a7141da8a85203d8341fd6d2551f1228396ae54aace6ec0bad2dfeb89e0a377d
+
+PKG_MAINTAINER:=Dengfeng Liu <liudf0716@gmail.com>
+PKG_LICENSE:=GPL-3.0-or-later
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/xfrpc
+  SUBMENU:=Web Servers/Proxies
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+zlib +libjson-c +libevent2 +libevent2-openssl
+  TITLE:= C language fast reverse proxy client
+  URL:=https://github.com/liudf0716/xfrpc
+endef
+
+define Package/xfrpc/description
+  xfrpc is C language fast reverse proxy client
+  compare with golang version frpc
+  xfrpc can run in almost all openwrt device
+endef
+
+define Package/xfrpc/conffiles
+/etc/config/xfrpc
+endef
+
+define Package/xfrpc/install
+        $(INSTALL_DIR) $(1)/usr/bin
+        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xfrpc $(1)/usr/bin/xfrpc
+        $(INSTALL_DIR) $(1)/etc/init.d
+        $(INSTALL_BIN) ./files/xfrpc.init $(1)/etc/init.d/xfrpc
+        $(INSTALL_DIR) $(1)/etc/config
+        $(CP) ./files/xfrpc.conf $(1)/etc/config/xfrpc
+endef
+
+$(eval $(call BuildPackage,xfrpc))
--- a/openwrt/files/xfrpc.conf
+++ b/openwrt/files/xfrpc.conf
@@ -0,0 +1,26 @@
+config xfrp 'init'
+	option disabled 1
+	option loglevel 7
+
+config xfrpc 'common'
+	option server_addr 127.0.0.1
+	option server_port 7000
+	option token abdesf13d
+
+config xfrpc 'ssh01'
+	option type tcp
+	option local_ip 127.0.0.1
+	option local_port 22
+	option remote_port 6000
+	
+#config xfrpc 'web01'
+#	option type http
+#	option local_ip 127.0.0.1
+#	option local_port 8080
+#	option custom_domains yourdomain
+	
+#config xfrpc 'web02'
+#	option type https
+#	option local_ip 127.0.0.1
+#	option local_port 8443
+#	option custom_domains yourdomain
--- a/openwrt/files/xfrpc.init
+++ b/openwrt/files/xfrpc.init
@@ -0,0 +1,93 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2022 Dengfeng Liu <liu_df@qq.com>
+#
+# This is free software, licensed under the GNU General Public License v3.
+# See /LICENSE for more information.
+#
+
+START=99
+USE_PROCD=1
+
+NAME=xfrpc
+PROG=/usr/bin/$NAME
+
+
+handle_xfrpc() {
+	local name="$1"
+	local config="$2"
+
+	echo "[$name]" >> "$config"
+
+	handle_type() {
+		uci_validate_section xfrpc xfrpc "$name" \
+				'type:or("tcp", "udp", "ftp", "http", "https")' \
+				'local_ip:ipaddr:127.0.0.1' \
+				'local_port:uinteger'
+
+		echo "type = $type" >> "$config"
+		echo "local_ip = $local_ip" >> "$config"
+		echo "local_port = $local_port" >> "$config"
+		case "$type" in
+		"tcp"|"udp")
+			config_get remote_port "$name" remote_port
+			echo "remote_port = $remote_port" >> "$config"
+			;;
+		"ftp")
+			config_get remote_port "$name" remote_port
+			config_get remote_data_port "$name" remote_data_port
+			echo "remote_port = $remote_port" >> "$config"
+			echo "remote_data_port = $remote_data_port" >> "$config"
+			;;
+		esac
+	}
+
+	if [ "$name" = "common" ]; then
+		uci_validate_section xfrpc xfrpc "$name" \
+				'server_addr:ipaddr' \
+				'server_port:uinteger' \
+				'token:string'
+
+		[ -z "$token" ] && {
+			echo "no token"
+			exit
+		}
+		echo "server_addr = $server_addr" >> "$config"
+		echo "server_port = $server_port" >> "$config"
+		echo "token = $token" >> "$config"
+	else
+		handle_type
+	fi
+}
+
+service_triggers() {
+	procd_add_reload_trigger "$NAME"
+}
+
+start_service() {
+	local conf_file="/var/etc/$NAME.ini"
+
+	> "$conf_file"
+	config_load "$NAME"
+
+	uci_validate_section xfrpc xfrpc init \
+			'disabled:bool:1' \
+			'loglevel:uinteger:0'
+
+	if [ $disabled = 1 ]; then
+		echo "xfrpc service disabled"
+		return
+	fi
+
+	config_foreach handle_xfrpc xfrpc "$conf_file"
+
+	procd_open_instance
+	procd_set_param command "$PROG" -c "$conf_file" -f -d $loglevel
+	procd_set_param file "$conf_file"
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
--- a/proxy.c
+++ b/proxy.c
@@ -1,3 +1,29 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file proxy.c
+    @brief xfrp proxy implemented
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
@@ -8,10 +34,6 @@
 #include <errno.h>
 #include <syslog.h>

-#include <event2/bufferevent.h>
-#include <event2/buffer.h>
-#include <event2/listener.h>
-#include <event2/event.h>

 #include "debug.h"
 #include "uthash.h"
@@ -19,7 +41,8 @@
 #include "proxy.h"
 #include "config.h"

-struct proxy *new_proxy_buf(struct bufferevent *bev)
+struct proxy *
+new_proxy_obj(struct bufferevent *bev)
 {
 	struct proxy *p = (struct proxy *)calloc(1, sizeof(struct proxy));
 	assert(p);
@@ -29,8 +52,9 @@ struct proxy *new_proxy_buf(struct bufferevent *bev)
 	return p;
 }

-void free_proxy(struct proxy *p)
+void 
+free_proxy_obj(struct proxy *p)
 {
 	SAFE_FREE(p->proxy_name);
 	SAFE_FREE(p);
-}
+}
--- a/proxy.h
+++ b/proxy.h
@@ -1,3 +1,29 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file proxy.h
+    @brief xfrp proxy header file
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
 #ifndef _PROXY_H_
 #define _PROXY_H_

@@ -29,8 +55,8 @@ void tcp_proxy_c2s_cb(struct bufferevent *bev, void *ctx);
 void tcp_proxy_s2c_cb(struct bufferevent *bev, void *ctx);
 void ftp_proxy_c2s_cb(struct bufferevent *bev, void *ctx);
 void ftp_proxy_s2c_cb(struct bufferevent *bev, void *ctx);
-struct proxy *new_proxy_buf(struct bufferevent *bev);
-void free_proxy(struct proxy *p);
+struct proxy *new_proxy_obj(struct bufferevent *bev);
+void free_proxy_obj(struct proxy *p);
 void set_ftp_data_proxy_tunnel(const char *ftp_proxy_name, 
 								struct ftp_pasv *local_fp, 
 								struct ftp_pasv *remote_fp);
--- a/proxy_ftp.c
+++ b/proxy_ftp.c
@@ -101,7 +101,12 @@ void ftp_proxy_c2s_cb(struct bufferevent *bev, void *ctx)
 		struct ftp_pasv *r_fp = new_ftp_pasv();
 		r_fp->code = local_fp->code;

-		strncpy(r_fp->ftp_server_ip, c_conf->server_addr, IP_LEN);
+		if (! c_conf->server_ip) {
+			debug(LOG_ERR, "error: FTP proxy without server ip!");
+			exit(0);
+		}
+
+		strncpy(r_fp->ftp_server_ip, c_conf->server_ip, IP_LEN);
 		r_fp->ftp_server_port = p->remote_data_port;

 		if (r_fp->ftp_server_port <= 0) {
@@ -117,6 +122,10 @@ void ftp_proxy_c2s_cb(struct bufferevent *bev, void *ctx)
 			goto FTP_C2S_CB_END;
 		}

+#ifdef FTP_P_DEBUG
+		debug(LOG_DEBUG, "ftp pack result:%s", pasv_msg);
+#endif //FTP_P_DEBUG
+
 		set_ftp_data_proxy_tunnel(p->proxy_name, local_fp, r_fp);
 		evbuffer_add(dst, pasv_msg, pack_len);
 		SAFE_FREE(pasv_msg);
--- a/proxy_tcp.c
+++ b/proxy_tcp.c
@@ -1,3 +1,29 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file proxy_tcp.c
+    @brief xfrp proxy tcp implemented
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
@@ -7,6 +33,7 @@
 #include <netinet/in.h>
 #include <errno.h>
 #include <syslog.h>
+#include <unistd.h>

 #include <event2/bufferevent.h>
 #include <event2/buffer.h>
@@ -17,28 +44,60 @@
 #include "uthash.h"
 #include "common.h"
 #include "proxy.h"
+#include "config.h"
+#include "tcpmux.h"

-// read from client-working host port
+#define	BUF_LEN	4096
+
+// read data from local service
 void tcp_proxy_c2s_cb(struct bufferevent *bev, void *ctx)
 {
-	struct proxy *p = (struct proxy *)ctx;
-	struct bufferevent *partner = p?p->bev:NULL;
-	struct evbuffer *src, *dst;
-	size_t len;
-	src = bufferevent_get_input(bev);
-	len = evbuffer_get_length(src);
-	if (len > 0) {
-		dst = bufferevent_get_output(partner);
-		evbuffer_add_buffer(dst, src);	
+	struct common_conf  *c_conf = get_common_config();
+	struct proxy_client *client = (struct proxy_client *)ctx;
+	assert(client);
+	struct bufferevent *partner = client->ctl_bev;
+	assert(partner);
+	struct evbuffer *src = bufferevent_get_input(bev);
+	size_t len = evbuffer_get_length(src);
+	assert(len > 0);
+	if (!c_conf->tcp_mux) {
+		struct evbuffer *dst = bufferevent_get_output(partner);
+		evbuffer_add_buffer(dst, src);
+		return;
+	}
+
+	if (client->send_window == 0) {
+		debug(LOG_DEBUG, "client %d recv len %d exceed send windows: %d", client->stream_id, len, client->send_window);
+		bufferevent_disable(bev, EV_READ);
+		return;
+	} else {
+		len = client->send_window>=len?len:client->send_window;
+		client->send_window -= len;
+	}
+
+	tcp_mux_send_data(partner, client->stream_id, len);
+	uint8_t buf[BUF_LEN];
+	while(len > 0) {
+		memset(buf, 0, BUF_LEN);
+		int nread = bufferevent_read(bev, buf, len>BUF_LEN?BUF_LEN:len);
+		assert(nread >= 0);
+		bufferevent_write(partner, buf, nread);
+		len -= nread;
 	}
 }

+// read data from frps
+// when tcp mux enable this function will not be used
 void tcp_proxy_s2c_cb(struct bufferevent *bev, void *ctx)
 {
-	struct proxy *p = (struct proxy *)ctx;
-	struct bufferevent *partner = p?p->bev:NULL;
+	struct proxy_client *client = (struct proxy_client *)ctx;
+	assert(client);
+	struct bufferevent *partner = client->local_proxy_bev;
+	assert(partner);
 	struct evbuffer *src, *dst;
 	src = bufferevent_get_input(bev);
+	size_t len = evbuffer_get_length(src);
+	assert(len > 0);
 	dst = bufferevent_get_output(partner);
 	evbuffer_add_buffer(dst, src);
-}
+}
--- a/session.c
+++ b/session.c
@@ -1,52 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <syslog.h>
-
-#include "uthash.h"
-#include "session.h"
-#include "version.h"
-#include "debug.h"
-#include "frame.h"
-
-uint32_t *sid_index = NULL;
-
-// need free
-uint32_t *init_sid_index()
-{
-	if (NULL == sid_index) {
-		sid_index = (uint32_t *)calloc(1, sizeof(uint32_t));
-		if (NULL == sid_index)
-			return sid_index;
-
-#ifdef CLIENT_V
-		*sid_index = 1;
-#elif SERVER
-		*sid_index = 0;
-#endif
-	}
-
-	*sid_index += 2;	//xfrp client session id start from 3
-	return sid_index;
-}
-
-uint32_t get_current_sid_index()
-{
-	if (NULL == sid_index) {
-		return *init_sid_index();
-	}
-
-	return *sid_index;
-}
-
-uint32_t new_sid()
-{
-	if (NULL == sid_index) {
-		init_sid_index();
-		return get_current_sid_index();
-	}
-
-	*sid_index += 2;
-	return *sid_index;
-}
--- a/session.h
+++ b/session.h
@@ -1,11 +0,0 @@
-#ifndef _SESSION_H_
-#define _SESSION_H_
-
-#include "uthash.h"
-#include "common.h"
-
-uint32_t *init_sid_index();
-uint32_t get_current_sid_index();
-uint32_t new_sid();
-
-#endif //_SESSION_H_
--- a/systemd/xfrpc.service
+++ b/systemd/xfrpc.service
@@ -0,0 +1,16 @@
+# 1. put xfrpc and xfrpc.ini under /usr/local/xfrpc/
+# 2. put this file (xfrpc.service) at /etc/systemd/system
+# 3. run `sudo systemctl daemon-reload && sudo systemctl enable xfrpc && sudo systemctl start xfrpc`
+# Then we can manage xfrpc with `sudo service xfrpc {start|stop|restart|status}`
+
+
+[Unit]
+Description=frp c language client
+Wants=network-online.target
+After=network.target network-online.target
+
+[Service]
+ExecStart=/usr/local/xfrpc/xfrpc -c /usr/local/xfrpc/xfrpc.ini -f -d 0
+
+[Install]
+WantedBy=multi-user.target
--- a/tcpmux.c
+++ b/tcpmux.c
@@ -0,0 +1,368 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file tcpmux.c
+    @brief xfrp tcp mux implemented
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
+#include "common.h"
+#include "tcpmux.h"
+#include "client.h"
+#include "config.h"
+#include "debug.h"
+#include "control.h"
+
+static uint8_t proto_version = 0;
+
+static struct tcp_mux_type_desc type_desc[] = {
+	{DATA, "data"},
+	{WINDOW_UPDATE, "window update"},
+	{PING, "ping"},
+	{GO_AWAY, "go away"},
+};
+
+static struct tcp_mux_flag_desc flag_desc[] = {
+	{ZERO, "zero"},
+	{SYN, "syn"},
+	{ACK, "ack"},
+	{FIN, "fin"},
+	{RST, "rst"},
+};
+
+static const char *
+type_2_desc(enum tcp_mux_type type)
+{
+	for(int i = 0; i < sizeof(type_desc)/sizeof(struct tcp_mux_type_desc); i++){
+		if (type == type_desc[i].type)
+			return type_desc[i].desc;
+	}
+
+	return "unkown_type";
+}
+
+static const char *
+flag_2_desc(enum tcp_mux_flag flag)
+{
+	for(int i = 0; i < sizeof(flag_desc)/sizeof(struct tcp_mux_flag_desc); i++){
+		if (flag == flag_desc[i].flag)
+			return flag_desc[i].desc;
+	}
+	
+	return "unkown_flag";
+}
+
+static int
+valid_tcp_mux_type(uint8_t type)
+{
+	if (type >= DATA && type <= GO_AWAY)
+		return 1;
+
+	return 0;
+}
+
+static int
+valid_tcp_mux_sid(uint32_t sid)
+{
+	if (sid == 1)
+		return 1;
+	
+	return get_proxy_client(sid)?1:0;
+}
+
+
+void 
+tcp_mux_encode(enum tcp_mux_type type, enum tcp_mux_flag flags, uint32_t stream_id, uint32_t length, struct tcp_mux_header *tmux_hdr)
+{
+	assert(tmux_hdr);
+	tmux_hdr->version 	= proto_version;
+	tmux_hdr->type		= type;
+	tmux_hdr->flags		= htons(flags);
+	tmux_hdr->stream_id	= htonl(stream_id);
+	tmux_hdr->length	= length?htonl(length):0;
+}
+
+static uint32_t
+tcp_mux_flag()
+{	
+	struct common_conf 	*c_conf = get_common_config();
+	return c_conf->tcp_mux;
+}
+
+static void
+dump_tcp_mux_header(uint8_t *data, int len)
+{
+	if (len != 12)
+		return;
+
+	printf("tcp mux header is : \n");
+	for (int i = 0; i < len; i++)
+		printf("%2x", data[i]);
+	printf("\n");
+}
+
+static uint32_t
+parse_tcp_mux_proto(uint8_t *data, int len, uint32_t *flag, uint32_t *type, uint32_t *stream_id, uint32_t *dlen)
+{
+	struct common_conf *c_conf = get_common_config();
+	if (!c_conf->tcp_mux)
+		return 0;	
+
+	if (len < sizeof(struct tcp_mux_header))
+		return 0;
+
+	struct tcp_mux_header *hdr = (struct tcp_mux_header *)data;
+	if(hdr->version == proto_version && 
+	   valid_tcp_mux_type(hdr->type)) {
+		if (hdr->type == DATA && !valid_tcp_mux_sid(htonl(hdr->stream_id))) {
+			debug(LOG_INFO, "!!!!!type is DATA but cant find stream_id : type [%s] flag [%s] stream_id[%d]", 
+				type_2_desc(hdr->type), flag_2_desc(htons(hdr->flags)), htonl(hdr->stream_id));
+			dump_tcp_mux_header(data, len);
+			exit(-1);
+		}
+		*type = hdr->type;
+		*flag = htons(hdr->flags);
+		*stream_id = htonl(hdr->stream_id);
+		*dlen = htonl(hdr->length);
+		return 1;
+	}
+
+	return 0;
+}
+
+uint32_t 
+get_next_session_id() {
+	static uint32_t next_session_id = 1;
+	uint32_t id = next_session_id;
+	next_session_id += 2;
+	return id;
+}
+
+void
+tcp_mux_send_win_update_syn(struct bufferevent *bout, uint32_t stream_id)
+{
+	if (!tcp_mux_flag()) return;
+
+	struct tcp_mux_header tmux_hdr;
+	memset(&tmux_hdr, 0, sizeof(tmux_hdr));
+	tcp_mux_encode(WINDOW_UPDATE, SYN, stream_id, 0, &tmux_hdr);
+	debug(LOG_DEBUG, "tcp mux [%d] send wind update syn", stream_id);
+	bufferevent_write(bout, (uint8_t *)&tmux_hdr, sizeof(tmux_hdr));
+}
+
+void
+tcp_mux_send_win_update_ack(struct bufferevent *bout, uint32_t stream_id, uint32_t delta)
+{
+	if (!tcp_mux_flag()) return;
+
+	struct tcp_mux_header tmux_hdr;
+	memset(&tmux_hdr, 0, sizeof(tmux_hdr));
+	tcp_mux_encode(WINDOW_UPDATE, ZERO, stream_id, delta, &tmux_hdr);
+	debug(LOG_DEBUG, "tcp mux [%d] send wind update ZERO [%d]", stream_id, delta);
+	bufferevent_write(bout, (uint8_t *)&tmux_hdr, sizeof(tmux_hdr));
+}
+
+void
+tcp_mux_send_win_update_fin(struct bufferevent *bout, uint32_t stream_id)
+{
+	if (!tcp_mux_flag()) return;
+
+	struct tcp_mux_header tmux_hdr;
+	memset(&tmux_hdr, 0, sizeof(tmux_hdr));
+	tcp_mux_encode(WINDOW_UPDATE, FIN, stream_id, 0, &tmux_hdr);
+	debug(LOG_DEBUG, "tcp mux [%d] send wind update FIN", stream_id);
+	bufferevent_write(bout, (uint8_t *)&tmux_hdr, sizeof(tmux_hdr));
+}
+
+void
+tcp_mux_send_data(struct bufferevent *bout, uint32_t stream_id, uint32_t length)
+{
+	if (!tcp_mux_flag()) return;
+
+	struct tcp_mux_header tmux_hdr;
+	memset(&tmux_hdr, 0, sizeof(tmux_hdr));
+	tcp_mux_encode(DATA, ZERO, stream_id, length, &tmux_hdr);
+	//debug(LOG_DEBUG, "tcp mux [%d] send data len : %d", stream_id, length);
+	bufferevent_write(bout, (uint8_t *)&tmux_hdr, sizeof(tmux_hdr));
+}
+
+void 
+tcp_mux_send_ping(struct bufferevent *bout, uint32_t ping_id)
+{
+	if (!tcp_mux_flag()) return;
+
+	struct tcp_mux_header tmux_hdr;
+	memset(&tmux_hdr, 0, sizeof(tmux_hdr));
+	tcp_mux_encode(PING, SYN, 0, ping_id, &tmux_hdr);
+	//debug(LOG_DEBUG, "tcp mux send ping syn : %d", ping_id);
+	bufferevent_write(bout, (uint8_t *)&tmux_hdr, sizeof(tmux_hdr));
+}
+
+static void 
+tcp_mux_handle_ping(struct bufferevent *bout, uint32_t ping_id)
+{
+	if (!tcp_mux_flag()) return;
+
+	struct tcp_mux_header tmux_hdr;
+	memset(&tmux_hdr, 0, sizeof(tmux_hdr));
+	tcp_mux_encode(PING, ACK, 0, ping_id, &tmux_hdr);
+	//debug(LOG_DEBUG, "tcp mux send ping ack : %d", ping_id);
+	bufferevent_write(bout, (uint8_t *)&tmux_hdr, sizeof(tmux_hdr));
+}
+
+void 
+handle_tcp_mux_frps_msg(uint8_t *buf, int ilen, void (*fn)(uint8_t *, int, void *))
+{
+	static uint32_t l_stream_id = 0;
+	static uint32_t l_dlen = 0;
+	static uint32_t l_type = 0;
+	static uint32_t l_flag = 0;
+	uint8_t *data = buf;
+	while (ilen > 0) {
+		uint32_t type = 0, stream_id = 0, dlen = 0, flag = 0;
+		uint32_t is_tmux = parse_tcp_mux_proto(data, ilen, &flag, &type, &stream_id, &dlen); 
+		if (!is_tmux) {
+			struct proxy_client *pc = get_proxy_client(l_stream_id);
+			debug(LOG_DEBUG, "receive only %s data : l_stream_id %d l_type %s l_flag %s l_dlen %d ilen %d", 
+							!pc?"main control ":"worker ", 
+							l_stream_id, type_2_desc(l_type), 
+							flag_2_desc(l_flag), l_dlen, ilen);
+			assert(ilen);
+			if (ilen == 12)
+				dump_tcp_mux_header(data, ilen);
+
+			if (!pc || (pc && !pc->local_proxy_bev)) {
+				assert(ilen >= l_dlen);
+				assert(l_dlen > 0);
+				fn(data, l_dlen, pc);
+				data += l_dlen;
+				ilen -= l_dlen;
+				l_dlen = 0;
+				continue;
+			}
+			
+			if (pc->stream_state != ESTABLISHED) {
+				debug(LOG_INFO, "client [%d] state is [%d]", pc->stream_id, pc->stream_state);
+				break;
+			}
+
+			if ( ilen >= l_dlen) {
+				assert(pc->local_proxy_bev);
+				bufferevent_write(pc->local_proxy_bev, data, l_dlen);
+				data += l_dlen;
+				ilen -= l_dlen;
+				l_dlen = 0;
+			} else {
+				assert(pc->local_proxy_bev);
+				bufferevent_write(pc->local_proxy_bev, data, ilen);
+				l_dlen -= ilen;
+				ilen 	= 0;
+			}
+
+			continue;
+		}
+		
+		struct proxy_client *pc = get_proxy_client(stream_id);
+		debug(LOG_DEBUG, "[%s] receive tcp mux type [%s] flag [%s] stream_id [%d] dlen [%d] ilen [%d]", 
+						pc?"worker":"main control",
+						type_2_desc(type), flag_2_desc(flag), stream_id, dlen, ilen);
+		data += sizeof(struct tcp_mux_header);
+		ilen -= sizeof(struct tcp_mux_header);
+		l_stream_id = stream_id;
+		l_type = type;
+		l_flag = flag;
+		l_dlen = type==PING?0:dlen;
+		assert(ilen >= 0);
+
+		switch(type) {
+		case DATA:
+		{
+			if (ilen == 0)
+				break;
+
+			if (!pc || (pc && !pc->local_proxy_bev)) {
+				assert(ilen >= dlen);
+				fn(data, dlen, pc);
+				data += dlen;
+				ilen -= dlen;
+				l_dlen = 0;
+				continue;
+			}
+			
+			if (pc->stream_state != ESTABLISHED) {
+				debug(LOG_INFO, "client [%d] state is [%d]", pc->stream_id, pc->stream_state);
+				break;
+			}
+			
+			if (ilen >= dlen){
+				assert(pc->local_proxy_bev);
+				bufferevent_write(pc->local_proxy_bev, data, dlen);
+				data += dlen;
+				ilen -= dlen;
+				l_dlen = 0;
+			} else {
+				assert(pc->local_proxy_bev);
+				bufferevent_write(pc->local_proxy_bev, data, ilen);
+				l_dlen -= ilen;
+				ilen 	= 0;
+			}
+			break;
+		} 
+		case PING:
+		{
+			struct bufferevent *bout = get_main_control()->connect_bev;
+			uint32_t seq = dlen;
+			assert(bout);
+			if (flag == SYN)
+				tcp_mux_handle_ping(bout, seq);
+			break;
+		} 
+		case WINDOW_UPDATE:
+		{
+			switch(flag) {
+			case RST:
+			case FIN:
+				del_proxy_client(pc);
+				break;
+			case ZERO:
+			case ACK:	
+				if (!pc)
+					break;
+
+				if (dlen > 0) {
+					pc->send_window += dlen;
+					bufferevent_enable(pc->local_proxy_bev, EV_READ|EV_WRITE);
+				}
+				pc->stream_state = ESTABLISHED;
+				break;
+			default:
+				debug(LOG_INFO, "window update no need process : flag %2x %s dlen %d stream_id %d", 
+								flag, flag_2_desc(flag), dlen, stream_id);
+			}
+			
+			break;
+		} 
+		default:
+			debug(LOG_INFO, "no need unhandle tcp mux msg : type %s flag %s stream_id %d dlen %d ilen %d", 
+							type_2_desc(type), flag_2_desc(flag),  stream_id, dlen, ilen);
+		}
+	}
+}
--- a/tcpmux.h
+++ b/tcpmux.h
@@ -0,0 +1,92 @@
+/* vim: set et ts=4 sts=4 sw=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+\********************************************************************/
+
+/** @file tcpmux.h
+    @brief xfrp tcp mux header file
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
+*/
+
+#ifndef	__TCP_MUX__
+#define	__TCP_MUX__
+
+#include "uthash.h"
+
+enum tcp_mux_type {
+	DATA,
+	WINDOW_UPDATE,
+	PING,
+	GO_AWAY,
+};
+
+struct tcp_mux_type_desc {
+	enum tcp_mux_type type;
+	char	*desc;
+};
+
+enum tcp_mux_flag {
+	ZERO,
+	SYN,
+	ACK = 1<<1,
+	FIN = 1<<2,
+	RST = 1<<3,
+};
+
+struct __attribute__((__packed__)) tcp_mux_header {
+	uint8_t		version;
+	uint8_t		type;
+	uint16_t	flags;
+	uint32_t	stream_id;
+	uint32_t	length;
+};
+
+struct tcp_mux_flag_desc {
+	enum tcp_mux_flag flag;
+	char	*desc;
+};
+
+enum tcp_mux_state {
+	INIT = 0,
+	SYN_SEND,
+	SYN_RECEIVED,
+	ESTABLISHED,
+	LOCAL_CLOSE,
+	REMOTE_CLOSE,
+	CLOSED,
+	RESET
+};
+
+void tcp_mux_send_win_update_syn(struct bufferevent *bout, uint32_t stream_id);
+
+void tcp_mux_send_win_update_ack(struct bufferevent *bout, uint32_t stream_id, uint32_t delta);
+
+void tcp_mux_send_win_update_fin(struct bufferevent *bout, uint32_t stream_id);
+
+void tcp_mux_send_data(struct bufferevent *bout, uint32_t stream_id, uint32_t length);
+
+void tcp_mux_send_ping(struct bufferevent *bout, uint32_t ping_id);
+
+uint32_t get_next_session_id();
+
+void tcp_mux_encode(enum tcp_mux_type type, enum tcp_mux_flag flags, uint32_t stream_id, uint32_t length, struct tcp_mux_header *tmux_hdr);
+
+void handle_tcp_mux_frps_msg(uint8_t *data, int len, void (*fn)(uint8_t *, int, void *));
+
+#endif
--- a/utils.c
+++ b/utils.c
@@ -7,6 +7,15 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <ctype.h>
+
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <ifaddrs.h>
+#include <linux/if_link.h>

 #include "utils.h"

@@ -28,4 +37,174 @@ int is_valid_ip_address(const char *ip_address)
    struct sockaddr_in sa;
    int result = inet_pton(AF_INET, ip_address, &(sa.sin_addr));
 	return result;
+}
+
+//	net_if_name: name of network interface, e.g. br-lan
+//	return: 1: error 0:get succeed
+int get_net_mac(char *net_if_name, char *mac, int mac_len) {
+	int ret = 1;
+	int i = 0;
+	int sock = 0;
+
+	if (mac_len < 12 || net_if_name == NULL) {
+		return 1;
+	}
+	struct ifreq ifreq;
+
+	sock = socket(AF_INET, SOCK_STREAM, 0);
+	if( sock < 0 ) {
+		perror("error sock");
+		goto OUT;
+	}
+
+	strncpy(ifreq.ifr_name, net_if_name, IFNAMSIZ);
+	if( ioctl(sock, SIOCGIFHWADDR,&ifreq) < 0 ) {
+		perror("error ioctl");
+		goto OUT;
+	}
+
+	for( i = 0; i < 6; i++ ){
+		snprintf(mac+2*i, mac_len - 2*i, "%02X", 
+			(unsigned char)ifreq.ifr_hwaddr.sa_data[i]);
+	}
+	mac[strlen(mac)] = 0;
+	ret =  0;
+
+OUT:
+	close(sock);
+	return ret;
+}
+
+// return: -1: network interface check failed; other: ifname numbers 
+int show_net_ifname()
+{
+	struct ifaddrs *ifaddr, *ifa;
+	int family, s, n;
+	char host[NI_MAXHOST];
+
+	if (getifaddrs(&ifaddr) == -1) {
+	   perror("getifaddrs");
+	   exit(EXIT_FAILURE);
+	}
+
+	/* Walk through linked list, maintaining head pointer so we
+	  can free list later */
+
+	for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
+	    if (ifa->ifa_addr == NULL) continue;
+
+	    family = ifa->ifa_addr->sa_family;
+
+		/* Display interface name and family (including symbolic
+		form of the latter for the common families) */
+		 
+		printf("%-8s %s (%d)\n",
+		      ifa->ifa_name,
+		      (family == AF_PACKET) ? "AF_PACKET" :
+		      (family == AF_INET) ? "AF_INET" :
+		      (family == AF_INET6) ? "AF_INET6" : "???",
+		      family);
+
+	   /* For an AF_INET* interface address, display the address */
+
+	   if (family == AF_INET || family == AF_INET6) {
+	       s = getnameinfo(ifa->ifa_addr,
+	               (family == AF_INET) ? sizeof(struct sockaddr_in) :
+	                                     sizeof(struct sockaddr_in6),
+	               host, NI_MAXHOST,
+	               NULL, 0, NI_NUMERICHOST);
+	       if (s != 0) {
+	           printf("getnameinfo() failed: %s\n", gai_strerror(s));
+	           exit(EXIT_FAILURE);
+	       }
+
+	       printf("\t\taddress: <%s>\n", host);
+
+	   } else if (family == AF_PACKET && ifa->ifa_data != NULL) {
+	       struct rtnl_link_stats *stats = (struct rtnl_link_stats *)ifa->ifa_data;
+
+	       printf("\t\ttx_packets = %10u; rx_packets = %10u\n"
+	              "\t\ttx_bytes   = %10u; rx_bytes   = %10u\n",
+	              stats->tx_packets, stats->rx_packets,
+	              stats->tx_bytes, stats->rx_bytes);
+	   }
+	}
+
+	freeifaddrs(ifaddr);
+	return 0;
+}
+
+// return: 0: network interface get succeed
+int get_net_ifname(char *if_buf, int blen)
+{
+	if (NULL == if_buf || blen < 8) return -1;
+
+	struct ifaddrs *ifaddr, *ifa;
+	int family, n;
+	int ret = 1;
+	if (getifaddrs(&ifaddr) == -1) {
+	   perror("getifaddrs");
+	   exit(EXIT_FAILURE);
+	}
+
+	int found = 0;
+	char tmp_if_buf[16];
+	memset(tmp_if_buf, 0, sizeof(tmp_if_buf));
+	/* Walk through linked list, maintaining head pointer so we
+	  can free list later */
+	for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
+	    if (ifa->ifa_addr == NULL) continue;
+
+	    family = ifa->ifa_addr->sa_family;
+
+		if (family == AF_INET) {
+			// for LEDE/OpenWRT embedded router os
+			if (strcmp(ifa->ifa_name, "br-lan") == 0) {
+				found = 1;
+				break;
+			}
+		} else if (family == AF_PACKET && 
+			ifa->ifa_data != NULL && 
+			strcmp(ifa->ifa_name, "lo") != 0) { // skip local loop interface
+			
+			strncpy(tmp_if_buf, ifa->ifa_name, 16);
+		}
+	}
+
+	if (found) {
+		strncpy(if_buf, ifa->ifa_name, blen);
+		ret = 0;
+	} else if (tmp_if_buf[0] != 0) {
+		strncpy(if_buf, tmp_if_buf, blen);
+		ret = 0;
+	}
+
+	freeifaddrs(ifaddr);
+	return ret;
+}
+
+// e.g. wWw.Baidu.com/China will be trans into www.baidu.com/China
+// return: 0:check and trant succeed, 1:failed or domain name is invalid
+int dns_unified(const char *dname, char *udname_buf, int udname_buf_len)
+{
+	if (! dname || ! udname_buf || udname_buf_len < strlen(dname)+1)
+		return 1;
+	
+	int has_dot = 0;
+	int dlen = strlen(dname);
+	int i = 0;
+	for(i=0; i<dlen; i++) {
+		if(dname[i] == '/')
+			break;
+
+		if (dname[i] == '.' && i != dlen-1)
+			has_dot = 1;
+
+		udname_buf[i] = tolower(dname[i]);
+	}
+
+	if (! has_dot)	//domain name should have 1 dot leastly
+		return 1;
+
+	return 0;
 }
--- a/utils.h
+++ b/utils.h
@@ -1,10 +1,19 @@
 #ifndef _UTILS_H_
 #define _UTILS_H_

+struct mycurl_string {
+	char 	*ptr;
+	size_t 	len;
+};
+
 void s_sleep(unsigned int s, unsigned int u);

 // is_valid_ip_address:
 // return 0:ipaddress unlegal
 int is_valid_ip_address(const char *ip_address);
+int show_net_ifname();
+int get_net_ifname(char *if_buf, int blen);
+int get_net_mac(char *net_if_name, char *mac, int mac_len);
+int dns_unified(const char *dname, char *udname_buf, int udname_buf_len);

 #endif //_UTILS_H_
--- a/version.h
+++ b/version.h
@@ -1,8 +1,8 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_

-#define VERSION   "0.05."
-#define PROTOCOL_VERESION "0.10.0"
+#define VERSION   "1.05.561"
+#define PROTOCOL_VERESION "0.42.0"
 #define CLIENT_V 1

 #endif //_VERSION_H_
--- a/xfrpc.c
+++ b/xfrpc.c
@@ -20,8 +20,8 @@
 \********************************************************************/

 /** @file xfrpc.c
-    @brief xfrp client
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @brief xfrpc client
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #include <string.h>
--- a/xfrpc.h
+++ b/xfrpc.h
@@ -20,8 +20,8 @@
 \********************************************************************/

 /** @file xfrpc.h
-    @brief xfrp client header file
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @brief xfrpc client header file
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #ifndef _XFRPC_H_
@@ -29,4 +29,4 @@

 void xfrpc_loop();

-#endif //_XFRPC_H_
+#endif //_XFRPC_H_
--- a/xfrpc_min.ini
+++ b/xfrpc_min.ini
@@ -1,10 +1,9 @@
 [common]
-server_addr = wifidog.kunteng.org
+server_addr = your_server_ip
 server_port = 7000
-auth_token = 123
-privilege_token = 12345678

 [ssh]
 type = tcp
 local_ip = 127.0.0.1
 local_port = 22
+remote_port = 6128
--- a/zip.c
+++ b/zip.c
@@ -21,7 +21,7 @@

 /** @file zip.c
    @brief zlib related function
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #include <string.h>
--- a/zip.h
+++ b/zip.h
@@ -21,7 +21,7 @@

 /** @file zip.h
    @brief zlib related function
-    @author Copyright (C) 2016 Dengfeng Liu <liudengfeng@kunteng.org>
+    @author Copyright (C) 2016 Dengfeng Liu <liu_df@qq.com>
 */

 #ifndef _ZIP_H_
Author	SHA1	Message	Date
Dengfeng Liu	ca64905266	fix: process unhandle tcp mux header Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-31 17:21:08 +08:00
Dengfeng Liu	6b1f70407c	Merge branch 'master' of https://github.com/liudf0716/xfrpc	2022-05-28 11:25:39 +08:00
Dengfeng Liu	5d298156e4	refactor: refactor code Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-28 11:09:56 +08:00
Dengfeng Liu	37f124ffe7	Update README.md	2022-05-27 08:55:26 +08:00
Dengfeng Liu	675e47ef43	feat: add reconnect frps Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-27 08:37:05 +08:00
Dengfeng Liu	176e4006f6	format: format code and prepare release Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-26 21:11:52 +08:00
Dengfeng Liu	d91d5d91ef	fix: exceed window size bug Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-26 18:23:39 +08:00
Dengfeng Liu	36eba09bbe	fix: replace auth_token with token Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-23 18:47:20 +08:00
Dengfeng Liu	4ac16540b7	release: v1.05.552 release support tcp mux Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-23 15:24:33 +08:00
Dengfeng Liu	ab4da37e72	feat: add tcp mux support Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-20 11:10:33 +08:00
Dengfeng Liu	b49dd4e97c	Update README.md	2022-05-16 13:59:09 +08:00
Dengfeng Liu	6fb2e167d6	fix: clean all warning of code Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-10 10:12:10 +08:00
Dengfeng Liu	4b633a7c2a	Update README.md	2022-05-09 16:27:25 +08:00
Dengfeng Liu	29a854e5d6	Update README.md	2022-05-08 10:19:18 +08:00
Dengfeng Liu	d49331426a	Update Makefile	2022-05-07 13:57:34 +08:00
Dengfeng Liu	fc3b88c2d6	Update README.md	2022-05-03 10:55:53 +08:00
Dengfeng Liu	fa8b8c5463	Update README.md	2022-05-01 12:11:20 +08:00
Dengfeng Liu	34ff461506	fix: when libevent get two packet together, should process the second packet Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-05-01 11:02:15 +08:00
Dengfeng Liu	4d850336a9	Merge branch 'master' of https://github.com/liudf0716/xfrpc	2022-04-28 15:48:23 +08:00
Dengfeng Liu	a3eb3de9d9	feat: remove mbedtls support Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-04-28 15:47:32 +08:00
Dengfeng Liu	c390f1c9c9	Update README.md	2022-04-28 15:37:39 +08:00
Dengfeng Liu	e30d191b4a	Update README.md	2022-04-28 15:29:56 +08:00
Dengfeng Liu	d315792cc8	Update README.md	2022-04-28 10:08:10 +08:00
Dengfeng Liu	8ac3ef77bf	feat: add frps support Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-04-28 09:52:34 +08:00
Dengfeng Liu	ab46826072	Merge branch 'master' of https://github.com/liudf0716/xfrpc	2022-04-17 11:53:38 +00:00
Dengfeng Liu	73f88ee92d	feat: support frps 0.41.0 Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-04-15 10:31:53 +00:00
Dengfeng Liu	a52f59f629	feat: support frps 0.41.0 Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-04-14 08:57:21 +00:00
Dengfeng Liu	848120d15b	Update control.c	2022-04-14 16:23:31 +08:00
Dengfeng Liu	2fc5ea8bdd	Update msg.h	2022-04-14 16:10:41 +08:00
Dengfeng Liu	734f5e5448	Update msg.h	2022-04-14 16:08:33 +08:00
Dengfeng Liu	da55d8ac32	Update msg.h	2022-04-14 15:37:08 +08:00
Dengfeng Liu	2de5c3681f	Update msg.c	2022-04-14 14:33:51 +08:00
Dengfeng Liu	37badbee7c	Update msg.c	2022-04-14 11:06:36 +08:00
Dengfeng Liu	1f90d9ab93	Update msg.c	2022-04-14 10:29:46 +08:00
Dengfeng Liu	33f2bd5648	Update version.h	2022-04-14 10:25:11 +08:00
Dengfeng Liu	bac0ab888d	Update login.c	2022-04-14 10:19:16 +08:00
Dengfeng Liu	a557194e9f	Update login.h	2022-04-14 10:08:53 +08:00
Dengfeng Liu	f0d29bc624	Update xfrpc_min.ini	2022-04-14 09:38:26 +08:00
Dengfeng Liu	808cda5a6b	Update linux.yml	2022-04-12 18:52:14 +08:00
Dengfeng Liu	1fa59df3f5	fix: change to correct email address Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-04-10 04:13:59 +00:00
Dengfeng Liu	c2b5e9cc92	Delete frpc.ini	2022-04-10 11:45:02 +08:00
Dengfeng Liu	e41aee6dd0	Update and rename frpc_min.ini to xfrpc_min.ini	2022-04-10 11:44:06 +08:00
Dengfeng Liu	f199b6acba	Update README.md	2022-04-08 14:03:42 +08:00
Dengfeng Liu	a8886a1a95	Update README.md	2022-04-08 14:03:17 +08:00
Dengfeng Liu	38f47a28fa	Update xfrpc.init	2022-04-06 17:00:18 +08:00
Dengfeng Liu	60d93b7022	Update xfrpc.init	2022-04-06 16:03:29 +08:00
Dengfeng Liu	b38e96e268	Rename xfrpc.ini to xfrpc.init	2022-04-06 15:57:50 +08:00
Dengfeng Liu	88a1f6ecb7	Update xfrpc.ini	2022-04-06 15:45:37 +08:00
Dengfeng Liu	ae37ae4e40	Update xfrpc.conf	2022-04-01 15:50:26 +08:00
Dengfeng Liu	4fd793b183	Update xfrpc.ini	2022-04-01 15:40:27 +08:00
Dengfeng Liu	3288e55453	Update xfrpc.ini	2022-03-31 18:41:12 +08:00
Dengfeng Liu	e9fa00409c	Create xfrpc.ini	2022-03-31 17:37:17 +08:00
Dengfeng Liu	60427893f2	Create xfrpc.conf	2022-03-31 17:17:41 +08:00
Dengfeng Liu	ecfa12eb42	Update Makefile	2022-03-30 17:20:17 +08:00
Dengfeng Liu	f8a2dfaf3a	fix: replace is_error macro Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>	2022-03-30 03:12:32 +00:00
Dengfeng Liu	ae0d65b31f	Update README.md	2022-03-30 10:37:34 +08:00
Dengfeng Liu	c2aac15b29	Update Makefile	2022-03-29 18:40:36 +08:00
Dengfeng Liu	7ff52050dc	Create Makefile	2022-03-29 17:38:10 +08:00
Dengfeng Liu	b71a7c2490	Create linux.yml	2021-12-14 09:52:16 +08:00
Dengfeng Liu	36671d76c0	compile: add lib depend checking Signed-off-by: Dengfeng Liu <liu_df@qq.com>	2021-12-14 09:45:42 +08:00
Dengfeng Liu	5130aabeb5	Create CMakeParseArguments.cmake	2021-12-14 09:21:22 +08:00
Dengfeng Liu	bacf92da68	Update CMakeLists.txt	2021-12-14 09:19:41 +08:00
Dengfeng Liu	757b5db65a	Update README.md	2021-12-13 14:10:55 +08:00
Dengfeng Liu	f3a0668217	fix: fix compile error when openssl version greater than 1.1.0 Signed-off-by: Dengfeng Liu <liu_df@qq.com>	2021-12-13 14:01:23 +08:00
Dengfeng Liu	6d1bbbc4df	Update README.md	2021-11-29 14:37:21 +08:00
KerwinKoo	c31106689a	remove curl utils funcs because of do not get ftp data port by http, remove dependence of Libcurl	2017-08-21 10:01:33 +08:00
KerwinKoo	ce522f5675	using ftp_cfg_proxy_name field name instead of ftp_ctl_proxy_name	2017-08-18 14:53:36 +08:00
KerwinKoo	6bd859747a	complate ftp remote data port auto match func	2017-08-17 16:41:37 +08:00
KerwinKoo	7d5f53aebb	fix BUG: unconnectted when server_addr is IP address	2017-08-17 15:49:26 +08:00
KerwinKoo	f28efdf2b1	add remote_data_port check from responsed message	2017-08-17 15:25:08 +08:00
KerwinKoo	a9a75c6554	fix npr_proxy_remote_port unmarshal bug	2017-08-17 14:37:51 +08:00
KerwinKoo	26f49d26db	add new_proxy_response msg unmarshel	2017-08-17 12:06:21 +08:00
KerwinKoo	508ddd60e0	do not use HTTP mothod to init ftp remote data port	2017-08-17 12:05:46 +08:00
KerwinKoo	08b908273a	remove unused semicolon	2017-08-17 11:14:37 +08:00
KerwinKoo	8402967a0e	save client	2017-08-09 14:56:48 +08:00
KerwinKoo	a2e4264b01	devtmp	2017-08-09 14:42:43 +08:00
KerwinKoo	ce057a05a7	add url commit	2017-08-08 18:23:18 +08:00
KerwinKoo	7515c15123	add url func into utils	2017-08-08 18:19:40 +08:00
KerwinKoo	60871860ae	don't check the remote_data_port because of xfrps will distribute a ftp_data port for each client, no need direct it activity.	2017-08-08 16:51:56 +08:00
KerwinKoo	f8d065b09e	add domain check for server_addr field	2017-07-25 17:54:38 +08:00
KerwinKoo	2f2e64ae31	modify domain check code	2017-07-25 17:44:31 +08:00
KerwinKoo	a4812dd596	trans custom_domains to lower	2017-07-25 17:30:42 +08:00
KerwinKoo	2e420e921c	fix dns error bug	2017-07-25 16:25:46 +08:00
KerwinKoo	99972f257a	delete DNS of server addr	2017-07-25 13:57:07 +08:00
KerwinKoo	8e4ca75d36	Merge pull request #8 from KunTengRom/libdns debug	2017-07-25 13:42:21 +08:00
KerwinKoo	360019d1a4	debug	2017-07-25 13:41:13 +08:00
KerwinKoo	204c086a03	fix remote_port is -1 will not be set Signed-off-by: KerwinKoo <gukaiqiang@gmail.com>	2017-07-25 11:25:26 +08:00
KerwinKoo	316834ffd0	don't show port	2017-07-21 16:14:43 +08:00
KerwinKoo	aefbd2e062	add -r to show run id and port	2017-07-21 14:41:45 +08:00
KerwinKoo	ff6f60f079	add Openwrt Router check	2017-07-19 18:24:47 +08:00
KerwinKoo	b2a34fa18f	adjust version info	2017-07-19 17:23:29 +08:00
KerwinKoo	984192c200	using right DNS server IP	2017-07-19 16:26:28 +08:00
KerwinKoo	5747426565	adjust code of control	2017-07-19 13:34:25 +08:00
KerwinKoo	0f78a61082	add dns servers static	2017-07-18 17:18:36 +08:00
KerwinKoo	fa852f0b7d	fix domain name analyse error	2017-07-18 17:01:23 +08:00
KerwinKoo	ff9ecd1b48	add some debug	2017-07-18 16:22:22 +08:00
KerwinKoo	620c05b6bc	add get net mac declear	2017-07-18 16:03:42 +08:00
KerwinKoo	5fffc80367	add commit	2017-07-18 15:36:34 +08:00
KerwinKoo	52ce3d69b4	remove unused file and added into gitignore remove file: install_manifest.txt	2017-07-18 15:35:46 +08:00
KerwinKoo	259592e35c	change run_id from passive to proactive mode.	2017-07-18 15:32:39 +08:00
KerwinKoo	8866fc3a3a	only using 114 dns server ip	2017-07-18 14:53:51 +08:00
KerwinKoo	3dca97a235	get the right ifname	2017-07-18 14:26:55 +08:00
KerwinKoo	9511680227	add get_net_ifname func in utils	2017-07-18 14:16:59 +08:00
KerwinKoo	acb79bcf1f	don't using encrypt	2017-07-11 18:13:16 +08:00
KerwinKoo	75adc0a669	adjust source code	2017-07-11 18:08:31 +08:00
KerwinKoo	2ef0200276	adjust control.c	2017-07-11 17:27:32 +08:00
KerwinKoo	7940a4f949	update README	2017-07-11 11:04:28 +08:00
KerwinKoo	81779637ba	update README for FTP proxy descript	2017-07-11 11:01:11 +08:00
KerwinKoo	91d6129426	add domain support for ftp close #4 close #5	2017-07-10 19:32:21 +08:00
KerwinKoo	d333533639	do never use request buffer	2017-07-10 18:28:25 +08:00