Merge pull request #18 from alexzhangs/develop

README.md

@@ -42,11 +42,11 @@ Code in Python, base on Django, Django REST framework, Celery, and SQLite.
 
 The development status can be found at: [project home](https://github.com/alexzhangs/shadowsocks-manager/projects/1).
 
-Node List:
-![Home › Shadowsocks › Shadowsocks Nodes](/assets/images/shadowsocks-node-list.png)
+Shadowsocks Node List:
+![Home › Shadowsocks › Shadowsocks Nodes](https://www.0xbeta.com/shadowsocks-manager/assets/images/shadowsocks-node-list.png)
 
-Node's Shadowsocks Manager:
-![Home › Shadowsocks › Shadowsocks Nodes](/assets/images/shadowsocks-node-ssmanager.png)
+Add Shadowsocks Node:
+![Home › Shadowsocks › Shadowsocks Nodes](https://www.0xbeta.com/shadowsocks-manager/assets/images/shadowsocks-node-add.png)
 
 
 ## 1. Requirements

shadowsocks_manager/shadowsocks/admin.py

@@ -56,7 +56,7 @@ class SSManagerInline(admin.TabularInline):
     extra = 1
     max_num = 1
 
-    fields = ('interface', 'port', 'encrypt', 'timeout', 'fastopen', 'is_accessible',
+    fields = ('interface', 'port', 'encrypt', 'is_accessible',
               'server_edition', 'is_v2ray_enabled',)
     readonly_fields = ('is_accessible', 'is_v2ray_enabled', 'dt_created', 'dt_updated')
 

shadowsocks_manager/shadowsocks/models.py

@@ -547,11 +547,6 @@ class SSManager(models.Model):
             'camellia-128-cfb, camellia-192-cfb, camellia-256-cfb, bf-cfb, chacha20-ietf-poly1305, '
             'xchacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf. '
             'The changes made here will not affect the plugin status on server.')
-    timeout = models.PositiveIntegerField(default=30,
-        help_text='Socket timeout in seconds for Shadowsocks client. '
-            'The changes made here will not affect the plugin status on server.')
-    fastopen = models.BooleanField('Fast Open', default=False,
-        help_text='Enable TCP fast open, with Linux kernel > 3.7.0.')
     server_edition = enum.EnumField(ServerEditionList, default=ServerEditionList.LIBEV,
         help_text='The Shadowsocks server edition. The libev edition is recommended.')
     is_v2ray_enabled = models.BooleanField(default=False,
@@ -955,8 +950,6 @@ def start(self):
             '-p 65500',  
             '-k', self.random_password(),
             '-m', self.manager.encrypt,
-            '-t', str(self.manager.timeout),
-            '--fast-open', str(self.manager.fastopen),
         ]
         """
         * close_fds=True: For Python 2.7, should not inherit the parent process's fds. The inherit fds won't be released

shadowsocks_manager/shadowsocks/serializers.py

@@ -35,7 +35,7 @@ class Meta:
 class SSManagerSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.SSManager
-        fields = ('id', 'node', 'interface', 'port', 'encrypt', 'timeout', 'fastopen', 'server_edition', 'is_v2ray_enabled', 'dt_created', 'dt_updated')
+        fields = ('id', 'node', 'interface', 'port', 'encrypt', 'server_edition', 'is_v2ray_enabled', 'dt_created', 'dt_updated')
 
     interface = EnumField(models.InterfaceList)
     server_edition = EnumField(models.ServerEditionList)

shadowsocks_manager/shadowsocks/tests.py

@@ -440,7 +440,6 @@ def up(cls):
             node=models.Node.objects.get(name='ss-libev-localhost'),
             interface=models.InterfaceList.LOCALHOST,
             port=6001,
-            fastopen=False,
             encrypt='aes-256-cfb',
             server_edition=models.ServerEditionList.LIBEV,
             is_v2ray_enabled=False,
@@ -457,7 +456,6 @@ def up(cls):
             node=models.Node.objects.get(name='ss-libev-private'),
             interface=models.InterfaceList.PRIVATE,
             port=6002,
-            fastopen=False,
             encrypt='aes-256-cfb',
             server_edition=models.ServerEditionList.LIBEV,
             is_v2ray_enabled=False,
@@ -474,7 +472,6 @@ def up(cls):
             node=models.Node.objects.get(name='ss-libev-public'),
             interface=models.InterfaceList.PUBLIC,
             port=6003,
-            fastopen=False,
             encrypt='aes-256-cfb',
             server_edition=models.ServerEditionList.LIBEV,
             is_v2ray_enabled=False,