Commit Graph

367 Commits

Author SHA1 Message Date
hdl
8ac72b0b25 parse dns_servre in config (#739)
thx
2017-02-28 22:15:47 +08:00
392e54e508 update regex to support hostnames containing underscore (#694) 2017-01-02 14:56:57 +08:00
d31003e9bf new debian package (#659)
* * new upstream version
* change repository.
* change license.
* standards version change to 3.9.8
* fix #810688: man page references texinfo documents which don't exist

* * merge back thomas's change

* * Fix compatible issue (Closes: #845016)
2016-11-20 15:29:11 +08:00
72f1d68a05 Fixed #675 (#676)
* fix a OTA bug

* correct a wrong comment

* ignore emacs autosave files

* keep consistence with the defensive style

* a little refractor

* fix daemon stop failed (#675)

* fix test failed
2016-11-20 14:59:32 +08:00
5a05312189 Fix method on manager's add command (#578) (#614) 2016-10-11 21:31:41 +08:00
4f28f7c8e4 Fix a OTA bug on _ota_chunk_data (#642)
* fix a OTA bug

* correct a wrong comment
2016-10-10 23:05:20 +08:00
5cd9f04948 Refactor (#615)
* make tcprelay.py less nested

* import traceback module at the top

* make loops in DNSResolver less nested

* make manager.py less nested

* introduce exception_handle decorator

make try/except block more clean

* apply exception_handle decorator to tcprelay

* quote condition judgement

* pep8 fix
2016-10-07 12:30:17 +08:00
5c11527e1b fix ota call write_to_sock multi 2016-09-04 01:18:13 -07:00
56bf81f58a fix ota (#609)(#610) (#610) 2016-09-04 00:05:15 -07:00
6ef14e56db Add chacha20-ietf crypto (#590)
* Add chacha20-ietf crypto

* fix chacha20-ietf

* PEP8

* Update sodium.py (#1)

pep8
2016-08-17 17:06:54 +08:00
8e8ee5d490 Update tcprelay.py
one time auth fail should be return
2016-07-18 23:31:51 +08:00
f7afcd4df0 add ota help in local 2016-07-18 23:00:00 +08:00
677e6c4c56 fix ota 2016-05-15 01:27:21 +08:00
9844ba9dc7 pep8 2016-04-16 12:19:32 +08:00
f62a550e9f pep8 2016-04-16 12:13:59 +08:00
aae990a2fc Add auth method check for TCP socks connections (#528)
* Add auth method check for TCP socks connections

* remove meaningless return at end of function

* remove extra blank lines
2016-04-16 11:54:12 +08:00
htc
b276d52735 Add support for option 'prefer-ipv6' 2016-02-20 11:33:50 +08:00
a8d116d70a fix bug with ord in Py3 2016-01-12 14:20:46 +08:00
811a0e6eb8 PEP8 and undefined name 'gen_key_iv' 2016-01-12 12:17:46 +08:00
269e3dd82d test pass ota in udp 2016-01-12 12:10:40 +08:00
248582c932 remove IPv6 testcase and add ota test 2016-01-12 10:34:48 +08:00
d2f1caeb5d fixbug: when ota disable data not write 2016-01-12 01:03:25 +08:00
jsy
614eed2bf0 PEP8 2016-01-11 23:27:21 +08:00
jsy
7c8ecb811c PEP8 2016-01-11 23:20:12 +08:00
jsy
a4a87eb127 PEP8 2016-01-11 23:18:16 +08:00
jsy
ee391c7773 udp ota bug 2016-01-11 22:58:53 +08:00
jsy
2d40a361db ota config 2016-01-11 18:42:23 +08:00
jsy
569ca0d0a4 reverse config 2016-01-11 18:30:45 +08:00
jsy
28c4d14b12 Merge branch 'feature-ota' 2016-01-11 15:06:59 +08:00
743ddf42d5 Merge pull request #481 from RockerFlower/master
Shadowsocks
2016-01-11 10:30:12 +08:00
jsy
ca99abff89 fix udp ota 2016-01-11 10:26:51 +08:00
jsy
77b2a22055 ota completed! 2016-01-11 10:11:31 +08:00
jsy
767b9217f8 one time auth server side 2015-12-06 02:02:25 +08:00
173323c0f8 Update common.py
https://github.com/mengskysama/shadowsocks-rm/issues/4
2015-11-13 14:29:27 +08:00
0aba0aa40c fix memory leak!
_dns_cache bommmm
2015-10-26 09:45:02 +08:00
4d24b7477a fix bug!
if _last_visits[index] len > 1
2015-10-26 09:43:48 +08:00
6683dfd3bb fix manger bug 2015-10-09 14:49:09 +08:00
0c4f79284e allow user to override system dnsserver with config.
config item:
    dns_server     list

    eg:
        dns_server:[8.8.8.8,8.8.4.4]
2015-08-17 09:55:05 +08:00
f19d0ea6fd fix #425 2015-08-15 22:36:29 +08:00
a2bc6e1945 fix #414 2015-08-11 17:55:16 +08:00
a434eef096 fix json decode issue 2015-08-10 11:53:54 +08:00
3c1154923f fix json unicode issue in manager 2015-08-10 00:06:19 +08:00
c8b3f71e1b respond ok to add and remove commands 2015-08-06 19:45:37 +08:00
3576b3006c support IPv6 on control socket 2015-08-06 15:13:29 +08:00
249bcc0b29 refine unit test 2015-08-06 00:52:25 +08:00
30efc30360 fix pyflakes 2015-08-06 00:34:20 +08:00
a8ae8ab373 add unit test for manager 2015-08-05 23:59:59 +08:00
4f948b2286 fix password type in udprelay 2015-08-05 23:59:14 +08:00
d20a07192c allow manager to bind on unix socket 2015-08-05 23:11:56 +08:00
9c3af61433 add statistics 2015-08-05 22:43:21 +08:00