Commit graph

815 commits

Author SHA1 Message Date
Falseen
fb7af45d53 Merge branch 'master' into path-1 2017-03-01 23:37:09 +08:00
Falseen
c9dae2ba57 remove "both_tunnel_local" and fix some error for tunnel 2017-03-01 23:32:14 +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
Falseen
57f55bf347 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:]"
2017-02-20 19:38:24 +08:00
Falseen
19027aeba8 fix pep8 for travis again 2017-02-18 00:15:40 +08:00
Falseen
d29baa3102 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)
2017-02-17 23:39:28 +08:00
Falseen
70c8373a0f changed "add socks5 header to data" to "add ss header to data"
and changed "remove socks5 header" to "remove ss header"
2017-02-17 21:08:50 +08:00
Falseen
bfb5e93843 update config to _config for tunnel
and fix pep8
2017-02-17 17:43:35 +08:00
Falseen
ac1883eb7f update pep8 for travis 2017-02-17 17:25:30 +08:00
Falseen
64282b0018 update for tunnel
update to local.py shell.py tunnel.py for tunnel
2017-02-17 17:16:58 +08:00
Falseen
029000ff8d 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
2017-02-17 16:52:43 +08:00
Falseen
1951a0660c fix pep8 for travis 2017-02-17 03:32:39 +08:00
Falseen
044354779a fix tunnel for run tunnel alone 2017-02-17 03:16:52 +08:00
Falseen
6f57db82c2 update rename
rename

add "tunnel_" to dns_service dns_server dns_server_port dns_local_port
2017-02-17 03:11:18 +08:00
Falseen
ec9ffbdf04 fix error about pep8 and pyflakes for travis 2017-02-17 02:41:10 +08:00
Falseen
4d5f14986a add tunnel_udp_server.close to local.py and tunnel.py 2017-02-17 01:54:57 +08:00
Falseen
aa0d90f1be add config.json.example to shadowsocks 2017-02-17 01:22:22 +08:00
Falseen
f43914ba1d 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
2017-02-17 01:15:08 +08:00
Falseen
1d06490579 add config.json to gitignore 2017-02-16 20:19:18 +08:00
Falseen
ff345bd4ff add vscode to .gitignore 2017-02-16 20:18:28 +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