Add ss-manager for multi-user control and traffic statistics.

Author: madeye

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.2.4.
+# Generated by GNU Autoconf 2.69 for shadowsocks-libev 2.3.0.
 #
 # Report bugs to <[email protected]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shadowsocks-libev'
 PACKAGE_TARNAME='shadowsocks-libev'
-PACKAGE_VERSION='2.2.4'
-PACKAGE_STRING='shadowsocks-libev 2.2.4'
+PACKAGE_VERSION='2.3.0'
+PACKAGE_STRING='shadowsocks-libev 2.3.0'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1339,7 +1339,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures shadowsocks-libev 2.2.4 to adapt to many kinds of systems.
+\`configure' configures shadowsocks-libev 2.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1410,7 +1410,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shadowsocks-libev 2.2.4:";;
+     short | recursive ) echo "Configuration of shadowsocks-libev 2.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1536,7 +1536,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shadowsocks-libev configure 2.2.4
+shadowsocks-libev configure 2.3.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2059,7 +2059,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by shadowsocks-libev $as_me 2.2.4, which was
+It was created by shadowsocks-libev $as_me 2.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2880,7 +2880,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shadowsocks-libev'
- VERSION='2.2.4'
+ VERSION='2.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15894,7 +15894,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by shadowsocks-libev $as_me 2.2.4, which was
+This file was extended by shadowsocks-libev $as_me 2.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15960,7 +15960,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-shadowsocks-libev config.status 2.2.4
+shadowsocks-libev config.status 2.3.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -2,7 +2,7 @@ dnl                                               -*- Autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT([shadowsocks-libev], [2.2.4], [[email protected]])
+AC_INIT([shadowsocks-libev], [2.3.0], [[email protected]])
 AC_CONFIG_SRCDIR([src/encrypt.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(auto)

debian/changelog

@@ -1,5 +1,6 @@
-shadowsocks-libev (2.2.4-1) unstable; urgency=low
+shadowsocks-libev (2.3.0-1) unstable; urgency=low
 
+  * Add manager mode to support multi-user and traffic stat.
   * Fix a build issue on OS X El Capitan.
 
  -- Max Lv <[email protected]>  Thu, 30 Jul 2015 17:30:43 +0900

openwrt/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadowsocks-libev
-PKG_VERSION:=2.2.4
+PKG_VERSION:=2.3.0
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/archive

src/Makefile.am

@@ -19,7 +19,7 @@ SS_COMMON_LIBS = $(PTHREAD_LIBS) \
 
 bin_PROGRAMS = ss-local ss-tunnel
 if !BUILD_WINCOMPAT
-bin_PROGRAMS += ss-server
+bin_PROGRAMS += ss-server ss-manager
 endif
 
 ss_local_SOURCES = utils.c \
@@ -52,9 +52,15 @@ ss_server_SOURCES = utils.c \
 					resolv.c \
                     server.c
 
+ss_manager_SOURCES = utils.c \
+                     jconf.c \
+                     json.c \
+                     manager.c
+
 ss_local_LDADD = $(SS_COMMON_LIBS)
 ss_tunnel_LDADD = $(SS_COMMON_LIBS)
 ss_server_LDADD = $(SS_COMMON_LIBS)
+ss_manager_LDADD = $(SS_COMMON_LIBS)
 ss_local_LDADD += $(top_builddir)/libudns/libudns.la
 ss_tunnel_LDADD += $(top_builddir)/libudns/libudns.la
 ss_server_LDADD += $(top_builddir)/libudns/libudns.la

src/Makefile.in

@@ -55,7 +55,7 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = ss-local$(EXEEXT) ss-tunnel$(EXEEXT) $(am__EXEEXT_1) \
 	$(am__EXEEXT_2)
-@BUILD_WINCOMPAT_FALSE@am__append_1 = ss-server
+@BUILD_WINCOMPAT_FALSE@am__append_1 = ss-server ss-manager
 @BUILD_WINCOMPAT_TRUE@am__append_2 = win32.c
 @BUILD_WINCOMPAT_TRUE@am__append_3 = win32.c
 @BUILD_REDIRECTOR_TRUE@am__append_4 = ss-redir
@@ -133,7 +133,8 @@ libshadowsocks_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libshadowsocks_la_CFLAGS) $(CFLAGS) \
 	$(libshadowsocks_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_WINCOMPAT_FALSE@am__EXEEXT_1 = ss-server$(EXEEXT)
+@BUILD_WINCOMPAT_FALSE@am__EXEEXT_1 = ss-server$(EXEEXT) \
+@BUILD_WINCOMPAT_FALSE@	ss-manager$(EXEEXT)
 @BUILD_REDIRECTOR_TRUE@am__EXEEXT_2 = ss-redir$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 am__ss_local_SOURCES_DIST = utils.c jconf.c json.c encrypt.c \
@@ -151,6 +152,10 @@ ss_local_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 ss_local_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ss_local_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_ss_manager_OBJECTS = utils.$(OBJEXT) jconf.$(OBJEXT) json.$(OBJEXT) \
+	manager.$(OBJEXT)
+ss_manager_OBJECTS = $(am_ss_manager_OBJECTS)
+ss_manager_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am__ss_redir_SOURCES_DIST = utils.c jconf.c json.c encrypt.c \
 	netutils.c cache.c udprelay.c redir.c
 @BUILD_REDIRECTOR_TRUE@am_ss_redir_OBJECTS = ss_redir-utils.$(OBJEXT) \
@@ -220,10 +225,12 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libshadowsocks_la_SOURCES) $(ss_local_SOURCES) \
-	$(ss_redir_SOURCES) $(ss_server_SOURCES) $(ss_tunnel_SOURCES)
+	$(ss_manager_SOURCES) $(ss_redir_SOURCES) $(ss_server_SOURCES) \
+	$(ss_tunnel_SOURCES)
 DIST_SOURCES = $(am__libshadowsocks_la_SOURCES_DIST) \
-	$(am__ss_local_SOURCES_DIST) $(am__ss_redir_SOURCES_DIST) \
-	$(ss_server_SOURCES) $(am__ss_tunnel_SOURCES_DIST)
+	$(am__ss_local_SOURCES_DIST) $(ss_manager_SOURCES) \
+	$(am__ss_redir_SOURCES_DIST) $(ss_server_SOURCES) \
+	$(am__ss_tunnel_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -384,9 +391,15 @@ ss_server_SOURCES = utils.c \
 					resolv.c \
                     server.c
 
+ss_manager_SOURCES = utils.c \
+                     jconf.c \
+                     json.c \
+                     manager.c
+
 ss_local_LDADD = $(SS_COMMON_LIBS) $(top_builddir)/libudns/libudns.la
 ss_tunnel_LDADD = $(SS_COMMON_LIBS) $(top_builddir)/libudns/libudns.la
 ss_server_LDADD = $(SS_COMMON_LIBS) $(top_builddir)/libudns/libudns.la
+ss_manager_LDADD = $(SS_COMMON_LIBS)
 ss_local_CFLAGS = $(AM_CFLAGS) -DUDPRELAY_LOCAL
 ss_tunnel_CFLAGS = $(AM_CFLAGS) -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL
 ss_server_CFLAGS = $(AM_CFLAGS) -DUDPRELAY_REMOTE
@@ -525,6 +538,9 @@ clean-binPROGRAMS:
 ss-local$(EXEEXT): $(ss_local_OBJECTS) $(ss_local_DEPENDENCIES) $(EXTRA_ss_local_DEPENDENCIES) 
 	@rm -f ss-local$(EXEEXT)
 	$(AM_V_CCLD)$(ss_local_LINK) $(ss_local_OBJECTS) $(ss_local_LDADD) $(LIBS)
+ss-manager$(EXEEXT): $(ss_manager_OBJECTS) $(ss_manager_DEPENDENCIES) $(EXTRA_ss_manager_DEPENDENCIES) 
+	@rm -f ss-manager$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(ss_manager_OBJECTS) $(ss_manager_LDADD) $(LIBS)
 ss-redir$(EXEEXT): $(ss_redir_OBJECTS) $(ss_redir_DEPENDENCIES) $(EXTRA_ss_redir_DEPENDENCIES) 
 	@rm -f ss-redir$(EXEEXT)
 	$(AM_V_CCLD)$(ss_redir_LINK) $(ss_redir_OBJECTS) $(ss_redir_LDADD) $(LIBS)
@@ -541,6 +557,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jconf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadowsocks_la-acl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadowsocks_la-cache.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadowsocks_la-encrypt.Plo@am__quote@
@@ -551,6 +569,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadowsocks_la-udprelay.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadowsocks_la-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadowsocks_la-win32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ss_local-acl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ss_local-cache.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ss_local-encrypt.Po@am__quote@
@@ -588,6 +607,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ss_tunnel-udprelay.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ss_tunnel-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ss_tunnel-win32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\

src/jconf.c

@@ -159,6 +159,21 @@ jconf_t *read_jconf(const char * file)
                     conf.remote_addr[0].port = NULL;
                     conf.remote_num = 1;
                 }
+            } else if (strcmp(name, "port_password") == 0) {
+                if (value->type == json_object) {
+                    for (j = 0; j < value->u.object.length; j++) {
+                        if (j >= MAX_PORT_NUM) {
+                            break;
+                        }
+                        json_value *v = value->u.object.values[j].value;
+                        if (v->type == json_string) {
+                            conf.port_password[j].port = ss_strndup(value->u.object.values[j].name,
+                                    value->u.object.values[j].name_length);
+                            conf.port_password[j].password = to_string(v);
+                            conf.port_password_num = j + 1;
+                        }
+                    }
+                }
             } else if (strcmp(name, "server_port") == 0) {
                 conf.remote_port = to_string(value);
             } else if (strcmp(name, "local_address") == 0) {

src/jconf.h

@@ -22,8 +22,9 @@
 #ifndef _JCONF_H
 #define _JCONF_H
 
+#define MAX_PORT_NUM 1024
 #define MAX_REMOTE_NUM 10
-#define MAX_CONF_SIZE 16 * 1024
+#define MAX_CONF_SIZE 128 * 1024
 #define MAX_DNS_NUM 4
 #define MAX_CONNECT_TIMEOUT 10
 #define MIN_UDP_TIMEOUT 60
@@ -33,9 +34,16 @@ typedef struct {
     char *port;
 } ss_addr_t;
 
+typedef struct {
+    char *port;
+    char *password;
+} ss_port_password_t;
+
 typedef struct {
     int remote_num;
     ss_addr_t remote_addr[MAX_REMOTE_NUM];
+    int port_password_num;
+    ss_port_password_t port_password[MAX_PORT_NUM];
     char *remote_port;
     char *local_addr;
     char *local_port;