Commit Graph

23 Commits (patch_1)

Author SHA1 Message Date
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 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 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 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 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
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
hdl 8ac72b0b25 parse dns_servre in config (#739)
thx
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
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 f7afcd4df0 add ota help in local 10 years ago
htc b276d52735 Add support for option 'prefer-ipv6' 11 years ago
jsy 2d40a361db ota config 11 years ago
jsy 569ca0d0a4 reverse config 11 years ago
jsy 28c4d14b12 Merge branch 'feature-ota' 11 years ago
jsy 77b2a22055 ota completed! 11 years ago
jsy 767b9217f8 one time auth server side 11 years ago
clowwindy a2bc6e1945 fix #414 11 years ago
clowwindy 3c1154923f fix json unicode issue in manager 11 years ago
clowwindy d20a07192c allow manager to bind on unix socket 11 years ago
clowwindy 956199efcd add control manager 11 years ago
Kim Wong e17279e5bf remove duplicated line (refer line 221) 12 years ago
lazybios d3831bef8c remove duplicate code from shell.py 12 years ago
clowwindy d774286dc0 rename utils module into shell
Since utils is ambiguous, we want to give the module a more
clear role.
12 years ago