Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

能不能给SS的服务端为每个用户分别配置代理ip出口的功能 #87

Open
wants to merge 184 commits into
base: manyuser
Choose a base branch
from

Commits on May 18, 2016

  1. Update config.py

    zuoruizhi committed May 18, 2016
    Configuration menu
    Copy the full SHA
    f2df4d0 View commit details
    Browse the repository at this point in the history
  2. Update servers.py

    zuoruizhi committed May 18, 2016
    Configuration menu
    Copy the full SHA
    f485d0b View commit details
    Browse the repository at this point in the history
  3. Update tcprelay.py

    zuoruizhi committed May 18, 2016
    Configuration menu
    Copy the full SHA
    0a1113c View commit details
    Browse the repository at this point in the history
  4. Update udprelay.py

    zuoruizhi committed May 18, 2016
    Configuration menu
    Copy the full SHA
    5336a80 View commit details
    Browse the repository at this point in the history
  5. Update dbtransfer.py

    zuoruizhi committed May 18, 2016
    Configuration menu
    Copy the full SHA
    dbc5c31 View commit details
    Browse the repository at this point in the history
  6. Update dbtransfer.py

    zuoruizhi committed May 18, 2016
    Configuration menu
    Copy the full SHA
    ffcbfc5 View commit details
    Browse the repository at this point in the history
  7. Update dbtransfer.py

    zuoruizhi committed May 18, 2016
    Configuration menu
    Copy the full SHA
    9ca4907 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2016

  1. Configuration menu
    Copy the full SHA
    564c942 View commit details
    Browse the repository at this point in the history
  2. PEP8 Calibration

    fsgmhoward committed May 23, 2016
    Configuration menu
    Copy the full SHA
    b4bc110 View commit details
    Browse the repository at this point in the history
  3. Lots of modification

    * Added support of banning IPs
    * Now many default settings can be customized such as TCP Fastopen Option
    * Now config file is renamed so only a `git pull` can update the client
    * Re-organized codes, removed some unused codes
    * Now support multi-method client (need the support of ss-panel or some other frontend panel)
    * Some modification of the log output
    fsgmhoward committed May 23, 2016
    Configuration menu
    Copy the full SHA
    f8dd2f8 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2016

  1. Configuration menu
    Copy the full SHA
    53765a3 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2016

  1. Fix fatal

    fsgmhoward committed May 28, 2016
    Configuration menu
    Copy the full SHA
    59cfd30 View commit details
    Browse the repository at this point in the history
  2. Update config.example.py

    zuoruizhi committed May 28, 2016
    Configuration menu
    Copy the full SHA
    875f99a View commit details
    Browse the repository at this point in the history
  3. support ss-panel V3 mu api

    zuoruizhi committed May 28, 2016
    Configuration menu
    Copy the full SHA
    bddd1e9 View commit details
    Browse the repository at this point in the history
  4. Update config.example.py

    zuoruizhi committed May 28, 2016
    Configuration menu
    Copy the full SHA
    a2fbed6 View commit details
    Browse the repository at this point in the history
  5. support ss-panel V3 mu api

    zuoruizhi committed May 28, 2016
    Configuration menu
    Copy the full SHA
    1575964 View commit details
    Browse the repository at this point in the history
  6. support ss-panel V3 mu api

    zuoruizhi committed May 28, 2016
    Configuration menu
    Copy the full SHA
    f3e45cb View commit details
    Browse the repository at this point in the history

Commits on May 29, 2016

  1. Merge pull request #2 from zuoruizhi/manyuser

    support ss-panel V3 mu api
    fsgmhoward committed May 29, 2016
    Configuration menu
    Copy the full SHA
    1cebb0d View commit details
    Browse the repository at this point in the history
  2. fix mu api

    zuoruizhi committed May 29, 2016
    Configuration menu
    Copy the full SHA
    a87f5b8 View commit details
    Browse the repository at this point in the history
  3. add custom method switch

    zuoruizhi committed May 29, 2016
    Configuration menu
    Copy the full SHA
    db8ff80 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #4 from zuoruizhi/CUSTOM_METHOD_switch

    Custom method switch
    fsgmhoward committed May 29, 2016
    Configuration menu
    Copy the full SHA
    6aa5a86 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #3 from zuoruizhi/CUSTOM_METHOD_switch

    add custom method switch
    zuoruizhi committed May 29, 2016
    Configuration menu
    Copy the full SHA
    d66a07a View commit details
    Browse the repository at this point in the history

Commits on May 30, 2016

  1. use new method to update user traffic

    as same as GO version
    zuoruizhi committed May 30, 2016
    Configuration menu
    Copy the full SHA
    57204c4 View commit details
    Browse the repository at this point in the history
  2. test

    zuoruizhi committed May 30, 2016
    Configuration menu
    Copy the full SHA
    3deec82 View commit details
    Browse the repository at this point in the history
  3. Revert "test"

    This reverts commit 3deec82.
    zuoruizhi committed May 30, 2016
    Configuration menu
    Copy the full SHA
    3fb14cd View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2016

  1. Merge pull request #5 from zuoruizhi/manyuser

    MUAPI:use new method to update user traffic
    fsgmhoward committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    16ae784 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1d5923d View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. Minor changes

    fsgmhoward committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    3db01de View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2016

  1. update log

    zuoruizhi authored Jun 11, 2016
    Configuration menu
    Copy the full SHA
    3bc4b8c View commit details
    Browse the repository at this point in the history
  2. Revert SQL change

    从use new method to update user traffic开始
    user.id可以不等于port了
    zuoruizhi authored Jun 11, 2016
    Configuration menu
    Copy the full SHA
    8c5a650 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #6 from zuoruizhi/manyuser

    update log
    fsgmhoward authored Jun 11, 2016
    Configuration menu
    Copy the full SHA
    73e12ea View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2016

  1. delete duplicate code

    zuoruizhi authored Jun 12, 2016
    Configuration menu
    Copy the full SHA
    a7687b5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #7 from zuoruizhi/manyuser

    delete duplicate code
    fsgmhoward authored Jun 12, 2016
    Configuration menu
    Copy the full SHA
    df9bf26 View commit details
    Browse the repository at this point in the history
  3. Remove unused method

    fsgmhoward committed Jun 12, 2016
    Configuration menu
    Copy the full SHA
    ddf5565 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2016

  1. Configuration menu
    Copy the full SHA
    c3216c3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5084642 View commit details
    Browse the repository at this point in the history
  3. Update logging

    fsgmhoward committed Jun 13, 2016
    Configuration menu
    Copy the full SHA
    cde7287 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2016

  1. Some updates and minor fixes

    ---------
    * Updated the description of example config
    * Updated logging
    * Fixed some potential errors in the relays
    fsgmhoward committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    d9269ed View commit details
    Browse the repository at this point in the history
  2. Updated SQL

    fsgmhoward committed Jun 14, 2016
    Configuration menu
    Copy the full SHA
    04da94d View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2016

  1. Fixed an error.

    The error will cause the application always use pre-configured version instead of `git describe`, where applicable.
    fsgmhoward committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    dec8d46 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2016

  1. Changed the logic of OTA

    * Rebooting the server is now not required to reset the OTA activation state of a user
    fsgmhoward committed Jun 18, 2016
    Configuration menu
    Copy the full SHA
    c9589bb View commit details
    Browse the repository at this point in the history
  2. Fixed a bug

    * Now the client IP can be shown properly in logs when UDP connection established
    fsgmhoward committed Jun 18, 2016
    Configuration menu
    Copy the full SHA
    8c6ffe2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8660c3b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1c3524c View commit details
    Browse the repository at this point in the history
  5. Revert "Fixed a bug"

    This reverts commit 8c6ffe2.
    
    # Conflicts:
    #	shadowsocks/udprelay.py
    fsgmhoward committed Jun 18, 2016
    Configuration menu
    Copy the full SHA
    7f61f50 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2dbf5a4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f87e5b4 View commit details
    Browse the repository at this point in the history
  8. Fixed the logging error

    # A previous fix is reverted before
    fsgmhoward committed Jun 18, 2016
    Configuration menu
    Copy the full SHA
    18e1c9b View commit details
    Browse the repository at this point in the history
  9. Fix fatal

    fsgmhoward committed Jun 18, 2016
    Configuration menu
    Copy the full SHA
    5ca0cc4 View commit details
    Browse the repository at this point in the history
  10. Revert "Fixed the logging error"

    This reverts commit 18e1c9b.
    fsgmhoward committed Jun 18, 2016
    Configuration menu
    Copy the full SHA
    2ca8b8e View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2016

  1. Fixed the UDP connection log problem

    * There are two failed fixes reverted before
    * This time the problem is really fixed Σ( ° △ °|||)#
    fsgmhoward committed Jun 19, 2016
    Configuration menu
    Copy the full SHA
    254d3e4 View commit details
    Browse the repository at this point in the history
  2. Log fixes

    * Changed logging level of the warning in eventloop.py
    * Added --tag after git describe command so that the latest tag can be shown
    * Fixed a typo erro in servers.py
    fsgmhoward committed Jun 19, 2016
    Configuration menu
    Copy the full SHA
    c88ab2b View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2016

  1. Configuration menu
    Copy the full SHA
    6dad4b2 View commit details
    Browse the repository at this point in the history
  2. Log update

    fsgmhoward committed Jun 22, 2016
    Configuration menu
    Copy the full SHA
    7569352 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2016

  1. Extended firewall settings

    * Trusted user is added
    * Now you can choose either whitelist mode or blacklist mode, or just shutdown the firewall function
    * Modified a little bit in dbtransfer.py
    fsgmhoward committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    4e7569a View commit details
    Browse the repository at this point in the history
  2. Fixed a logging bug

    fsgmhoward committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    cc6a70f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    589cc67 View commit details
    Browse the repository at this point in the history
  4. Update notice

    fsgmhoward committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    0421087 View commit details
    Browse the repository at this point in the history
  5. A great update: API update

    * Now you can choose either to use MySQL or API, MySQL is not compousory
    * config_example.py has a great change. Sections of settings are now logically arranged
    * fixed some bugs
    fsgmhoward committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    69eb3ac View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c2ac618 View commit details
    Browse the repository at this point in the history
  7. Update README.md

    fsgmhoward committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    11841ad View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2016

  1. Bug fixes

    fsgmhoward authored Jun 25, 2016
    Configuration menu
    Copy the full SHA
    3244bbe View commit details
    Browse the repository at this point in the history
  2. Fixed a firewall error

    fsgmhoward committed Jun 25, 2016
    Configuration menu
    Copy the full SHA
    6f2efb1 View commit details
    Browse the repository at this point in the history
  3. Fixed a logging error

    fsgmhoward committed Jun 25, 2016
    Configuration menu
    Copy the full SHA
    28a0f42 View commit details
    Browse the repository at this point in the history
  4. Release of V3.1.0

    Firewall and API updates
    fsgmhoward authored Jun 25, 2016
    Configuration menu
    Copy the full SHA
    be856c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2016

  1. Some improvements:

    * Now a deleted user will be removed when doing db_push
    * Modified the return values of pull_api_user
    * Modified some descriptions of config
    * Some bug fixes
    fsgmhoward committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    d988cdc View commit details
    Browse the repository at this point in the history
  2. Merge pull request #9 from fsgmhoward/dev

    Some improvements
    fsgmhoward authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    4ad1564 View commit details
    Browse the repository at this point in the history
  3. Performance improvements

    fsgmhoward committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    795a6c2 View commit details
    Browse the repository at this point in the history
  4. Bug fixes

    fsgmhoward committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    3028c55 View commit details
    Browse the repository at this point in the history
  5. Bug fixes

    fsgmhoward committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    c7243f9 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #10 from fsgmhoward/dev

    Bug Fixes and Performance Improvements
    fsgmhoward authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    b565b2b View commit details
    Browse the repository at this point in the history
  7. Release of V3.1.1

    fsgmhoward committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    851acf7 View commit details
    Browse the repository at this point in the history
  8. Release of V3.1.1 (#11)

    fsgmhoward authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    2a57ad0 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2016

  1. Revert "Changed the logic of OTA"

    This reverts commit c9589bb.
    fsgmhoward committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    5d43a14 View commit details
    Browse the repository at this point in the history
  2. Logging improvement

    fsgmhoward committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    b50bf10 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. Bug fixes

    fsgmhoward committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    030401c View commit details
    Browse the repository at this point in the history
  2. Logging improvements

    fsgmhoward committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    42d3fdc View commit details
    Browse the repository at this point in the history
  3. Added exception callback

    fsgmhoward committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    06caedb View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2016

  1. Bug Fixes and Minor Improvements (#12)

    * Fixed OTA bug
    * Improved logging
    * Added exception callback for manager thread to log unhandled exception
    fsgmhoward authored Jul 3, 2016
    Configuration menu
    Copy the full SHA
    fe5fa2e View commit details
    Browse the repository at this point in the history
  2. Fixed TCP logging bug

    fsgmhoward committed Jul 3, 2016
    Configuration menu
    Copy the full SHA
    20f4804 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2016

  1. Merge branch 'dev' into manyuser

    # Conflicts:
    #	shadowsocks/tcprelay.py
    fsgmhoward committed Jul 15, 2016
    Configuration menu
    Copy the full SHA
    5577134 View commit details
    Browse the repository at this point in the history
  2. Fix bug

    fsgmhoward committed Jul 15, 2016
    Configuration menu
    Copy the full SHA
    b337281 View commit details
    Browse the repository at this point in the history
  3. Fix bug (#15)

    fsgmhoward authored Jul 15, 2016
    Configuration menu
    Copy the full SHA
    f878e64 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. Add chacha20-ietf crypto (#590)

    * Add chacha20-ietf crypto
    
    * fix chacha20-ietf
    
    * PEP8
    
    * Update sodium.py (#1)
    
    pep8
    smounives authored and mengskysama committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    6ef14e5 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2016

  1. password to passwd

    henryhuang authored Aug 19, 2016
    Configuration menu
    Copy the full SHA
    f4a94df View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2016

  1. Merge pull request #21 from henryhuang/manyuser

    Typo fix: password to passwd
    fsgmhoward authored Aug 20, 2016
    Configuration menu
    Copy the full SHA
    43249c6 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2016

  1. Dockfile add libsodium (#601)

    ficapy authored and mengskysama committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    f35590b View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2016

  1. fix ota (#609)(#610) (#610)

    v3aqb authored and mengskysama committed Sep 4, 2016
    Configuration menu
    Copy the full SHA
    56bf81f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5c11527 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2016

  1. Configuration menu
    Copy the full SHA
    e06bfd4 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2016

  1. 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
    ahxxm authored and mengskysama committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    5cd9f04 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2016

  1. Fix a OTA bug on _ota_chunk_data (#642)

    * fix a OTA bug
    
    * correct a wrong comment
    loggerhead authored and mengskysama committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    4f28f7c View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2016

  1. Configuration menu
    Copy the full SHA
    5a05312 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2016

  1. Configuration menu
    Copy the full SHA
    6dae6e2 View commit details
    Browse the repository at this point in the history
  2. 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
    loggerhead authored and mengskysama committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    72f1d68 View commit details
    Browse the repository at this point in the history
  3. Update README.md (#643)

    casouri authored and mengskysama committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    229ec75 View commit details
    Browse the repository at this point in the history
  4. 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)
    shell909090 authored and mengskysama committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    d31003e View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2017

  1. Update README.md (#697)

    Add missing links.
    anthonywong authored and mengskysama committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    bdefeb5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    392e54e View commit details
    Browse the repository at this point in the history
  3. 2.9.1

    mengskysama committed Jan 2, 2017
    Configuration menu
    Copy the full SHA
    ad39d95 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2017

  1. Docker Support (#27)

    * Support for Docker
    * add install instructions for docker
    coderfox authored and fsgmhoward committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    5ed7cfe View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2017

  1. fix libsodium (#28)

    coderfox authored and fsgmhoward committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    417efe5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9769fc8 View commit details
    Browse the repository at this point in the history
  3. Added chacha20-ietf crypto

    fsgmhoward committed Feb 11, 2017
    Configuration menu
    Copy the full SHA
    fc3468a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b49f455 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0b15dbe View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2017

  1. Configuration menu
    Copy the full SHA
    fe609eb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1ba3d8b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    34a01c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2017

  1. parse dns_servre in config (#739)

    thx
    supermariogo authored and mengskysama committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    8ac72b0 View commit details
    Browse the repository at this point in the history
  2. Correct spelling. (#755)

    thx
    tssujt authored and mengskysama committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    fe13c20 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2017

  1. 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
    
    shadowsocks/shadowsocks#759
    Falseen authored and mengskysama committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    e06819c View commit details
    Browse the repository at this point in the history
  2. Update README.md (#575)

    The shadowsocks in pypi is out of date, may install from github@master
    elvisw authored and mengskysama committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    c4731de View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2017

  1. 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()
    made-by-love authored and mengskysama committed Mar 4, 2017
    Configuration menu
    Copy the full SHA
    445a3c9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d6b40ef View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2017

  1. 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
    made-by-love authored and mengskysama committed Mar 10, 2017
    Configuration menu
    Copy the full SHA
    74f8f8c View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2017

  1. Configuration menu
    Copy the full SHA
    4e21f83 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2017

  1. fix some error for parse dns_servre in config (#798)

    Falseen authored and mengskysama committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    9e25cc6 View commit details
    Browse the repository at this point in the history
  2. Fix #34

    This patch makes the SS server competible with ss-panel running on a server with PHP<5.4
    fsgmhoward committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    3a4adfd View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. 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
    Falseen authored and mengskysama committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    1222fb1 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2017

  1. Configuration menu
    Copy the full SHA
    b4ab368 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2017

  1. new debian package

    * * 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)
    shell909090 authored and fsgmhoward committed Mar 26, 2017
    Configuration menu
    Copy the full SHA
    af51e1c View commit details
    Browse the repository at this point in the history
  2. Add AEAD ciphers support

    * 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()
    fsgmhoward committed Mar 26, 2017
    Configuration menu
    Copy the full SHA
    964db9f View commit details
    Browse the repository at this point in the history
  3. Add sodium:aes-256-gcm and openssl:ocb AEAD mode

    * Add sodium:aes-256-gcm and openssl:ocb AEAD mode
    Use sodium_increment for nonce_increment if avaiable
    
    * Fix pep8
    
    * Fix python3 test code
    made-by-love authored and fsgmhoward committed Mar 26, 2017
    Configuration menu
    Copy the full SHA
    64d0243 View commit details
    Browse the repository at this point in the history
  4. update find_lib's name for the new openssl-1.1 dll (just for windows)

    the new openssl's dll(1.1) is rename to libcrypto-1_1-x64.dll and libcrypto-1_1.dll
    Falseen authored and fsgmhoward committed Mar 26, 2017
    Configuration menu
    Copy the full SHA
    387d1db View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2017

  1. Configuration menu
    Copy the full SHA
    a532783 View commit details
    Browse the repository at this point in the history
  2. Refactor

    * 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
    fsgmhoward committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    dd92d3c View commit details
    Browse the repository at this point in the history
  3. Handle cipher exception

    fsgmhoward committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    a81087e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b1c2280 View commit details
    Browse the repository at this point in the history
  5. Release version 3.3.0

    - Added AEAD ciphers
    - Mass improvements
    fsgmhoward committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    ae46569 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7f0a6af View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f364d24 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2017

  1. Configuration menu
    Copy the full SHA
    9896a65 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1a71b18 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2017

  1. Configuration menu
    Copy the full SHA
    c9ce79c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    841b172 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d2c9a1b View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2017

  1. Update README.md

    Fix typo. Added instruction for py v2.5 user (#44).
    fsgmhoward committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    f9893f6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9504e59 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e6918dd View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2017

  1. 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
    made-by-love authored and mengskysama committed Apr 29, 2017
    Configuration menu
    Copy the full SHA
    0f4e3fa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    06b028b View commit details
    Browse the repository at this point in the history

Commits on May 12, 2017

  1. 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)
    made-by-love authored and mengskysama committed May 12, 2017
    Configuration menu
    Copy the full SHA
    13b5d6e View commit details
    Browse the repository at this point in the history
  2. Update README.md (#841)

    thanks
    tedlz123 authored and mengskysama committed May 12, 2017
    Configuration menu
    Copy the full SHA
    d5026cf View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. Fix memory leak (#48)

    Issue Ref #42
    d4boy authored and fsgmhoward committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    5bd640b View commit details
    Browse the repository at this point in the history
  2. Merged upstream repo: 'https://github.com/shadowsocks/shadowsocks'

    # Conflicts:
    #	.gitignore
    #	Dockerfile
    #	README.md
    #	shadowsocks/crypto/aead.py
    #	shadowsocks/crypto/openssl.py
    #	shadowsocks/crypto/rc4_md5.py
    #	shadowsocks/crypto/sodium.py
    #	shadowsocks/crypto/table.py
    #	shadowsocks/cryptor.py
    #	shadowsocks/manager.py
    #	shadowsocks/shell.py
    #	shadowsocks/tcprelay.py
    #	shadowsocks/udprelay.py
    fsgmhoward committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    aa4a592 View commit details
    Browse the repository at this point in the history
  3. Finish Upstream_Merge

    fsgmhoward committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    7e7bea3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    35d7b0f View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2017

  1. Fix memory leak (#921)

    * Fix memory leak
    
    * Fix memory leak(2)
    
    * refine
    esdeathlove authored and mengskysama committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    893f909 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3c82f02 View commit details
    Browse the repository at this point in the history
  3. Update README.md (#734)

    Add installation and usage instructions for snap package.
    anthonywong authored and mengskysama committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    91e6237 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0b0379b View commit details
    Browse the repository at this point in the history
  5. Update .travis.yml

    new path for nginx static file
    mengskysama authored Sep 6, 2017
    Configuration menu
    Copy the full SHA
    0168be7 View commit details
    Browse the repository at this point in the history
  6. Fix typo (#866)

    apemost authored and mengskysama committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    f7d7aee View commit details
    Browse the repository at this point in the history
  7. Update jenkins.sh

    rm CI coverage
    mengskysama authored Sep 6, 2017
    Configuration menu
    Copy the full SHA
    2ab8c6b View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2017

  1. Finish Upstream Merge from shadowsocks/shadowsocks

    # Conflicts:
    #	README.md
    #	shadowsocks/crypto/aead.py
    fsgmhoward committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    30ae661 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2017

  1. Released 3.4.0

    fsgmhoward committed Sep 16, 2017
    Configuration menu
    Copy the full SHA
    5ec4c69 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2017

  1. Fix Version for 3.4.0-dev

    fsgmhoward committed Oct 10, 2017
    Configuration menu
    Copy the full SHA
    f571a08 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2017

  1. Configuration menu
    Copy the full SHA
    9a888c4 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2017

  1. Configuration menu
    Copy the full SHA
    ebfd7e1 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2017

  1. Configuration menu
    Copy the full SHA
    0914bbb View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2017

  1. Configuration menu
    Copy the full SHA
    710d6bf View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2018

  1. Configuration menu
    Copy the full SHA
    8b30264 View commit details
    Browse the repository at this point in the history
  2. Update README.md (#1042)

    netroby authored and mengskysama committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    c668f44 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. use list instead of string, prevent injection attack. (#1009)

    * fix issue:
    https://github.com/shadowsocks/shadowsocks/issues/995
    Command Execution
    
    use list instead of string, prevent injection attack.
    shell909090 authored and mengskysama committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    e332ec9 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Merge remote-tracking branch 'Shadowsocks-Original/master' into dev

    # Conflicts:
    #	README.md
    #	utils/autoban.py
    fsgmhoward committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    0aa9be6 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2018

  1. Configuration menu
    Copy the full SHA
    4bb8d19 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2018

  1. Minor fixes

    * Add --always in git describe to avoid exception when tags are not found
    * EOL characters are now stripped from git's output
    fsgmhoward committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    abca686 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2018

  1. Configuration menu
    Copy the full SHA
    5919e34 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6d08dc4 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. Updated the configuration file

    - The version of the configuration file has been changed
    fsgmhoward committed May 31, 2018
    Configuration menu
    Copy the full SHA
    6cc8692 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2018

  1. Configuration menu
    Copy the full SHA
    5917497 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2018

  1. Configuration menu
    Copy the full SHA
    7e94e2b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b0adbf5 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2018

  1. Configuration menu
    Copy the full SHA
    97026b8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    68511d9 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2018

  1. Configuration menu
    Copy the full SHA
    11e326a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a3daed3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    17261a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2018

  1. Configuration menu
    Copy the full SHA
    410e169 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2018

  1. Configuration menu
    Copy the full SHA
    ae88fc8 View commit details
    Browse the repository at this point in the history
  2. Finish hotfix-1

    fsgmhoward committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    03ab257 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2019

  1. Allow the MU API to return less data

    When `user['switch'] == 0 or user['enable'] == 0`, the rest field of a row except `port` is not used. An MU API with large amounts of users could reduce the size of response significantly by removing the redundant fields from disabled users.
    balthild authored Mar 13, 2019
    Configuration menu
    Copy the full SHA
    15ad382 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #68 from balthild/patch-1

    Allow the MU API to return less data for disabled users
    fsgmhoward authored Mar 13, 2019
    Configuration menu
    Copy the full SHA
    293b2ae View commit details
    Browse the repository at this point in the history