Merge branch 'hotfix/0.2.6'

lparam · Sep 16, 2015 · 89aac04 · 89aac04
2 parents 2b17b50 + 298d856
commit 89aac04
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+v0.2.6 (2015-9-16)
+-----------
+* Hotfix: Crypto init once only
+
+
 v0.2.5 (2015-9-15)
 -----------
 * Fix: Crypto init once only

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 MAJOR = 0
 MINOR = 2
-PATCH = 5
+PATCH = 6
 NAME = xsocks
 
 ifdef O

diff --git a/openwrt/Makefile b/openwrt/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xsocks
-PKG_VERSION:=0.2.5
+PKG_VERSION:=0.2.6
 PKG_RELEASE=
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/src/common.h b/src/common.h
@@ -4,7 +4,7 @@
 #include "uv.h"
 #include "socks.h"
 
-#define XSOCKS_VERSION      "0.2.5"
+#define XSOCKS_VERSION      "0.2.6"
 
 struct server_context {
     int index;

diff --git a/src/xforwarder.c b/src/xforwarder.c
@@ -227,8 +227,6 @@ main(int argc, char *argv[]) {
         return 1;
     }
 
-    init();
-
 #ifndef _WIN32
     if (daemon_mode) {
         if (daemonize()) {
@@ -241,6 +239,8 @@ main(int argc, char *argv[]) {
     }
 #endif
 
+    init();
+
     loop = uv_default_loop();
 
     rc = resolve_addr(local_addr, &bind_addr);

diff --git a/src/xsocks.c b/src/xsocks.c
@@ -234,8 +234,6 @@ main(int argc, char *argv[]) {
         return 1;
     }
 
-    init();
-
 #if !defined(_WIN32)
     if (daemon_mode) {
         if (daemonize()) {
@@ -248,6 +246,8 @@ main(int argc, char *argv[]) {
     }
 #endif
 
+    init();
+
     loop = uv_default_loop();
 
     rc = resolve_addr(local_addr, &bind_addr);

diff --git a/src/xtproxy.c b/src/xtproxy.c
@@ -216,8 +216,6 @@ main(int argc, char *argv[]) {
         return 1;
     }
 
-    init();
-
     if (daemon_mode) {
         if (daemonize()) {
             return 1;
@@ -228,6 +226,8 @@ main(int argc, char *argv[]) {
         }
     }
 
+    init();
+
     loop = uv_default_loop();
 
     rc = resolve_addr(local_addrbuf, &local_addr);

diff --git a/src/xtunnel.c b/src/xtunnel.c
@@ -231,10 +231,6 @@ main(int argc, char *argv[]) {
         return 1;
     }
 
-    if (init()) {
-        return 1;
-    }
-
 #ifndef _WIN32
     if (daemon_mode) {
         if (daemonize()) {
@@ -247,6 +243,10 @@ main(int argc, char *argv[]) {
     }
 #endif
 
+    if (init()) {
+        return 1;
+    }
+
     loop = uv_default_loop();
 
     rc = resolve_addr(source_addr, &bind_addr);