Commit Graph
383 Commits
Author SHA1 Message Date
Max Lv 4883903e65 increase max udp timeout to 60s 2015-06-15 09:59:58 +08: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 d53cd0c3fd decrease the MAX_UDP_TIMEOUT to 10s 2015-05-12 12:42:29 +08:00
Max Lv 248abd3d02 clean up 2015-05-10 20:45:23 +08:00
Max Lv d5765a8bbe fix incorrect p_len in ss_decrypt_all 2015-05-10 17:41:46 +08:00
Max Lv 9431b9b0c3 Add TPROXY support for redir mode 2015-05-05 14:37:27 +08:00
Max Lv 1a3b56170d refine addr_header comparison 2015-04-13 14:37:44 +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
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
Max Lv f8e86c57c0 fix #274 2015-03-05 12:03:58 +08:00
Max Lv 39362601a8 fix #271 2015-03-01 16:55:44 +09:00
Max Lv 434a10b512 refine #269 2015-02-28 23:28:21 +08:00
Leonard Li 8335bae6f7 fixed config.json compatibility issue 2015-02-11 09:57:21 +08:00
Max Lv 223b8bcd68 refine UDP timeout 2015-02-09 10:11:59 +08:00
Max Lv a365d66d69 fix an issue of acl 2015-02-08 20:38:31 +09:00
Max Lv 7e46e3bacc fix #258 2015-02-08 19:23:42 +08:00
Max Lv f87ee5b424 bump version 2015-02-08 11:03:19 +09:00
Max Lv 5e68f3cd37 update Makefile 2015-02-08 10:56:31 +09:00
Max Lv 5cdd133fc7 add acl to server 2015-02-08 09:49:45 +08:00
Max Lv 6bb29ab5b1 refine #254 2015-02-05 22:26:40 +09:00
Max Lv 116db6c078 bind to 127.0.0.1 by default 2015-01-31 17:27:41 +08:00
Max Lv 601055e954 fix #250 2015-01-31 16:06:41 +08:00
Niu Tengyu 1590bf67d8 Update shadowsocks.h 2015-01-28 19:33:47 +08:00
Max Lv 02050e49e7 Merge branch 'master' of github.com:shadowsocks/shadowsocks-libev
Conflicts:
	src/udprelay.c
2015-01-27 20:48:56 +08:00
Max Lv b672c4ce7f Fix an issue on Android
http://androidxref.com/5.0.0_r2/xref/bionic/libc/include/netdb.h#164
http://androidxref.com/5.0.0_r2/xref/bionic/libc/dns/net/getaddrinfo.c#627
2015-01-27 20:45:51 +08:00
Max Lv f3f6ece4fc clean up 2015-01-26 14:25:39 +08:00
Max Lv e131e64f27 fix #241 2015-01-24 13:48:54 +08:00
KrazyIvan c627efb43d Update server.c 2015-01-24 13:29:11 +08:00
Max Lv e5983a364c fix #240 2015-01-24 01:16:36 +00:00
KrazyIvan a9c12d0f6f output bugs
fix  bug: 
initialize ciphers... (null)
listening at (null):8388
2015-01-23 20:27:19 +08:00
Max Lv 5c7e9951b2 Merge pull request #237 from KrazyIvan-/patch-2
Dual mode IPv4/IPv6 stack support
2015-01-23 17:54:09 +08:00
Max Lv e6e75ed6fb refine output 2015-01-23 17:07:43 +08:00
KrazyIvan 013d3381c3 Dual mode IPv4/IPv6 stack support 2015-01-23 16:58:49 +08:00
Max Lv 86b78dedd7 fix potential overflow 2015-01-23 15:43:23 +08:00
Max Lv e4b62b435c fix #228 2015-01-23 08:45:48 +08:00
Max Lv 726a1b7dd7 clean up 2015-01-22 09:12:19 +08:00
KrazyIvan 70f17645de Dual mode IPv4/IPv6 stack support
Listen on all IP address (ipv4 and ipv6 dual mode) in single bind by default if not specify '-s'
Create an IPv6 server socket that can also accept IPv4 connections. To do so, create a regular IPv6 socket, turn off the socket option IPV6_V6ONLY, bind it to the "any" address, and start receiving. IPv4 addresses will be presented as IPv6 addresses, in the IPv4-mapped format.
2015-01-21 23:46:03 +08:00
Max Lv a0d1299961 fix #232 2015-01-21 20:37:40 +08:00
KrazyIvan- 28b3793b23 Update server.c
Fix multi addr bind: 
example ./ss-server -s 0 -s :: 
 2015-01-21 07:28:09 ERROR: bind: Address already in use
 2015-01-21 07:28:09 ERROR: Could not bind
 2015-01-21 07:28:09 ERROR: bind() error
2015-01-21 15:47:25 +08:00
Max Lv 7ee996991f fix a bug in ss-tunnel 2015-01-19 08:58:08 +08:00
Max Lv ba889d277d fix #227 2015-01-15 15:26:46 +09:00
Max Lv a8a5085ed2 refine log 2015-01-15 12:11:32 +08:00
Max Lv 02111b64c2 fix #219 2015-01-13 11:58:55 +08:00