Commit Graph
741 Commits
Author SHA1 Message Date
Boyuan Yang 025ea589d0 Change 'scoks' to 'socks' 2015-07-14 14:36:09 +08:00
Max Lv 8283e51597 enlarge the default timeout 2015-07-14 09:08:29 +08:00
Max Lv e4a795dad2 fix an issue of TPROXY 2015-07-13 20:20:53 +08:00
Max Lv 09152d405d refine the handling of dest addr 2015-07-13 10:22:24 +08:00
Max Lv b517ec2c91 fix a corner case 2015-07-12 22:20:40 +08:00
Max Lv 430fa956e3 Merge pull request #344 from shadowsocks/udp-refine
Refine UDP relay on remote side
2015-07-12 22:16:58 +08:00
Max Lv e980265bde allow different destination addresses in UDP relay 2015-07-12 22:06:37 +08:00
Max Lv 415da01dcd refine udp header constructor 2015-07-12 21:51:31 +08:00
Max Lv 78c2ab9166 fix #341 2015-07-12 18:02:56 +08:00
Max Lv 12c3136b9c fix a typo 2015-07-12 17:14:08 +08:00
Max Lv 7764466998 fix the timer 2015-07-12 17:09:56 +08:00
Max Lv 3999fbcf0b bump version 2015-07-11 08:33:33 +09:00
Max Lv cb07018f8f Merge pull request #338 from shadowsocks/multi-dst-udp-int
Fix #337
2015-07-11 07:20:52 +08:00
Max Lv e0a864aca7 Fix #337 2015-07-11 07:19:06 +08:00
Max Lv 944e3b2a16 refine the log of TCP only mode 2015-07-06 14:10:46 +08:00
Max Lv a312986239 remove UDP relay only from local mode 2015-07-06 14:04:02 +08:00
Max Lv ea9d293abe add UDP relay only mode 2015-07-06 13:48:32 +08:00
Max Lv 3a629a320c Revert "fix #330"
This reverts commit d5b1101196.
2015-06-30 19:45:39 +08:00
Max Lv d5b1101196 fix #330 2015-06-30 19:22:28 +08:00
Max Lv 4883903e65 increase max udp timeout to 60s v2.2.2 2015-06-15 09:59:58 +08:00
Max Lv bc2e30c7e7 bump version 2015-06-15 10:31:57 +09:00
Max Lv 9a5468d313 fix the timer of udprelay 2015-06-15 09:13:48 +08:00
Max Lv 00e7ea205c check name_len in the header 2015-06-12 13:37:59 +08:00
Max Lv b4bab71eb4 Merge pull request #320 from BlackGear/master
add OS X's install instruction
2015-06-05 21:37:17 +04:00
Daniel.Zeng 0e55087b01 add OS X's install instruction 2015-06-06 00:34:18 +08:00
Max Lv d53cd0c3fd decrease the MAX_UDP_TIMEOUT to 10s 2015-05-12 12:42:29 +08:00
Max Lv 215c063609 Merge branch 'master' of github.com:madeye/shadowsocks-libev 2015-05-10 20:45:35 +08:00
Max Lv 248abd3d02 clean up 2015-05-10 20:45:23 +08:00
Max Lv 50f80557d4 bump version v2.2.1 2015-05-10 21:26:21 +09:00
Max Lv d5765a8bbe fix incorrect p_len in ss_decrypt_all 2015-05-10 17:41:46 +08:00
Max Lv f3a46baa2d Update README.md 2015-05-06 12:00:14 +08:00
Max Lv 39f72a0545 Merge pull request #308 from shadowsocks/tproxy-int
Add TPROXY support for redir mode
v2.2.0
2015-05-05 14:42:04 +08:00
Max Lv 9431b9b0c3 Add TPROXY support for redir mode 2015-05-05 14:37:27 +08:00
Max Lv 1f7291b928 Merge pull request #306 from mbbill/patch-1
Fixed typo
2015-05-02 16:02:17 +08:00
Ming, Bai 840ac82f97 Fixed typo 2015-05-02 15:27:15 +08:00
Max Lv 1a3b56170d refine addr_header comparison 2015-04-13 14:37:44 +08:00
Max Lv d593ba75f1 Merge pull request #293 from was4444/master
add `genrpm.sh' to build rpm easily
2015-03-26 08:05:25 +08:00
cuckoo bf64d01a5f add `genrpm.sh' to build rpm easily 2015-03-25 21:16:54 +08:00
Max Lv 8585005eb8 Merge pull request #292 from was4444/master
add `shadowsock-libev.spec' for rpm build
2015-03-25 06:33:20 +08:00
cuckoo 9985aaa35f add rpm support 2015-03-24 23:55:41 +08:00
Max Lv 06b3a16efa Merge pull request #281 from JohnnySun/develop
Add use /etc/shadowsocks/config.json for ss-redir ss-server ss-tunnel
2015-03-06 13:14:08 +08:00
JohnnySun 4f45870970 Add try to use /etc/shadowsocks/config.json for ss-redir ss-server ss-tunnel. 2015-03-06 12:50:57 +08:00
Max Lv 10fe2ec970 Merge pull request #238 from KrazyIvan-/patch-2
output bugs
2015-03-06 11:31:50 +08:00
Max Lv b0aa8201eb Merge pull request #280 from JohnnySun/finally
When user running ss-local but not input any argument, ss-local will try...
2015-03-06 11:25:46 +08:00
JohnnySun cc639b18a4 When user running ss-local but not input any argument, ss-local will try to use ./config(if exist).
bettter way.

change default config path as /etc/shadowsocks/config.json

When user running ss-local but not input any argument, ss-local will try to use ./config(if exist).

Fixed the indent
2015-03-06 11:20:01 +08:00
Max Lv 339372af39 fix #277 2015-03-06 09:25:45 +08:00
Max Lv 48b7492940 Merge pull request #276 from JohnnySun/master
Add isatty check when change STDERR_FILENO to a file
2015-03-05 22:30:25 +08:00
JohnnySun 2de1ef639b Add isatty check when change STDERR_FILENO to a file 2015-03-05 21:32:05 +08:00
Max Lv b875797839 clean up 2015-03-05 14:16:28 +08:00
Max Lv c760f11902 refine #274 2015-03-05 12:05:53 +08:00