Merge branch 'release/0.2.5'

CHANGES.md

@@ -1,3 +1,13 @@
+v0.2.5 (2015-9-15)
+-----------
+* Fix: Crypto init once only
+
+
+v0.2.4 (2015-9-01)
+-----------
+* Change: Update xforwarder's arguments
+
+
 v0.2.3 (2015-9-01)
 -----------
 * Fix: Don't use pthread_setname_p under non linux platform

Makefile

@@ -1,6 +1,6 @@
 MAJOR = 0
 MINOR = 2
-PATCH = 4
+PATCH = 5
 NAME = xsocks
 
 ifdef O

README.md

@@ -87,64 +87,80 @@ Modify your SERVER and PASSWORD in /etc/init.d/xsocks
 START=72
 STOP=30
 FIREWALL_RELOAD=0
+
 SERVER=IP:PORT
 PASSWORD=PASSWORD
 
+LISTEN_PORT=1070
+IP_ROUTE_TABLE_NUMBER=100
+FWMARK="0x01/0x01"
+SETNAME=wall
+CHAIN=XSOCKS
+
+
 start() {
-    tproxy
+    tproxy_start
     mkdir -p /var/run/xsocks
     xsocks -s $SERVER -k $PASSWORD
     xtproxy -s $SERVER -k $PASSWORD
-    xforwarder -l 0.0.0.0:5533 -t 8.8.8.8:53 -s $SERVER -k $PASSWORD
+    xforwarder -l 0.0.0.0:5533 -d 8.8.8.8:53 -s $SERVER -k $PASSWORD
 }
 
 stop() {
+    tproxy_stop
     xsocks --signal stop
     xtproxy --signal stop
     xforwarder --signal stop
 }
 
 shutdown() {
+    tproxy_stop
     xsocks --signal quit
     xtproxy --signal quit
     xforwarder --signal quit
 }
 
-tproxy() {
-    local LISTEN_PORT=1070
-    local IP_ROUTE_TABLE_NUMBER=100
-    local FWMARK="0x01/0x01"
-    local SETNAME=wall
-
-    iptables -t nat -D PREROUTING -p tcp -j XSOCKS
-    iptables -t nat -F XSOCKS
-    iptables -t nat -X XSOCKS
+tproxy_start() {
+    iptables -t nat -D PREROUTING -p tcp -j $CHAIN > /dev/null 2>&1
+    iptables -t nat -F $CHAIN > /dev/null 2>&1
+    iptables -t nat -X $CHAIN > /dev/null 2>&1
 
-    iptables -t mangle -D PREROUTING -j XSOCKS
-    iptables -t mangle -F XSOCKS
-    iptables -t mangle -X XSOCKS
+    iptables -t mangle -D PREROUTING -j $CHAIN > /dev/null 2>&1
+    iptables -t mangle -F $CHAIN > /dev/null 2>&1
+    iptables -t mangle -X $CHAIN > /dev/null 2>&1
 
-    iptables -t nat -N XSOCKS
-    iptables -t mangle -N XSOCKS
+    iptables -t nat -N $CHAIN
+    iptables -t mangle -N $CHAIN
 
-    ipset -F $SETNAME
-    ipset -X $SETNAME
-    ipset -N $SETNAME iphash
+    ipset -N $SETNAME iphash -exist
 
     ### TCP
-    iptables -t nat -A XSOCKS -p tcp -m set --match-set $SETNAME dst -j REDIRECT --to-port $LISTEN_PORT
-    iptables -t nat -A PREROUTING -p tcp -j XSOCKS
+    iptables -t nat -A $CHAIN -p tcp -m set --match-set $SETNAME dst -j REDIRECT --to-port $LISTEN_PORT
+    iptables -t nat -A PREROUTING -p tcp -j $CHAIN
 
     ### UDP
-    ip rule del fwmark $FWMARK table $IP_ROUTE_TABLE_NUMBER
-    ip route del local 0.0.0.0/0 dev lo table $IP_ROUTE_TABLE_NUMBER
+    ip rule del fwmark $FWMARK table $IP_ROUTE_TABLE_NUMBER > /dev/null 2>&1
+    ip route del local 0.0.0.0/0 dev lo table $IP_ROUTE_TABLE_NUMBER > /dev/null 2>&1
 
     ip rule add fwmark $FWMARK table $IP_ROUTE_TABLE_NUMBER
     ip route add local 0.0.0.0/0 dev lo table $IP_ROUTE_TABLE_NUMBER
 
-    iptables -t mangle -A XSOCKS -p udp -m set --match-set $SETNAME dst -j TPROXY \
+    iptables -t mangle -A $CHAIN -p udp -m set --match-set $SETNAME dst -j TPROXY \
         --on-port $LISTEN_PORT --tproxy-mark $FWMARK
-    iptables -t mangle -A PREROUTING -j XSOCKS
+    iptables -t mangle -A PREROUTING -j $CHAIN
+}
+
+tproxy_stop() {
+    iptables -t nat -D PREROUTING -p tcp -j $CHAIN > /dev/null 2>&1
+    iptables -t nat -F $CHAIN > /dev/null 2>&1
+    iptables -t nat -X $CHAIN > /dev/null 2>&1
+
+    iptables -t mangle -D PREROUTING -j $CHAIN > /dev/null 2>&1
+    iptables -t mangle -F $CHAIN > /dev/null 2>&1
+    iptables -t mangle -X $CHAIN > /dev/null 2>&1
+
+    ip rule del fwmark $FWMARK table $IP_ROUTE_TABLE_NUMBER > /dev/null 2>&1
+    ip route del local 0.0.0.0/0 dev lo table $IP_ROUTE_TABLE_NUMBER > /dev/null 2>&1
 }
 ```
 

openwrt/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xsocks
-PKG_VERSION:=0.2.4
+PKG_VERSION:=0.2.5
 PKG_RELEASE=
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

src/cache.h

@@ -3,8 +3,8 @@
  * License:  This is licensed under the same terms as uthash itself
  */
 
-#ifndef _CACHE_
-#define _CACHE_
+#ifndef CACHE_H
+#define CACHE_H
 
 #include "uthash.h"
 
@@ -36,4 +36,4 @@ extern int cache_insert(struct cache *cache, char *key, void *data);
 extern int cache_remove(struct cache *cache, char *key);
 extern int cache_removeall(struct cache *cache, void *opaque, int (*select_cb)(void *element, void *opaque));
 
-#endif
+#endif // for #ifndef CACHE_H

src/common.h

@@ -1,10 +1,10 @@
-#ifndef _COMMON_H
-#define _COMMON_H
+#ifndef COMMON_H
+#define COMMON_H
 
 #include "uv.h"
 #include "socks.h"
 
-#define XSOCKS_VERSION      "0.2.4"
+#define XSOCKS_VERSION      "0.2.5"
 
 struct server_context {
     int index;
@@ -36,4 +36,4 @@ void consumer_start(void *arg);
 int parse_target_address(const struct xsocks_request *req, struct sockaddr *addr, char *host);
 void cache_log(uint8_t atyp, const struct sockaddr *src_addr, const struct sockaddr *dst_addr, const char *host, uint16_t port, int hit);
 
-#endif // for #ifndef _COMMON_H
+#endif // for #ifndef COMMON_H

src/daemon.c

@@ -39,20 +39,20 @@ already_running(const char *pidfile) {
 			close(fd);
 			return(1);
 		}
-		logger_stderr("can't lock %s: %s\n", pidfile, strerror(errno));
+		logger_stderr("can't lock %s: %s", pidfile, strerror(errno));
 		exit(1);
 	}
 
     /*
      * create pid file
      */
     if (ftruncate(fd, 0)) {
-		fprintf(stderr, "can't truncate %s: %s", pidfile, strerror(errno));
+		logger_stderr("can't truncate %s: %s", pidfile, strerror(errno));
 		exit(1);
     }
     sprintf(buf, "%ld\n", (long)getpid());
     if (write(fd, buf, strlen(buf)+1) == -1) {
-		fprintf(stderr, "can't write %s: %s", pidfile, strerror(errno));
+		logger_stderr("can't write %s: %s", pidfile, strerror(errno));
 		exit(1);
     }
 
@@ -92,7 +92,11 @@ daemonize(void) {
 
     setsid();
 
-    if ((fd = open("/dev/null", O_RDWR, 0)) != -1) {
+    if ((fd = open("/dev/null", O_RDWR, 0)) == -1) {
+		logger_stderr("open [/dev/null] failed (%d: %s)", errno, strerror(errno));
+        return -1;
+
+    } else {
         dup2(fd, STDIN_FILENO);
         dup2(fd, STDOUT_FILENO);
         /* dup2(fd, STDERR_FILENO); */

src/daemon.h

@@ -1,9 +1,9 @@
-#ifndef _DAEMON_H
-#define _DAEMON_H
+#ifndef DAEMON_H
+#define DAEMON_H
 
 int daemonize(void);
 int already_running(const char *pidfile);
 void create_pidfile(const char *pidfile);
 void delete_pidfile(const char *pidfile);
 
-#endif // for #ifndef _DAEMON_H
+#endif // for #ifndef DAEMON_H

src/getopt-win.h

@@ -34,12 +34,8 @@ PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
 YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
 EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 */
-#ifndef __GETOPT_H_
-	#define __GETOPT_H_
-
-	#ifdef _GETOPT_API
-		#undef _GETOPT_API
-	#endif
+#ifndef GETOPT_WIN_H
+#define GETOPT_WIN_H
 
 	#if defined(EXPORTS_GETOPT) && defined(STATIC_GETOPT)
 		#error "The preprocessor definitions of EXPORTS_GETOPT and STATIC_GETOPT can only be used individually"
@@ -135,4 +131,4 @@ _END_EXTERN_C
 		#define option option_a
 		#define optarg optarg_a
 	#endif
-#endif  // __GETOPT_H_
+#endif // for #ifndef GETOPT_WIN_H

src/logger.h

@@ -1,5 +1,5 @@
-#ifndef _LOGGER_H
-#define _LOGGER_H
+#ifndef LOGGER_H
+#define LOGGER_H
 
 #include <stdint.h>
 
@@ -21,4 +21,4 @@ void logger_exit(void);
 void logger_stderr(const char *msg, ...);
 void logger_log(uint32_t level, const char *msg, ...);
 
-#endif // for #ifndef _LOGGER_H
+#endif // for #ifndef LOGGER_H

src/packet.h

@@ -1,5 +1,5 @@
-#ifndef _PACKET_H
-#define _PACKET_H
+#ifndef PACKET_H
+#define PACKET_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -25,4 +25,4 @@ struct packet {
 int packet_filter(struct packet *packet, const char *buf, ssize_t buflen);
 void packet_reset(struct packet *packet);
 
-#endif // for #ifndef _PACKET_H
+#endif // for #ifndef PACKET_H

src/resolver.h

@@ -1,5 +1,5 @@
-#ifndef _RESOLVER_H
-#define _RESOLVER_H
+#ifndef RESOLVER_H
+#define RESOLVER_H
 
 #include <stdint.h>
 #include "uv.h"
@@ -25,4 +25,4 @@ void resolver_shutdown(struct resolver_context *ctx);
 void resolver_destroy(struct resolver_context *ctx);
 const char * resolver_error(struct resolver_query *query);
 
-#endif // for #ifndef _RESOLVER_H
+#endif // for #ifndef RESOLVER_H

src/socks.h

@@ -1,5 +1,5 @@
-#ifndef _SOCKS_H
-#define _SOCKS_H
+#ifndef SOCKS_H
+#define SOCKS_H
 
 #pragma pack(push,1)
 
@@ -83,4 +83,4 @@ enum xstage {
     XSTAGE_DEAD,
 };
 
-#endif // for #ifndef _SOCKS_H
+#endif // for #ifndef SOCKS_H

src/udprelay.h

@@ -1,5 +1,5 @@
-#ifndef _UDPRELAY_H
-#define _UDPRELAY_H
+#ifndef UDPRELAY_H
+#define UDPRELAY_H
 
 #include "uv.h"
 #include "common.h"
@@ -9,4 +9,4 @@ int udprelay_start(uv_loop_t *loop, struct server_context *server);
 void udprelay_close(struct server_context *server);
 void udprelay_destroy();
 
-#endif // for #ifndef _UDPRELAY_H
+#endif // for #ifndef UDPRELAY_H

src/util.h

@@ -1,5 +1,5 @@
-#ifndef _UTIL_H
-#define _UTIL_H
+#ifndef UTIL_H
+#define UTIL_H
 
 #include <stdio.h>
 #include <stdint.h>
@@ -16,4 +16,4 @@ int ip_name(const struct sockaddr *ip, char *name, size_t size);
 uv_os_sock_t create_socket(int type, int reuse);
 void dump_hex(const void *data, uint32_t len, char *title);
 
-#endif // for #ifndef _UTIL_H
+#endif // for #ifndef UTIL_H

src/xforwarder.h

@@ -1,5 +1,5 @@
-#ifndef _XFORWARDER_H
-#define _XFORWARDER_H
+#ifndef XFORWARDER_H
+#define XFORWARDER_H
 
 #include "uv.h"
 #include "socks.h"
@@ -62,4 +62,4 @@ struct sockaddr bind_addr;
 struct sockaddr dest_addr;
 struct sockaddr server_addr;
 
-#endif // for #ifndef _XFORWARDER_H
+#endif // for #ifndef XFORWARDER_H

src/xsocks.h

@@ -1,5 +1,5 @@
-#ifndef _XSOCKS_H
-#define _XSOCKS_H
+#ifndef XSOCKS_H
+#define XSOCKS_H
 
 #include "uv.h"
 #include "socks.h"
@@ -60,4 +60,4 @@ uint16_t idle_timeout;
 struct sockaddr bind_addr;
 struct sockaddr server_addr;
 
-#endif // for #ifndef _XSOCKS_H
+#endif // for #ifndef XSOCKS_H

src/xsocksd.c

@@ -244,8 +244,6 @@ main(int argc, char *argv[]) {
     }
 #endif
 
-    init();
-
 #ifndef _WIN32
     if (daemon_mode) {
         if (daemonize()) {
@@ -258,6 +256,8 @@ main(int argc, char *argv[]) {
     }
 #endif
 
+    init();
+
     loop = uv_default_loop();
 
     rc = resolve_addr(local_addrbuf, &local_addr);

src/xsocksd.h

@@ -1,5 +1,5 @@
-#ifndef _XSOCKSD_H
-#define _XSOCKSD_H
+#ifndef XSOCKSD_H
+#define XSOCKSD_H
 
 #include "uv.h"
 #include "socks.h"
@@ -63,4 +63,4 @@ int verbose;
 uint16_t idle_timeout;
 uv_key_t thread_resolver_key;
 
-#endif // for #ifndef _XSOCKSD_H
+#endif // for #ifndef XSOCKSD_H