Commit Graph
838 Commits
Author SHA1 Message Date
Max Lv 8a34b3ea0b Rename DEBUG to SS_DEBUG 2017-02-13 13:16:57 +08:00
Max Lv 6520f340bb Fix #1240 2017-02-12 20:15:22 +08:00
Max Lv 6c62647a66 Add session key following SIP007 2017-02-12 16:34:42 +08:00
Max Lv d1018e4ca5 Ignore empty payload 2017-02-11 09:12:02 +08:00
Max Lv 0cff5503f6 Add default manager-address 2017-02-10 15:38:38 +08:00
Max Lv f4b1641636 Fix #1217 2017-02-08 09:58:04 +08:00
Max Lv c5c8389a8d Fix data len 2017-02-06 18:03:05 +08:00
Max Lv c9d7ff16d6 Fix a typo 2017-02-06 17:26:58 +08:00
Max Lv ef0402eb10 Add --key option to set key directly (#1207) 2017-02-06 17:02:04 +08:00
Dijkstra 43aabb2303 Fix typo. (#1206) 2017-02-06 16:33:21 +08:00
Kim bf14944490 fixed json_null => NULL (#1193)
The json_null should be C NULL.
2017-02-05 07:14:19 +08:00
Max Lv 894eae567c Refine ciphers 2017-02-04 20:04:48 +08:00
Max Lv dde1bf7dec Fix a potential issue in parse_addr 2017-02-04 18:36:06 +08:00
Max Lv 2b1b9bb403 Refine buffer handling in stream_decrypt 2017-02-04 16:22:58 +08:00
Max Lv 68929513d3 Fix a typo 2017-02-04 15:32:24 +08:00
Max Lv 2f7882244f Refine IV in stream cipher 2017-02-04 12:45:13 +08:00
Max Lv 116e177657 Refine ss-tunnel 2017-02-04 09:34:38 +08:00
Max Lv 44220a5a53 Fix options 2017-02-04 09:29:31 +08:00
Max Lv f45c150e02 Fix redundant options 2017-02-04 09:23:22 +08:00
Max Lv a906d0cfc8 Fix UDP relay issue on Android 2017-02-03 12:33:28 +08:00
Max Lv 7ef88b174c Fix #1154 2017-02-03 07:52:26 +08:00
Max Lv 6e0c257bce Fix help message 2017-02-03 07:24:18 +08:00
Max Lv 7b290f30d6 Make SO_REUSEPORT disabled by default 2017-02-02 21:05:57 +08:00
Max Lv df595fcb73 Fix #1168 2017-02-02 20:27:06 +08:00
Mygod c8bcf594e2 Fix android.c 2017-02-02 17:36:59 +08:00
Max Lv 833594e3c6 Update Makefile 2017-02-01 19:22:36 +08:00
Max Lv 78cf5348f0 Update documents 2017-02-01 18:51:48 +08:00
Max Lv 56658d1c79 Merge pull request #1152 from shadowsocks/sip004
Add AEAD support
2017-02-01 18:19:40 +08:00
anonymous-contributor 98c51cd0d5 Obfsproxy standalone mode (#1156)
* ss-libev: Introduce mode parameter for start_plugin

Since obfsproxy handles client and server in different ways, no matter
standalone or manged mode, so introduce the mode for start_plugin() to
support obfsproxy.

With more comments added to plugin.h for later developers.

Signed-off-by: Adam Anonymous <anonymous_temp_mail@yahoo.co.jp>

* ss-libev: Move SS protocol plugin initialization code to start_ss_plugin

Move SS protocol plugin initialization to start_ss_plugin() function, as
the support for obfsproxy will not use that environment.

Also, remove the use of get_current_dir_name() which is a glibc
extension, such macro hack will just make code less readable.
Not to mention it already screw up code folding of vim.

Signed-off-by: Adam Anonymous <anonymous_temp_mail@yahoo.co.jp>

* ss-libev: Introduce obfsproxy standalone mode support as plugin

Now shadowsocks-libev supports to use obfsproxy as plugin.

Currently we only support to use standalone(proxy) mode of obfsproxy, as
managed mode needs to use SOCKS5 as upstream forward, while ss-libev
doesn't support it yet.

And the output from plugin is just trashed for now.
Support to pipe them into stdout/stderr will be added later.

Signed-off-by: Adam Anonymous <anonymous_temp_mail@yahoo.co.jp>

* ss-libev: doc: Fix wrong cmdline parameter for plugin options

Command line option for plugin options is "--plugin-opts", not the json
option "--plugin_opts"

Fix it.

Signed-off-by: Adam Anonymous <anonymous_temp_mail@yahoo.co.jp>
2017-02-01 18:18:43 +08:00
anonymous-contributor a3d0f02c3e Use enum number for val of long options (#1155) 2017-02-01 12:53:20 +08:00
anonymous-contributor 1fc17aca38 Use enum number for val of long options (#1155)
* ss-libev: local: Use enum number for val of long options

Signed-off-by: Adam Anonymous <anonymous_temp_mail@yahoo.co.jp>

* ss-libev: manager: Use enum number for val of long options

Signed-off-by: Adam Anonymous <anonymous_temp_mail@yahoo.co.jp>

* ss-libev: redir: Use enum number for val of long options

Signed-off-by: Adam Anonymous <anonymous_temp_mail@yahoo.co.jp>

* ss-libev: server: Use enum number for val of long options

Signed-off-by: Adam Anonymous <anonymous_temp_mail@yahoo.co.jp>

* ss-libev: tunnel: Use enum number for val of long options

Signed-off-by: Adam Anonymous <anonymous_temp_mail@yahoo.co.jp>
2017-02-01 12:49:10 +08:00
Max Lv c0030f0d7d Improve logging 2017-01-31 20:01:44 +08:00
Max Lv 790520c478 No need to report addr in non-stream mode 2017-01-31 19:42:01 +08:00
Max Lv 05d5121707 Fix typos for endian 2017-01-31 18:51:52 +08:00
Max Lv 3b2a5d1a1f Fix SNI parser 2017-01-31 18:41:57 +08:00
Max Lv 32057ed3c5 Fix key sizes 2017-01-31 16:22:33 +08:00
Max Lv c89f5f3f3f Limit the max payload length to 0x3FFF 2017-01-30 19:03:41 +08:00
Max Lv 9c7add71dd Fix #1148 2017-01-30 08:41:04 +08:00
Max Lv e18f71b03f Add Argon2i password hashing for AEAD 2017-01-29 17:41:39 +08:00
Max Lv 28e07cc08a Clean up 2017-01-29 10:16:17 +08:00
Max Lv 4ebe5aeb12 Add SIP004 (AEAD) support 2017-01-29 10:10:44 +08:00
Roger Shimizu d714d1f182 Refine #1133 second time (#1136) 2017-01-25 18:20:21 +08:00
Max Lv c5807058ba Add missing ss-nat 2017-01-25 10:57:12 +08:00
Max Lv 7ad1e65f6e Fix array size with old libsodium 2017-01-25 10:30:52 +08:00
Max Lv 30fe158d88 Refine #1133 2017-01-25 08:38:38 +08:00
ElTopo 3aa92e3f0a libsodium version checking with crypto_stream_chacha20_ietf_xor_ic() (#1133)
* crypto_stream_chacha20_ietf_xor_ic() was first available when libsodium was bumpped to version major 8. Debian jessie still uses major 7 minor 2, so check SODIUM_LIBRARY_VERSION_MAJOR and keep backwards compatibility.

* crypto_stream_chacha20_ietf_xor_ic() was first available when libsodium was bumped to version major 8. Debian jessie still uses major 7 minor 2, so check SODIUM_LIBRARY_VERSION_MAJOR and maintain backward compatibility.
2017-01-25 07:30:47 +08:00
Max Lv d783aab537 Remove _WIN32 2017-01-24 20:53:13 +08:00
Max Lv 3f8cd982e5 Drop MinGW32 support 2017-01-24 20:10:31 +08:00
Max Lv cb60579c74 Refine buffer handling in ss-manager 2017-01-23 12:27:45 +08:00
Max Lv 2d3a1b2a3e Fix #1123 2017-01-23 08:44:36 +08:00