134bf332a4
remove domain not existed test(causing time out)
2014-12-11 14:13:58 +08:00
e1f2046229
lint code
2014-12-11 14:09:18 +08:00
030cdbcec0
add asyncdns test
2014-12-11 14:08:34 +08:00
d42a32fbc0
master should wait for child to quit
2014-12-11 13:00:08 +08:00
e6416562fc
add salsa20 and chacha20
2014-12-10 23:19:11 +08:00
84dcff83c1
add libsodium support
2014-12-10 23:11:22 +08:00
fa31a233b6
add ipv6 tests
2014-11-10 15:04:30 +08:00
f43906006a
fix str/byte issue in python 3
2014-11-10 10:37:37 +08:00
70dae91e7c
add tests for common.py
2014-11-06 14:04:28 +08:00
b5010df575
fix args on Python 3
2014-11-06 13:08:40 +08:00
6bbf347d0e
Merge branch 'master' of https://github.com/jinliu/shadowsocks into jinliu-master
2014-11-05 18:48:49 +08:00
5209860db1
fix cipher name in test
2014-11-05 18:42:01 +08:00
f9ba6f7390
fix table test
2014-11-05 18:40:51 +08:00
710fe14190
rename test_cipher as it will break unit tests
2014-11-05 18:32:01 +08:00
039451bcfb
fix encrypt_all
2014-11-05 18:30:18 +08:00
cbf8c6705b
refactor table into a single cipher plugin
2014-11-05 18:27:18 +08:00
2519fb9abe
Merge pull request #208 from felixonmars/table-py3
...
encrypt.py: port table to support python 3 (recreated)
2014-11-05 17:15:43 +08:00
aca86f8685
encrypt.py: port table to support python 3
2014-11-05 16:54:51 +08:00
fb27cf52a9
Fix str/byte related TypeError in Python 3.4
...
Traceback (most recent call last):
File "/usr/bin/sslocal", line 9, in <module>
load_entry_point('shadowsocks==2.4', 'console_scripts', 'sslocal')()
File "/usr/lib/python3.4/site-packages/shadowsocks/local.py", line 68, in main
loop.run()
File "/usr/lib/python3.4/site-packages/shadowsocks/eventloop.py", line 230, in run
handler(events)
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 630, in _handle_events
handler.handle_event(sock, event)
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 458, in handle_event
self._on_local_read()
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 377, in _on_local_read
self._handle_stage_reply(data)
File "/usr/lib/python3.4/site-packages/shadowsocks/tcprelay.py", line 212, in _handle_stage_reply
s = remote_sock.sendto(data, MSG_FASTOPEN, self._chosen_server)
TypeError: 'str' does not support the buffer interface
2014-11-05 11:04:40 +08:00
f02e9a3132
fix EVP_CIPHER_CTX_new's arg types
2014-11-02 17:13:56 +08:00
d971cb44a8
tcprelay.py: wrap long line for PEP8
2014-11-02 00:41:29 +08:00
833c98e114
tcprelay.py: decode remote_addr to fix extra b'' in logging on python 3
2014-11-02 00:23:44 +08:00
90dc03c762
prefer ctypes over m2crypto in rc4-md5
2014-11-01 13:52:16 +08:00
4affb56d36
fix test
2014-11-01 13:24:40 +08:00
13c6c393db
fix pyflakes
2014-11-01 13:10:19 +08:00
82ddafafa5
skip m2crypto tests on pypy
2014-11-01 13:03:13 +08:00
1205b8c50e
skip m2crypto tests on Python 3
2014-11-01 12:52:51 +08:00
812a286f12
lint code
2014-11-01 12:44:22 +08:00
7bff002202
more cipher tests
2014-11-01 12:40:06 +08:00
c69a127772
add some tests
2014-11-01 12:25:44 +08:00
50e5e620a3
fix version detection
2014-10-31 22:27:12 +08:00
aff411a456
seems that dependency requires 3.3+
2014-10-31 22:16:44 +08:00
0719e80fbd
fix python 3.*
2014-10-31 22:08:51 +08:00
efd45ddfc6
fix UDP server
2014-10-31 21:59:22 +08:00
4699de1dd9
fix python 3.2
2014-10-31 21:53:53 +08:00
a502dd32fc
fix UDP
2014-10-31 21:49:22 +08:00
5024b300f1
fix rc4-md5
2014-10-31 19:21:13 +08:00
be045f1687
fix import
2014-10-31 19:10:29 +08:00
497524b313
drop table on Python 3
2014-10-31 19:08:00 +08:00
05ba3cc5aa
lint code
2014-10-31 18:57:06 +08:00
ede2b1b120
fix salsa20 on python 3
2014-10-31 18:56:24 +08:00
f0b0c1edfa
update python requirement
2014-10-31 18:45:21 +08:00
0fd2f30911
lint code
2014-10-31 18:43:15 +08:00
2a53b67c65
python 3 support; not stable yet
2014-10-31 18:28:22 +08:00
0814888ba5
use absolute import
2014-10-31 16:29:19 +08:00
89dc6031e8
lint code
2014-10-31 16:14:28 +08:00
c553e7a725
lint code
2014-10-31 16:10:41 +08:00
ac94104ac0
use deque instead of heapq
2014-10-31 15:49:24 +08:00
da11d02706
fix memory leak
2014-10-31 15:14:28 +08:00
2461f623dd
change lru behaviour; #202
2014-10-31 14:33:43 +08:00
9e8aa1c56a
fix libcrypto on Windows
2014-10-11 00:38:19 +08:00
eb9b6f0a9b
does not require M2Crypto anymore
2014-10-08 21:03:01 +08:00
dfd4cdd758
avoid memory leak
...
Although fd is always the smallest number which haven't been allocated, which means memory leak is quite small. but the worst situation may consume lots of memory.
2014-09-25 20:18:02 +08:00
dda8f31bd3
fix PEP8
2014-09-20 20:21:09 +08:00
c668ddbc1b
fix multiple ports
2014-09-20 19:57:55 +08:00
f677c8152d
close #185
2014-09-20 19:11:33 +08:00
ab74c010fd
close #183
2014-09-20 19:01:52 +08:00
81223902d0
fix a potential BOF
2014-09-19 01:07:10 +08:00
4be2731293
fix PEP8
2014-09-17 14:15:24 +08:00
f6951c9633
fix m2
2014-09-17 13:54:33 +08:00
d6a5c567ae
lint
2014-09-17 13:52:28 +08:00
402bc5743b
add comment about buf
2014-09-17 00:11:50 +08:00
0e649453ed
support CTR mode
2014-09-16 23:55:50 +08:00
2122f96aeb
lint code
2014-09-16 11:03:36 +08:00
76fed23b34
refactor encrypt; add cfb1 and cfb8 modes
2014-09-16 10:58:45 +08:00
5aece6f464
remove test in asyncdns
2014-09-14 10:17:45 +08:00
e72594ffbe
only end querying when response is of query type AAAA
2014-09-14 10:16:40 +08:00
3ce7c18dfb
close #180
2014-09-14 10:06:16 +08:00
21f61c7d91
avoid removing items of the handler list while iterating over it; #179
2014-09-13 00:02:21 +08:00
2a61e80071
only output exception in verbose mode
2014-09-12 23:06:18 +08:00
ea70a5bd79
exit 1 on error; #179
2014-09-12 22:20:33 +08:00
380a646f09
handle signal soon; #179
2014-09-12 22:18:08 +08:00
e43520da58
log when closing port
2014-09-12 20:59:47 +08:00
fdb3a36170
implement graceful shutdown in sslocal; close #179
2014-09-12 20:47:04 +08:00
a6b8a5eef9
add some debug logs
2014-09-12 00:53:12 +08:00
327c70e353
Graceful shutdown; close #179
2014-09-12 00:51:25 +08:00
3e3c885a42
remove print
2014-09-09 16:18:39 +08:00
1044358a6b
use md5 instead of sha256; #178
2014-09-09 16:17:33 +08:00
c9b489b5e3
fix UDP
2014-09-09 14:43:32 +08:00
1b4e885818
add rc4-sha256; close #178
2014-09-09 14:26:34 +08:00
972bf22e6d
fix PEP8
2014-08-27 00:17:26 +08:00
e51aa4f137
use only ipv4 dns server
2014-08-10 12:23:44 +08:00
ca6f72e22b
better error msg
2014-08-01 17:21:43 +08:00
72fe18212e
add quiet mode; close #164
2014-07-26 17:52:42 +08:00
da842918bd
close #158
2014-07-23 14:33:55 +08:00
c66d9b2c20
more details
2014-07-12 17:48:33 +08:00
e7e226768a
add instructions for installing m2crypto
2014-07-12 17:45:56 +08:00
a323f878e1
prefer addrtype 1 and 4 over 3 in UDP relay
2014-07-12 10:32:51 +08:00
a1bc23c161
fix salsa20
2014-07-11 18:48:57 +08:00
2950f99da6
fix salsa20 for UDP
2014-07-11 18:46:26 +08:00
040c956472
fix server-multi-ports
2014-07-11 18:40:18 +08:00
122f233143
fix udprelay for local
2014-07-11 18:00:58 +08:00
b0c8e50492
fix #145
2014-07-04 22:25:27 +03:00
13436b224e
add EWOULDBLOCK to fix Windows; close #138
2014-07-04 22:01:10 +03:00
012ab70500
use multiple DNS instead of trying each one
2014-06-23 21:46:23 +08:00
d4458bceb7
add timeout support in DNS
2014-06-23 21:35:39 +08:00
61d9e17cae
remove print
2014-06-22 19:50:34 +08:00
f9fef0e229
add TypeError
2014-06-22 11:58:22 +08:00
4b3c018aa9
verify hostname
2014-06-20 22:58:14 +08:00
cb5481499e
fix tcp fastopen
2014-06-20 22:32:02 +08:00
41010d810e
support -vv verbose logging
2014-06-20 21:06:15 +08:00
6c6afde2a5
auto fallback when fast open not available
2014-06-20 20:35:33 +08:00
d639a375bc
remove fd logging
2014-06-19 10:11:48 +08:00
d949d11b28
larger buffer
2014-06-19 10:01:55 +08:00
35bfa56eaf
fix POLL_HUP
2014-06-19 09:41:44 +08:00
46d23bf0d4
more log
2014-06-19 09:20:04 +08:00
743d3cddb5
close #132
2014-06-18 15:50:05 +08:00
a0e1a9f1b0
close #122
2014-06-18 12:59:00 +08:00
08e351a55d
add more logs
2014-06-18 12:54:16 +08:00
a109f571e3
fix worker master
2014-06-12 17:11:05 +08:00
df836bed77
fix DNS record parsing
2014-06-12 16:21:08 +08:00
9422ef2fd3
Fix table encryption with UDP
2014-06-11 19:21:17 +08:00
2306add1df
split parse_header()
2014-06-11 14:42:51 +08:00
26fa1ab555
refine comments
2014-06-08 18:28:02 +08:00
24eadfbb5f
send again even if in queue
2014-06-08 17:30:50 +08:00
bcdc1e9671
add async dns to tcp relay
2014-06-08 17:12:00 +08:00
5c274a1bc7
update dns
2014-06-08 16:38:30 +08:00
cdd333ea97
update dns
2014-06-08 16:35:39 +08:00
de5461a17e
refine test
2014-06-08 16:08:00 +08:00
71c3759c12
add async dns
2014-06-08 15:58:59 +08:00
fbc4906445
add cache
2014-06-08 15:41:39 +08:00
9c0bab297e
more work
2014-06-08 14:38:09 +08:00
5fd2f3d6ee
Merge branch 'dev' into asyncdns
2014-06-08 14:17:30 +08:00
45f9998fa9
more work
2014-06-08 14:17:26 +08:00
6b76319495
more work
2014-06-08 13:55:19 +08:00
7a77205530
update ns
2014-06-07 11:50:30 +08:00
795e0f4b8e
update ns
2014-06-07 00:11:14 +08:00
d7d125082f
handle POLL_ERR first
2014-06-06 23:10:00 +08:00
816592b674
add more log
2014-06-06 22:57:57 +08:00
a185e1671b
add some status protection
2014-06-06 22:52:02 +08:00
c354d8a8af
add asyncdns
2014-06-06 21:33:10 +08:00
dbaf83eb7b
fix a typo
2014-06-05 20:52:29 +08:00
d3f294217c
close #121
2014-06-05 19:47:03 +08:00
8aae1f07ca
warn table encryption
2014-06-03 23:44:49 +08:00
944c422768
fix fast open
2014-06-03 23:37:36 +08:00
a08edd2007
fix fastopen local
2014-06-03 22:29:54 +08:00
8d25047d56
fix fastopen local
2014-06-03 22:26:22 +08:00
adda6d6e29
lint code
2014-06-03 22:15:59 +08:00
0c12ee04cb
implement fast open in local
2014-06-03 21:59:34 +08:00
f6a9cad684
add fast open support in server
2014-06-03 21:22:53 +08:00
6c35dfd832
fix typo
2014-06-02 18:24:26 +08:00
476738d273
fix errno
2014-06-02 18:16:24 +08:00
5d022e2828
fix None
2014-06-02 18:11:38 +08:00
1966b643fc
update log
2014-06-02 18:08:22 +08:00
c5bcb9a050
add timeout support
2014-06-02 17:01:35 +08:00
0e662e04b6
lint
2014-06-02 13:12:15 +08:00
cadf0e11bb
fix header parsing
2014-06-02 13:11:20 +08:00
c225b808d6
UDP assoc
2014-06-02 12:53:22 +08:00
e66636867a
align
2014-06-02 12:27:59 +08:00
bbad408ace
rename things
2014-06-01 19:34:35 +08:00
0c8a8ef23f
refine loop
2014-06-01 19:09:52 +08:00
5e19fdc66b
refine exiting
2014-06-01 17:56:41 +08:00
7a1647278f
fix multiple servers
2014-06-01 17:50:57 +08:00
7a98331655
add salsa20 test
2014-06-01 17:35:32 +08:00
77f74a0668
fix python version check
2014-06-01 17:29:18 +08:00
20ba04c4ce
fix tests
2014-06-01 17:24:10 +08:00
2672a6378e
fix ctrl C
2014-06-01 17:20:51 +08:00
fd35f1d067
fix server
2014-06-01 17:18:02 +08:00
f49d086d6a
add event names
2014-06-01 17:17:50 +08:00
c721a1c02f
local works
2014-06-01 15:58:37 +08:00
3cefe374c2
socket.SO_REUSEADDR
2014-06-01 14:53:06 +08:00
5e9a9c9beb
almost done
2014-06-01 14:20:40 +08:00
cd22d474fe
almost done
2014-06-01 14:11:38 +08:00
47fd479d6e
almost done
2014-06-01 14:10:18 +08:00
bacf9cb443
more work
2014-06-01 13:42:48 +08:00
c2f6bc369c
more work
2014-06-01 11:01:11 +08:00
0d6c39900b
more work
2014-05-30 23:55:33 +08:00
2cdddd4515
update config
2014-05-30 18:17:40 +08:00
4f46400145
add ssloop branch
2014-05-30 16:28:44 +08:00
a30e53ee65
add timeout in local
2014-05-24 21:29:40 +08:00
ea451344ff
fix workers
2014-05-24 19:16:21 +08:00
6e5a753d41
add timeout in TCP server
2014-05-22 12:01:13 +08:00
428de3cf42
signal children
2014-05-17 14:02:30 +08:00
8f19fe278c
fix workers
2014-05-17 13:54:28 +08:00
3f523ee942
fix workers
2014-05-17 13:42:26 +08:00
df7614f26c
support workers
2014-05-17 12:44:12 +08:00
eb8fccad79
fix Windows
2014-05-13 20:34:11 +08:00
6caeabd03d
fix a potential RST problem
2014-05-10 01:22:26 +08:00
92c9ba0009
optimize
2014-05-04 00:52:08 +08:00
af46629cd1
fix salsa20
2014-05-04 00:16:12 +08:00
9a1899785e
remove temporary test code
2014-05-03 23:23:03 +08:00
fd4efca0fe
add test
2014-05-03 23:04:49 +08:00
ed39505dc1
experimental salsa20-ctr cipher; close #108
2014-05-03 22:42:40 +08:00
33f7ad9e8f
fix EINPROGESS
2014-05-03 08:41:56 +08:00
04d4db1f0b
close #97
2014-05-02 13:19:42 +08:00
e0a27f1df3
lint server
2014-05-02 12:47:56 +08:00
89a7508f26
lint code
2014-05-02 12:28:53 +08:00
2a172bea6a
fast open
2014-05-01 15:07:45 +08:00
0b9ff0557f
fastopen
2014-05-01 13:43:00 +08:00
355307e5ef
add nodelay
2014-05-01 11:44:36 +08:00
b8f9370426
fix close
2014-05-01 11:21:05 +08:00
6dae7d231e
fix local
2014-04-24 15:24:43 +08:00
7e70fe290a
fix local
2014-04-24 15:07:18 +08:00
fb674c6b52
close #104
2014-04-24 13:00:36 +08:00
e6a225513e
fix remove()
2014-04-24 12:34:31 +08:00
6834178a89
add LRUCache
2014-04-24 01:36:22 +08:00
9ffb0320bb
move connect to a proper place
2014-04-24 00:15:18 +08:00
6e50890f4f
add connect
2014-04-24 00:10:45 +08:00
10c73e555a
fix a typo
2014-04-23 22:51:45 +08:00
1ed149a46a
udp server works
2014-04-23 22:44:10 +08:00
clowwindy