Commit Graph

811 Commits (patch_1)
 

Author SHA1 Message Date
esdeathlove f3cfa33b07 refine 9 years ago
esdeathlove df798627b9 Fix memory leak(2) 9 years ago
esdeathlove 6b43cbbf93 Fix memory leak 9 years ago
Ted George d5026cf5ef Update README.md (#841)
thanks
10 years ago
Zou Yong 13b5d6e5ec Fix udp dns issue under python3 (#849)
str is not bytes under python3, if dns config is a list, will cause asyncdns.py failed:

asyncdns.py:
..........
    def handle_event(self, sock, fd, event):
        if sock != self._sock:
            return
        if event & eventloop.POLL_ERR:
       ...........
        else:
            data, addr = sock.recvfrom(1024)
            if addr[0] not in self._servers:
                logging.warn('received a packet other than our dns')
                return
            self._handle_data(data)
10 years ago
Zou Yong 06b028b5c0 Fix memory leak when excpetions occur (#814) 10 years ago
Zou Yong 0f4e3fa00c Add mbedtls wrapper, custom crypto lib path, test files (#803)
* add mbedtls crypto wrapper.
add tests files for new aead ciphers
add custom lib path support
fix some typo

* fix forbidden ip list

* rm crypto lib build files

* remove crypto source

* add xchacha20 test config

* convert dos new line format to unix format

* Fix help msg
10 years ago
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
10 years ago
Falseen 9e25cc6bb4 fix some error for parse dns_servre in config (#798)
and fix pep8

https://github.com/shadowsocks/shadowsocks/pull/739
10 years ago
Zou Yong 4e21f83bd6 Handle cipher exceptions #783 (#791) 10 years ago
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
10 years ago
Zou Yong d6b40efa5d encrypt.py is renamed to cryptor.py (#780) 10 years ago
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()
10 years ago
Elvis Wang c4731de532 Update README.md (#575)
The shadowsocks in pypi is out of date, may install from github@master
10 years ago
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
10 years ago
ImPerat0R_ fe13c20dc1 Correct spelling. (#755)
thx
10 years ago
hdl 8ac72b0b25 parse dns_servre in config (#739)
thx
10 years ago
mengskysama ad39d957d7 2.9.1 10 years ago
Lution 392e54e508 update regex to support hostnames containing underscore (#694) 10 years ago
Anthony Wong bdefeb523f Update README.md (#697)
Add missing links.
10 years ago
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)
10 years ago
Yuan Alvin Fu 229ec75e4d Update README.md (#643) 10 years ago
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
10 years ago
zz 6dae6e2c51 fix that autoban can not get ip when use ipv6 (#674) 10 years ago
Shell Chen 5a05312189 Fix method on manager's add command (#578) (#614) 10 years ago
loggerhead 4f28f7c8e4 Fix a OTA bug on `_ota_chunk_data` (#642)
* fix a OTA bug

* correct a wrong comment
10 years ago
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
10 years ago
mengskysama 5c11527e1b fix ota call write_to_sock multi 10 years ago
v3aqb 56bf81f58a fix ota (#609)(#610) (#610) 10 years ago
ficapy f35590b2e2 Dockfile add libsodium (#601) 10 years ago
smounives 6ef14e56db Add chacha20-ietf crypto (#590)
* Add chacha20-ietf crypto

* fix chacha20-ietf

* PEP8

* Update sodium.py (#1)

pep8
10 years ago
mengskysama 8e8ee5d490 Update tcprelay.py
one time auth fail should be return
10 years ago
mengskysama f7afcd4df0 add ota help in local 10 years ago
Max Lv 34fa8ded72 Merge pull request #543 from v3aqb/fix_ota
fix ota
11 years ago
v3aqb 677e6c4c56 fix ota 11 years ago
mengskysama 9844ba9dc7 pep8 11 years ago
mengskysama f62a550e9f pep8 11 years ago
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
11 years ago
mengskysama bb53b0cb90 fix build dante cache and old src corrupt and slow 11 years ago
mengskysama 1f24b31f89 Update install.sh
replace dante corrupt src
11 years ago
mengskysama 5b58069f14 Merge pull request #507 from htc550605125/master
Add support for option 'prefer-ipv6'
11 years ago
htc550605125 9d6b9fcde0 add dockerfile 11 years ago
htc b276d52735 Add support for option 'prefer-ipv6' 11 years ago
mengskysama b9766ce5df Update README.md 11 years ago
mengskysama e1e17c8e23 Merge branch 'fixbug-ci' 11 years ago
mengskysama efe39a75f9 README CI 11 years ago
mengskysama a8d116d70a fix bug with ord in Py3 11 years ago
mengskysama 811a0e6eb8 PEP8 and undefined name 'gen_key_iv' 11 years ago
mengskysama f163a7b094 add CI 11 years ago
mengskysama 269e3dd82d test pass ota in udp 11 years ago