Commit graph

805 commits

Author SHA1 Message Date
JemyZhang
69ffa30673 reply stat to ping cmd as the spec describe.
Change for making the python version and libev version the same
discipline, easy maintenance for shadowsocks-manager

- reply stat but not pong as the spec description. keeping the same with
  the libev version.
    To receive a pong:

    ping
    Shadowsocks will send back transfer statistics:

    stat: {"8001":11370}
- change the stat data as the sum of the port realflow, keeping the same
  with the libev version
- reply the stat even if the port flow is zero, more fit as a pong
  action
2017-03-25 07:44:06 +08:00
Falseen
1222fb19a6 update find_lib's name for the new openssl-1.1 dll (just for windows) (#796)
the new openssl's dll(1.1) is rename to libcrypto-1_1-x64.dll and libcrypto-1_1.dll
2017-03-21 20:15:38 +08:00
Falseen
9e25cc6bb4 fix some error for parse dns_servre in config (#798)
and fix pep8

https://github.com/shadowsocks/shadowsocks/pull/739
2017-03-19 12:37:57 +08:00
Zou Yong
4e21f83bd6 Handle cipher exceptions #783 (#791) 2017-03-15 00:35:17 +08:00
Zou Yong
74f8f8cb85 Add sodium:aes-256-gcm and openssl:ocb AEAD mode (#784)
* Add sodium:aes-256-gcm and openssl:ocb AEAD mode
Use sodium_increment for nonce_increment if avaiable

* Fix pep8

* Fix python3 test code
2017-03-10 17:44:42 +08:00
Zou Yong
d6b40efa5d encrypt.py is renamed to cryptor.py (#780) 2017-03-05 01:09:40 +08:00
Zou Yong
445a3c9c7e Add AEAD ciphers support (#775)
* Add AEAD ciphers support, add manger api

* fix test_encrypt_all

* Add manager api requirements

* #775 fix UDP decrypt_all issue

* fix udp replay: decrypt_all return a list
remove manager api

* fix indent according pep8

* remove abc requirement

* remove unused import

* fix pep8 format

* fix test_aes_256_gcm()
2017-03-04 14:37:29 +08:00
Elvis Wang
c4731de532 Update README.md (#575)
The shadowsocks in pypi is out of date, may install from github@master
2017-03-02 21:28:16 +08:00
Falseen
e06819c124 add simple ss-tunnel to shadowsocks for dns forward (#759)
* add vscode to .gitignore

* add config.json to gitignore

* add simple ss-tunnel to shadowsocks for dns forward


1.add tunnel.py file to shadowoscks for dns forward (seem ss-tunnel of ss-libev)

2.add add_header to common.py for add socks5 request header

3.add dns_service dns_server dns_server_port dns_server_port dns_local_port to shell.py and config.json

4.update to udprelay for ss-tunnel (dns forward)

5.update to local.py for ss-tunnel

* add config.json.example to shadowsocks

* add tunnel_udp_server.close to local.py and tunnel.py

* fix error about pep8 and  pyflakes for travis

* update rename

rename

add "tunnel_" to dns_service dns_server dns_server_port dns_local_port

* fix tunnel for run tunnel alone

* fix pep8 for travis

* update the config name for tunnel

ord name:
tunnel_service tunnel_dns_server tunnel_dns_server_port tunnel_dns_local_port

new name:
both_tunnel_local tunnel_remote tunnel_remote_port tunnel_port

* update for tunnel

update to local.py shell.py tunnel.py for tunnel

* update pep8 for travis

* update config to _config for tunnel

and fix pep8

* changed "add socks5 header to data" to "add ss header to data"

and changed "remove socks5 header" to "remove ss header"

* add tcp forward to tunnel and fix a bug for pack_addr from common.py

1. update tunnel to tcprelay.py

2. add tunnel_tcp_server to tunnel.py

3. add tunnel_tcp_server to local.py

4. add `address = to_bytes(address)` to `pack_addr` from common.py (fix a error when address is a domain)

* fix pep8 for travis again

* remove ss_header from tcprelay.py and update the "header_length" to udprelay.py

1. Remove unnecessary "add ss_header" from tcprelay.py

2. update "data[7:]" to "data[header_length:]"

* remove "both_tunnel_local" and fix some error for tunnel

* update

* update add_header

* rename is_tunnel to _is_tunnel

https://github.com/shadowsocks/shadowsocks/pull/759
2017-03-02 21:20:04 +08:00
ImPerat0R_
fe13c20dc1 Correct spelling. (#755)
thx
2017-02-28 22:19:36 +08:00
hdl
8ac72b0b25 parse dns_servre in config (#739)
thx
2017-02-28 22:15:47 +08:00
mengskysama
ad39d957d7 2.9.1 2017-01-01 23:08:59 -08:00
Lution
392e54e508 update regex to support hostnames containing underscore (#694) 2017-01-02 14:56:57 +08:00
Anthony Wong
bdefeb523f Update README.md (#697)
Add missing links.
2017-01-02 14:56:25 +08:00
Shell.Xu
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
Yuan Alvin Fu
229ec75e4d Update README.md (#643) 2016-11-20 15:22:17 +08:00
loggerhead
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
zz
6dae6e2c51 fix that autoban can not get ip when use ipv6 (#674) 2016-11-20 14:57:52 +08:00
Shell Chen
5a05312189 Fix method on manager's add command (#578) (#614) 2016-10-11 21:31:41 +08:00
loggerhead
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
ahxxm
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
mengskysama
5c11527e1b fix ota call write_to_sock multi 2016-09-04 01:18:13 -07:00
v3aqb
56bf81f58a fix ota (#609)(#610) (#610) 2016-09-04 00:05:15 -07:00
ficapy
f35590b2e2 Dockfile add libsodium (#601) 2016-08-23 22:00:32 +08:00
smounives
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
mengskysama
8e8ee5d490 Update tcprelay.py
one time auth fail should be return
2016-07-18 23:31:51 +08:00
mengskysama
f7afcd4df0 add ota help in local 2016-07-18 23:00:00 +08:00
Max Lv
34fa8ded72 Merge pull request #543 from v3aqb/fix_ota
fix ota
2016-06-02 00:01:49 -05:00
v3aqb
677e6c4c56 fix ota 2016-05-15 01:27:21 +08:00
mengskysama
9844ba9dc7 pep8 2016-04-16 12:19:32 +08:00
mengskysama
f62a550e9f pep8 2016-04-16 12:13:59 +08:00
watermeter
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
mengskysama
bb53b0cb90 fix build dante cache and old src corrupt and slow 2016-04-16 11:46:06 +08:00
mengskysama
1f24b31f89 Update install.sh
replace dante corrupt src
2016-04-16 11:07:22 +08:00
mengskysama
5b58069f14 Merge pull request #507 from htc550605125/master
Add support for option 'prefer-ipv6'
2016-03-14 18:06:50 +08:00
htc550605125
9d6b9fcde0 add dockerfile 2016-02-23 20:47:04 -05:00
htc
b276d52735 Add support for option 'prefer-ipv6' 2016-02-20 11:33:50 +08:00
mengskysama
b9766ce5df Update README.md 2016-01-12 14:38:10 +08:00
mengskysama
e1e17c8e23 Merge branch 'fixbug-ci' 2016-01-12 14:30:08 +08:00
mengskysama
efe39a75f9 README CI 2016-01-12 14:22:10 +08:00
mengskysama
a8d116d70a fix bug with ord in Py3 2016-01-12 14:20:46 +08:00
mengskysama
811a0e6eb8 PEP8 and undefined name 'gen_key_iv' 2016-01-12 12:17:46 +08:00
mengskysama
f163a7b094 add CI 2016-01-12 12:17:11 +08:00
mengskysama
269e3dd82d test pass ota in udp 2016-01-12 12:10:40 +08:00
mengskysama
248582c932 remove IPv6 testcase and add ota test 2016-01-12 10:34:48 +08:00
mengskysama
bcf9329e23 Merge branch 'master' into fixbug-ci 2016-01-12 02:08:33 +08:00
mengskysama
288c11c9d9 CI Try again! 2016-01-12 01:55:42 +08:00
mengskysama
efad757837 9001 not idle? 2016-01-12 01:44:18 +08:00
mengskysama
ae082f2f2a Merge remote-tracking branch 'origin/fixbug-ci' 2016-01-12 01:04:12 +08:00
mengskysama
d2f1caeb5d fixbug: when ota disable data not write 2016-01-12 01:03:25 +08:00