Commit Graph
1500 Commits
Author SHA1 Message Date
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
Mygod cb84aee1c9 Fix #1170 (#1187) 2017-02-04 12:51:33 +08:00
Max Lv d9c2934a63 Merge branch 'master' of github.com:shadowsocks/shadowsocks-libev 2017-02-04 12:47:22 +08:00
Max Lv 2f7882244f Refine IV in stream cipher 2017-02-04 12:45:13 +08:00
Cokebar Chi 8406c74cf7 Update readme about libmbedtls and libsodium (#1186)
* compile mbedTLS as shared library

1. Without "SHARED" defined, mbedTLS will be compile as static library. 
2. There's no need to install libmbedtls-dev & libsodium-dev from repository, because they're comiled and installed from the latest source.

* update Ubuntu/Debian build depend

Add dh-autoreconf as build depend for Ubuntu/Debian
2017-02-04 11:59:11 +08:00
Max Lv a0757a4a02 Update README 2017-02-04 11:51:38 +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
Register f64177acce remove dependency: openssl-dev 2017-02-03 19:19:06 +08:00
Max Lv 95ef3d5635 Add iperf.sh 2017-02-03 18:47:29 +08:00
Max Lv ce0d6d4043 Update libcork for #1178 2017-02-03 17:14:27 +08:00
Max Lv cf651c6120 Revert "fill the Debian apt command for readme"
This reverts commit a62faee751.
2017-02-03 15:57:12 +08:00
Max Lv 4d6a230227 Merge pull request #1179 from rainysia/fix_readme
Fill the Debian apt command for readme
2017-02-03 14:14:49 +08:00
Max Lv e109bdc2c0 Merge pull request #1180 from kimw/patch-1
Cleanup README.md
2017-02-03 14:14:23 +08:00
Kim e50c6f2664 Cleanup README.md
remove `-A` option
2017-02-03 14:12:46 +08:00
rainysia a62faee751 fill the Debian apt command for readme 2017-02-03 14:02:37 +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
Max Lv 10d63131f4 Merge pull request #1171 from registe/master
Update Dockerfile
2017-02-02 20:06:01 +08:00
Register 2444427e07 Update Dockerfile
fix .build-deps
2017-02-02 20:01:56 +08:00
Mygod c8bcf594e2 Fix android.c 2017-02-02 17:36:59 +08:00
Max Lv 78c3778b58 Fix typos 2017-02-02 16:48:51 +08:00
Max Lv 3934d6956b Update README 2017-02-02 15:09:53 +08:00
Max Lv fdac255442 Merge pull request #1165 from Sherlock-Holo/master
arch可以直接装libsodium
2017-02-02 11:32:17 +08:00
Sherlock Holo 9bf8ffa528 arch可以直接装libsodium 2017-02-02 11:31:18 +08:00
Max Lv cc11499c45 Update README.md 2017-02-02 11:28:01 +08:00
Max Lv 3b8b30aec2 Update README 2017-02-02 10:16:49 +08:00
Max Lv 0c4292c637 Check version of libsodium 2017-02-01 22:51:39 +08:00
Max Lv 833594e3c6 Update Makefile v3.0.0 2017-02-01 19:22:36 +08:00
Max Lv 4d25f176b6 Bump version 2017-02-01 19:18:12 +08:00
Max Lv 1133a017a4 Update README 2017-02-01 19:01:29 +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
Max Lv 0bb3739286 Update travis-ci 2017-02-01 12:56:59 +08:00
Max Lv 47a6a90af5 Merge branch 'master' into sip004 2017-02-01 12:55:28 +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 b0e00b4044 Fix mbed TLS's URL 2017-01-31 16:51:52 +08:00
Max Lv 32057ed3c5 Fix key sizes 2017-01-31 16:22:33 +08:00
Mygod 37594afb5d Use libsodium tarball to ensure reproducible build in Travis (#1153) 2017-01-31 16:13:43 +08:00