fix duplicated close in LRUCache

close #324
Merge pull request #332 from sky-chen/master
2015-05-19 08:14:47 +08:00 · 2015-05-03 15:25:14 +08:00 · 2015-05-03 14:34:54 +08:00 · 2015-03-29 12:19:22 +08:00 · 2015-03-14 13:38:19 +08:00 · 2015-03-14 07:35:43 +08:00
35 changed files with 944 additions and 584 deletions
@@ -18,7 +18,7 @@ pip-log.txt
 # Unit test / coverage reports
 htmlcov
-.coverage
+.coverage*
 .tox
 #Translations
@@ -11,10 +11,11 @@ before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq build-essential dnsutils iproute nginx bc
  - sudo dd if=/dev/urandom of=/usr/share/nginx/www/file bs=1M count=10
  - sudo sh -c "echo '127.0.0.1    localhost' > /etc/hosts"
  - sudo service nginx restart
  - pip install pep8 pyflakes nose coverage
  - sudo tests/socksify/install.sh
  - sudo tests/libsodium/install.sh
  - sudo tests/setup_tc.sh
 script:
-  - ./.jenkins.sh
+  - tests/jenkins.sh
@@ -1,4 +1,23 @@
-2.6.3 2015-01-03
+2.6.8 2015-02-10
 - Support multiple server ip on client side
 - Support --version
 - Minor fixes
 2.6.7 2015-02-02
 - Support --user
 - Support CIDR format in --forbidden-ip
 - Minor fixes
 2.6.6 2015-01-23
 - Fix a crash in forbidden list
 2.6.5 2015-01-18
 - Try both 32 bit and 64 bit dll on Windows
 2.6.4 2015-01-14
 - Also search lib* when searching libraries
 2.6.3 2015-01-12
 - Support --forbidden-ip to ban some IP, i.e. localhost
 - Search OpenSSL and libsodium harder
 - Now works on OpenWRT
@@ -21,6 +21,8 @@ a pull request, or ask some of your friends to do so.
 3. We don't answer questions of any other types here. Since very few people
 are watching the issue tracker here, you'll probably get no help from here.
 Read [Troubleshooting] and get help from forums or [mailing lists].
 4. Issues in languages other than English will be Google translated into English
 later.
 [Troubleshooting]: https://github.com/clowwindy/shadowsocks/wiki/Troubleshooting
@@ -1,21 +1,202 @@
 Shadowsocks
-Copyright (c) 2012-2015 clowwindy
+                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
-Permission is hereby granted, free of charge, to any person obtaining a copy
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in
+   1. Definitions.
 all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      "License" shall mean the terms and conditions for use, reproduction,
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      and distribution as defined by Sections 1 through 9 of this document.
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+      "Licensor" shall mean the copyright owner or entity authorized by
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+      the copyright owner that is granting the License.
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
-SOFTWARE.
+      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
   APPENDIX: How to apply the Apache License to your work.
      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
   Copyright [yyyy] [name of copyright owner]
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
       http://www.apache.org/licenses/LICENSE-2.0
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
@@ -1,3 +1,3 @@
-recursive-include *.py
+recursive-include shadowsocks *.py
 include README.rst
 include LICENSE
@@ -12,28 +12,35 @@ Server
 ### Install
-#### Debian / Ubuntu:
+Debian / Ubuntu:
    apt-get install python-pip
    pip install shadowsocks
-#### CentOS:
+CentOS:
    yum install python-setuptools && easy_install pip
    pip install shadowsocks
-#### Windows:
+Windows:
 See [Install Server on Windows]
 ### Usage
-    ssserver -p 8000 -k password -m rc4-md5
+    ssserver -p 443 -k password -m aes-256-cfb
 To run in the background:
-    ssserver -p 8000 -k password -m rc4-md5 -d start
+    sudo ssserver -p 443 -k password -m aes-256-cfb --user nobody -d start
-    ssserver -p 8000 -k password -m rc4-md5 -d stop
+
 To stop:
    sudo ssserver -d stop
 To check the log:
    sudo less /var/log/shadowsocks.log
 Check all the options via `-h`. You can also use a [Configuration] file
 instead.
@@ -55,7 +62,20 @@ You can find all the documentation in the [Wiki].
 License
 -------
-MIT
+
 Copyright 2015 clowwindy
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
 a copy of the License at
    http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 License for the specific language governing permissions and limitations
 under the License.
 Bugs and Issues
 ----------------
@@ -66,11 +86,11 @@ Bugs and Issues
-[Android]:           https://github.com/shadowsocks/shadowsocks/wiki/Ports-and-Clients#android
+[Android]:           https://github.com/shadowsocks/shadowsocks-android
 [Build Status]:      https://img.shields.io/travis/shadowsocks/shadowsocks/master.svg?style=flat
 [Configuration]:     https://github.com/shadowsocks/shadowsocks/wiki/Configuration-via-Config-File
 [Coverage Status]:   https://jenkins.shadowvpn.org/result/shadowsocks
-[Coverage]:          https://jenkins.shadowvpn.org/job/Shadowsocks/ws/htmlcov/index.html
+[Coverage]:          https://jenkins.shadowvpn.org/job/Shadowsocks/ws/PYENV/py34/label/linux/htmlcov/index.html
 [Debian sid]:        https://packages.debian.org/unstable/python/shadowsocks
 [iOS]:               https://github.com/shadowsocks/shadowsocks-iOS/wiki/Help
 [Issue Tracker]:     https://github.com/shadowsocks/shadowsocks/issues?state=open
@@ -83,4 +103,4 @@ Bugs and Issues
 [Travis CI]:         https://travis-ci.org/shadowsocks/shadowsocks
 [Troubleshooting]:   https://github.com/shadowsocks/shadowsocks/wiki/Troubleshooting
 [Wiki]:              https://github.com/shadowsocks/shadowsocks/wiki
-[Windows]:           https://github.com/shadowsocks/shadowsocks/wiki/Ports-and-Clients#windows
+[Windows]:           https://github.com/shadowsocks/shadowsocks-csharp
@@ -12,7 +12,6 @@ Install
 ~~~~~~~
 Debian / Ubuntu:
 ^^^^^^^^^^^^^^^^
 ::
@@ -20,7 +19,6 @@ Debian / Ubuntu:
    pip install shadowsocks
 CentOS:
 ^^^^^^^
 ::
@@ -28,7 +26,6 @@ CentOS:
    pip install shadowsocks
 Windows:
 ^^^^^^^^
 See `Install Server on
 Windows <https://github.com/shadowsocks/shadowsocks/wiki/Install-Shadowsocks-Server-on-Windows>`__
@@ -38,14 +35,25 @@ Usage
 ::
-    ssserver -p 8000 -k password -m rc4-md5
+    ssserver -p 443 -k password -m rc4-md5
 To run in the background:
 ::
-    ssserver -p 8000 -k password -m rc4-md5 -d start
+    sudo ssserver -p 443 -k password -m rc4-md5 --user nobody -d start
-    ssserver -p 8000 -k password -m rc4-md5 -d stop
+
 To stop:
 ::
    sudo ssserver -d stop
 To check the log:
 ::
    sudo less /var/log/shadowsocks.log
 Check all the options via ``-h``. You can also use a
 `Configuration <https://github.com/shadowsocks/shadowsocks/wiki/Configuration-via-Config-File>`__
@@ -73,7 +81,21 @@ You can find all the documentation in the
 License
 -------
-MIT
+Copyright 2015 clowwindy
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
 a copy of the License at
 ::
    http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 Bugs and Issues
 ---------------
@@ -88,4 +110,4 @@ Bugs and Issues
 .. |Build Status| image:: https://img.shields.io/travis/shadowsocks/shadowsocks/master.svg?style=flat
   :target: https://travis-ci.org/shadowsocks/shadowsocks
 .. |Coverage Status| image:: https://jenkins.shadowvpn.org/result/shadowsocks
-   :target: https://jenkins.shadowvpn.org/job/Shadowsocks/ws/htmlcov/index.html
+   :target: https://jenkins.shadowvpn.org/job/Shadowsocks/ws/PYENV/py34/label/linux/htmlcov/index.html
@@ -7,8 +7,8 @@ with codecs.open('README.rst', encoding='utf-8') as f:
 setup(
    name="shadowsocks",
-    version="2.6.3",
+    version="2.6.9",
-    license='MIT',
+    license='http://www.apache.org/licenses/LICENSE-2.0',
    description="A fast tunnel proxy that help you get through firewalls",
    author='clowwindy',
    author_email='clowwindy42@gmail.com',
@@ -24,7 +24,7 @@ setup(
    ssserver = shadowsocks.server:main
    """,
    classifiers=[
-        'License :: OSI Approved :: MIT License',
+        'License :: OSI Approved :: Apache Software License',
        'Programming Language :: Python :: 2',
        'Programming Language :: Python :: 2.6',
        'Programming Language :: Python :: 2.7',
@@ -1,24 +1,18 @@
 #!/usr/bin/python
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2012-2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -1,25 +1,19 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2014-2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -31,7 +25,7 @@ import struct
 import re
 import logging
-from shadowsocks import common, lru_cache, eventloop
+from shadowsocks import common, lru_cache, eventloop, shell
 CACHE_SWEEP_INTERVAL = 30
@@ -93,11 +87,12 @@ def build_address(address):
    return b''.join(results)
-def build_request(address, qtype, request_id):
+def build_request(address, qtype):
-    header = struct.pack('!HBBHHHH', request_id, 1, 0, 1, 0, 0, 0)
+    request_id = os.urandom(2)
    header = struct.pack('!BBHHHH', 1, 0, 1, 0, 0, 0)
    addr = build_address(address)
    qtype_qclass = struct.pack('!HH', qtype, QCLASS_IN)
-    return header + addr + qtype_qclass
+    return request_id + header + addr + qtype_qclass
 def parse_ip(addrtype, data, length, offset):
@@ -226,24 +221,10 @@ def parse_response(data):
                response.answers.append((an[1], an[2], an[3]))
            return response
    except Exception as e:
-        import traceback
+        shell.print_exception(e)
        traceback.print_exc()
        logging.error(e)
        return None
 def is_ip(address):
    for family in (socket.AF_INET, socket.AF_INET6):
        try:
            if type(address) != str:
                address = address.decode('utf8')
            socket.inet_pton(family, address)
            return family
        except (TypeError, ValueError, OSError, IOError):
            pass
    return False
 def is_valid_hostname(hostname):
    if len(hostname) > 255:
        return False
@@ -270,7 +251,6 @@ class DNSResolver(object):
    def __init__(self):
        self._loop = None
        self._request_id = 1
        self._hosts = {}
        self._hostname_status = {}
        self._hostname_to_cb = {}
@@ -296,7 +276,7 @@ class DNSResolver(object):
                            parts = line.split()
                            if len(parts) >= 2:
                                server = parts[1]
-                                if is_ip(server) == socket.AF_INET:
+                                if common.is_ip(server) == socket.AF_INET:
                                    if type(server) != str:
                                        server = server.decode('utf8')
                                    self._servers.append(server)
@@ -316,7 +296,7 @@ class DNSResolver(object):
                    parts = line.split()
                    if len(parts) >= 2:
                        ip = parts[0]
-                        if is_ip(ip):
+                        if common.is_ip(ip):
                            for i in range(1, len(parts)):
                                hostname = parts[i]
                                if hostname:
@@ -412,10 +392,7 @@ class DNSResolver(object):
                        del self._hostname_status[hostname]
    def _send_req(self, hostname, qtype):
-        self._request_id += 1
+        req = build_request(hostname, qtype)
        if self._request_id > 32768:
            self._request_id = 1
        req = build_request(hostname, qtype, self._request_id)
        for server in self._servers:
            logging.debug('resolving %s with type %d using server %s',
                          hostname, qtype, server)
@@ -426,7 +403,7 @@ class DNSResolver(object):
            hostname = hostname.encode('utf8')
        if not hostname:
            callback(None, Exception('empty hostname'))
-        elif is_ip(hostname):
+        elif common.is_ip(hostname):
            callback((hostname, hostname), None)
        elif hostname in self._hosts:
            logging.debug('hit hosts: %s', hostname)
@@ -1,25 +1,19 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2013-2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -101,6 +95,18 @@ def inet_pton(family, addr):
        raise RuntimeError("What family?")
 def is_ip(address):
    for family in (socket.AF_INET, socket.AF_INET6):
        try:
            if type(address) != str:
                address = address.decode('utf8')
            inet_pton(family, address)
            return family
        except (TypeError, ValueError, OSError, IOError):
            pass
    return False
 def patch_socket():
    if not hasattr(socket, 'inet_pton'):
        socket.inet_pton = inet_pton
@@ -172,6 +178,61 @@ def parse_header(data):
    return addrtype, to_bytes(dest_addr), dest_port, header_length
 class IPNetwork(object):
    ADDRLENGTH = {socket.AF_INET: 32, socket.AF_INET6: 128, False: 0}
    def __init__(self, addrs):
        self._network_list_v4 = []
        self._network_list_v6 = []
        if type(addrs) == str:
            addrs = addrs.split(',')
        list(map(self.add_network, addrs))
    def add_network(self, addr):
        if addr is "":
            return
        block = addr.split('/')
        addr_family = is_ip(block[0])
        addr_len = IPNetwork.ADDRLENGTH[addr_family]
        if addr_family is socket.AF_INET:
            ip, = struct.unpack("!I", socket.inet_aton(block[0]))
        elif addr_family is socket.AF_INET6:
            hi, lo = struct.unpack("!QQ", inet_pton(addr_family, block[0]))
            ip = (hi << 64) | lo
        else:
            raise Exception("Not a valid CIDR notation: %s" % addr)
        if len(block) is 1:
            prefix_size = 0
            while (ip & 1) == 0 and ip is not 0:
                ip >>= 1
                prefix_size += 1
            logging.warn("You did't specify CIDR routing prefix size for %s, "
                         "implicit treated as %s/%d" % (addr, addr, addr_len))
        elif block[1].isdigit() and int(block[1]) <= addr_len:
            prefix_size = addr_len - int(block[1])
            ip >>= prefix_size
        else:
            raise Exception("Not a valid CIDR notation: %s" % addr)
        if addr_family is socket.AF_INET:
            self._network_list_v4.append((ip, prefix_size))
        else:
            self._network_list_v6.append((ip, prefix_size))
    def __contains__(self, addr):
        addr_family = is_ip(addr)
        if addr_family is socket.AF_INET:
            ip, = struct.unpack("!I", socket.inet_aton(addr))
            return any(map(lambda n_ps: n_ps[0] == ip >> n_ps[1],
                           self._network_list_v4))
        elif addr_family is socket.AF_INET6:
            hi, lo = struct.unpack("!QQ", inet_pton(addr_family, addr))
            ip = (hi << 64) | lo
            return any(map(lambda n_ps: n_ps[0] == ip >> n_ps[1],
                           self._network_list_v6))
        else:
            return False
 def test_inet_conv():
    ipv4 = b'8.8.4.4'
    b = inet_pton(socket.AF_INET, ipv4)
@@ -198,7 +259,23 @@ def test_pack_header():
    assert pack_addr(b'www.google.com') == b'\x03\x0ewww.google.com'
 def test_ip_network():
    ip_network = IPNetwork('127.0.0.0/24,::ff:1/112,::1,192.168.1.1,192.0.2.0')
    assert '127.0.0.1' in ip_network
    assert '127.0.1.1' not in ip_network
    assert ':ff:ffff' in ip_network
    assert '::ffff:1' not in ip_network
    assert '::1' in ip_network
    assert '::2' not in ip_network
    assert '192.168.1.1' in ip_network
    assert '192.168.1.2' not in ip_network
    assert '192.0.2.1' in ip_network
    assert '192.0.3.1' in ip_network  # 192.0.2.0 is treated as 192.0.2.0/23
    assert 'www.google.com' not in ip_network
 if __name__ == '__main__':
    test_inet_conv()
    test_parse_header()
    test_pack_header()
    test_ip_network()
@@ -1,24 +1,18 @@
 #!/usr/bin/env python
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -1,24 +1,18 @@
 #!/usr/bin/env python
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -26,6 +20,7 @@ from __future__ import absolute_import, division, print_function, \
 from ctypes import c_char_p, c_int, c_long, byref,\
    create_string_buffer, c_void_p
 from shadowsocks import common
 from shadowsocks.crypto import util
 __all__ = ['ciphers']
@@ -64,7 +59,7 @@ def load_openssl():
 def load_cipher(cipher_name):
-    func_name = b'EVP_' + cipher_name.replace(b'-', b'_')
+    func_name = 'EVP_' + cipher_name.replace('-', '_')
    if bytes != str:
        func_name = str(func_name, 'utf-8')
    cipher = getattr(libcrypto, func_name, None)
@@ -79,6 +74,7 @@ class OpenSSLCrypto(object):
        self._ctx = None
        if not loaded:
            load_openssl()
        cipher_name = common.to_bytes(cipher_name)
        cipher = libcrypto.EVP_get_cipherbyname(cipher_name)
        if not cipher:
            cipher = load_cipher(cipher_name)
@@ -117,31 +113,31 @@ class OpenSSLCrypto(object):
 ciphers = {
-    b'aes-128-cfb': (16, 16, OpenSSLCrypto),
+    'aes-128-cfb': (16, 16, OpenSSLCrypto),
-    b'aes-192-cfb': (24, 16, OpenSSLCrypto),
+    'aes-192-cfb': (24, 16, OpenSSLCrypto),
-    b'aes-256-cfb': (32, 16, OpenSSLCrypto),
+    'aes-256-cfb': (32, 16, OpenSSLCrypto),
-    b'aes-128-ofb': (16, 16, OpenSSLCrypto),
+    'aes-128-ofb': (16, 16, OpenSSLCrypto),
-    b'aes-192-ofb': (24, 16, OpenSSLCrypto),
+    'aes-192-ofb': (24, 16, OpenSSLCrypto),
-    b'aes-256-ofb': (32, 16, OpenSSLCrypto),
+    'aes-256-ofb': (32, 16, OpenSSLCrypto),
-    b'aes-128-ctr': (16, 16, OpenSSLCrypto),
+    'aes-128-ctr': (16, 16, OpenSSLCrypto),
-    b'aes-192-ctr': (24, 16, OpenSSLCrypto),
+    'aes-192-ctr': (24, 16, OpenSSLCrypto),
-    b'aes-256-ctr': (32, 16, OpenSSLCrypto),
+    'aes-256-ctr': (32, 16, OpenSSLCrypto),
-    b'aes-128-cfb8': (16, 16, OpenSSLCrypto),
+    'aes-128-cfb8': (16, 16, OpenSSLCrypto),
-    b'aes-192-cfb8': (24, 16, OpenSSLCrypto),
+    'aes-192-cfb8': (24, 16, OpenSSLCrypto),
-    b'aes-256-cfb8': (32, 16, OpenSSLCrypto),
+    'aes-256-cfb8': (32, 16, OpenSSLCrypto),
-    b'aes-128-cfb1': (16, 16, OpenSSLCrypto),
+    'aes-128-cfb1': (16, 16, OpenSSLCrypto),
-    b'aes-192-cfb1': (24, 16, OpenSSLCrypto),
+    'aes-192-cfb1': (24, 16, OpenSSLCrypto),
-    b'aes-256-cfb1': (32, 16, OpenSSLCrypto),
+    'aes-256-cfb1': (32, 16, OpenSSLCrypto),
-    b'bf-cfb': (16, 8, OpenSSLCrypto),
+    'bf-cfb': (16, 8, OpenSSLCrypto),
-    b'camellia-128-cfb': (16, 16, OpenSSLCrypto),
+    'camellia-128-cfb': (16, 16, OpenSSLCrypto),
-    b'camellia-192-cfb': (24, 16, OpenSSLCrypto),
+    'camellia-192-cfb': (24, 16, OpenSSLCrypto),
-    b'camellia-256-cfb': (32, 16, OpenSSLCrypto),
+    'camellia-256-cfb': (32, 16, OpenSSLCrypto),
-    b'cast5-cfb': (16, 8, OpenSSLCrypto),
+    'cast5-cfb': (16, 8, OpenSSLCrypto),
-    b'des-cfb': (8, 8, OpenSSLCrypto),
+    'des-cfb': (8, 8, OpenSSLCrypto),
-    b'idea-cfb': (16, 8, OpenSSLCrypto),
+    'idea-cfb': (16, 8, OpenSSLCrypto),
-    b'rc2-cfb': (16, 8, OpenSSLCrypto),
+    'rc2-cfb': (16, 8, OpenSSLCrypto),
-    b'rc4': (16, 0, OpenSSLCrypto),
+    'rc4': (16, 0, OpenSSLCrypto),
-    b'seed-cfb': (16, 16, OpenSSLCrypto),
+    'seed-cfb': (16, 16, OpenSSLCrypto),
 }
@@ -154,31 +150,31 @@ def run_method(method):
 def test_aes_128_cfb():
-    run_method(b'aes-128-cfb')
+    run_method('aes-128-cfb')
 def test_aes_256_cfb():
-    run_method(b'aes-256-cfb')
+    run_method('aes-256-cfb')
 def test_aes_128_cfb8():
-    run_method(b'aes-128-cfb8')
+    run_method('aes-128-cfb8')
 def test_aes_256_ofb():
-    run_method(b'aes-256-ofb')
+    run_method('aes-256-ofb')
 def test_aes_256_ctr():
-    run_method(b'aes-256-ctr')
+    run_method('aes-256-ctr')
 def test_bf_cfb():
-    run_method(b'bf-cfb')
+    run_method('bf-cfb')
 def test_rc4():
-    run_method(b'rc4')
+    run_method('rc4')
 if __name__ == '__main__':
@@ -1,24 +1,18 @@
 #!/usr/bin/env python
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -40,15 +34,15 @@ def create_cipher(alg, key, iv, op, key_as_bytes=0, d=None, salt=None,
 ciphers = {
-    b'rc4-md5': (16, 16, create_cipher),
+    'rc4-md5': (16, 16, create_cipher),
 }
 def test():
    from shadowsocks.crypto import util
-    cipher = create_cipher(b'rc4-md5', b'k' * 32, b'i' * 16, 1)
+    cipher = create_cipher('rc4-md5', b'k' * 32, b'i' * 16, 1)
-    decipher = create_cipher(b'rc4-md5', b'k' * 32, b'i' * 16, 0)
+    decipher = create_cipher('rc4-md5', b'k' * 32, b'i' * 16, 0)
    util.run_cipher(cipher, decipher)
@@ -1,24 +1,18 @@
 #!/usr/bin/env python
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -70,9 +64,9 @@ class SodiumCrypto(object):
        self.iv = iv
        self.key_ptr = c_char_p(key)
        self.iv_ptr = c_char_p(iv)
-        if cipher_name == b'salsa20':
+        if cipher_name == 'salsa20':
            self.cipher = libsodium.crypto_stream_salsa20_xor_ic
-        elif cipher_name == b'chacha20':
+        elif cipher_name == 'chacha20':
            self.cipher = libsodium.crypto_stream_chacha20_xor_ic
        else:
            raise Exception('Unknown cipher')
@@ -101,22 +95,22 @@ class SodiumCrypto(object):
 ciphers = {
-    b'salsa20': (32, 8, SodiumCrypto),
+    'salsa20': (32, 8, SodiumCrypto),
-    b'chacha20': (32, 8, SodiumCrypto),
+    'chacha20': (32, 8, SodiumCrypto),
 }
 def test_salsa20():
-    cipher = SodiumCrypto(b'salsa20', b'k' * 32, b'i' * 16, 1)
+    cipher = SodiumCrypto('salsa20', b'k' * 32, b'i' * 16, 1)
-    decipher = SodiumCrypto(b'salsa20', b'k' * 32, b'i' * 16, 0)
+    decipher = SodiumCrypto('salsa20', b'k' * 32, b'i' * 16, 0)
    util.run_cipher(cipher, decipher)
 def test_chacha20():
-    cipher = SodiumCrypto(b'chacha20', b'k' * 32, b'i' * 16, 1)
+    cipher = SodiumCrypto('chacha20', b'k' * 32, b'i' * 16, 1)
-    decipher = SodiumCrypto(b'chacha20', b'k' * 32, b'i' * 16, 0)
+    decipher = SodiumCrypto('chacha20', b'k' * 32, b'i' * 16, 0)
    util.run_cipher(cipher, decipher)
@@ -1,24 +1,18 @@
 # !/usr/bin/env python
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -73,7 +67,7 @@ class TableCipher(object):
 ciphers = {
-    b'table': (0, 0, TableCipher)
+    'table': (0, 0, TableCipher)
 }
@@ -169,8 +163,8 @@ def test_table_result():
 def test_encryption():
    from shadowsocks.crypto import util
-    cipher = TableCipher(b'table', b'test', b'', 1)
+    cipher = TableCipher('table', b'test', b'', 1)
-    decipher = TableCipher(b'table', b'test', b'', 0)
+    decipher = TableCipher('table', b'test', b'', 0)
    util.run_cipher(cipher, decipher)
@@ -1,33 +1,46 @@
 #!/usr/bin/env python
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
 import os
 import logging
 def find_library_nt(name):
    # modified from ctypes.util
    # ctypes.util.find_library just returns first result he found
    # but we want to try them all
    # because on Windows, users may have both 32bit and 64bit version installed
    results = []
    for directory in os.environ['PATH'].split(os.pathsep):
        fname = os.path.join(directory, name)
        if os.path.isfile(fname):
            results.append(fname)
        if fname.lower().endswith(".dll"):
            continue
        fname = fname + ".dll"
        if os.path.isfile(fname):
            results.append(fname)
    return results
 def find_library(possible_lib_names, search_symbol, library_name):
-    from ctypes.util import find_library
+    import ctypes.util
    from ctypes import CDLL
    paths = []
@@ -35,10 +48,18 @@ def find_library(possible_lib_names, search_symbol, library_name):
    if type(possible_lib_names) not in (list, tuple):
        possible_lib_names = [possible_lib_names]
-    for name in possible_lib_names:
+    lib_names = []
-        path = find_library(name)
+    for lib_name in possible_lib_names:
-        if path:
+        lib_names.append(lib_name)
-            paths.append(path)
+        lib_names.append('lib' + lib_name)
    for name in lib_names:
        if os.name == "nt":
            paths.extend(find_library_nt(name))
        else:
            path = ctypes.util.find_library(name)
            if path:
                paths.append(path)
    if not paths:
        # We may get here when find_library fails because, for example,
@@ -46,13 +67,12 @@ def find_library(possible_lib_names, search_symbol, library_name):
        # tools underlying find_library on linux.
        import glob
-        for name in possible_lib_names:
+        for name in lib_names:
            patterns = [
                '/usr/local/lib*/lib%s.*' % name,
                '/usr/lib*/lib%s.*' % name,
                'lib%s.*' % name,
-                '%s.dll' % name,
+                '%s.dll' % name]
                'lib%s.dll' % name]
            for pat in patterns:
                files = glob.glob(pat)
@@ -106,10 +126,11 @@ def test_find_library():
    assert find_library('c', 'strcpy', 'libc') is not None
    assert find_library(['c'], 'strcpy', 'libc') is not None
    assert find_library(('c',), 'strcpy', 'libc') is not None
-    assert find_library('crypto', 'EVP_CipherUpdate', 'libcrypto') is not None
+    assert find_library(('crypto', 'eay32'), 'EVP_CipherUpdate',
                        'libcrypto') is not None
    assert find_library('notexist', 'strcpy', 'libnotexist') is None
    assert find_library('c', 'symbol_not_exist', 'c') is None
-    assert find_library(('notexist', 'c', 'crypto'),
+    assert find_library(('notexist', 'c', 'crypto', 'eay32'),
                        'EVP_CipherUpdate', 'libc') is not None
@@ -1,25 +1,19 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2014-2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -29,7 +23,7 @@ import sys
 import logging
 import signal
 import time
-from shadowsocks import common
+from shadowsocks import common, shell
 # this module is ported from ShadowVPN daemon.c
@@ -43,9 +37,6 @@ def daemon_exec(config):
            command = 'start'
        pid_file = config['pid-file']
        log_file = config['log-file']
        command = common.to_str(command)
        pid_file = common.to_str(pid_file)
        log_file = common.to_str(log_file)
        if command == 'start':
            daemon_start(pid_file, log_file)
        elif command == 'stop':
@@ -67,7 +58,7 @@ def write_pid_file(pid_file, pid):
        fd = os.open(pid_file, os.O_RDWR | os.O_CREAT,
                     stat.S_IRUSR | stat.S_IWUSR)
    except OSError as e:
-        logging.error(e)
+        shell.print_exception(e)
        return -1
    flags = fcntl.fcntl(fd, fcntl.F_GETFD)
    assert flags != -1
@@ -136,7 +127,7 @@ def daemon_start(pid_file, log_file):
        freopen(log_file, 'a', sys.stdout)
        freopen(log_file, 'a', sys.stderr)
    except IOError as e:
-        logging.error(e)
+        shell.print_exception(e)
        sys.exit(1)
@@ -149,7 +140,7 @@ def daemon_stop(pid_file):
            if not buf:
                logging.error('not running')
    except IOError as e:
-        logging.error(e)
+        shell.print_exception(e)
        if e.errno == errno.ENOENT:
            # always exit 0 if we are sure daemon is not running
            logging.error('not running')
@@ -164,7 +155,7 @@ def daemon_stop(pid_file):
                logging.error('not running')
                # always exit 0 if we are sure daemon is not running
                return
-            logging.error(e)
+            shell.print_exception(e)
            sys.exit(1)
    else:
        logging.error('pid is not positive: %d', pid)
@@ -183,3 +174,35 @@ def daemon_stop(pid_file):
        sys.exit(1)
    print('stopped')
    os.unlink(pid_file)
 def set_user(username):
    if username is None:
        return
    import pwd
    import grp
    try:
        pwrec = pwd.getpwnam(username)
    except KeyError:
        logging.error('user not found: %s' % username)
        raise
    user = pwrec[0]
    uid = pwrec[2]
    gid = pwrec[3]
    cur_uid = os.getuid()
    if uid == cur_uid:
        return
    if cur_uid != 0:
        logging.error('can not set user as nonroot user')
        # will raise later
    # inspired by supervisor
    if hasattr(os, 'setgroups'):
        groups = [grprec[2] for grprec in grp.getgrall() if user in grprec[3]]
        groups.insert(0, gid)
        os.setgroups(groups)
    os.setgid(gid)
    os.setuid(uid)
@@ -1,24 +1,18 @@
 #!/usr/bin/env python
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2012-2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -28,6 +22,7 @@ import sys
 import hashlib
 import logging
 from shadowsocks import common
 from shadowsocks.crypto import rc4_md5, openssl, sodium, table
@@ -52,8 +47,6 @@ def try_cipher(key, method=None):
 def EVP_BytesToKey(password, key_len, iv_len):
    # equivalent to OpenSSL's EVP_BytesToKey() with count 1
    # so that we make the same key and iv as nodejs version
    if hasattr(password, 'encode'):
        password = password.encode('utf-8')
    cached_key = '%s-%d-%d' % (password, key_len, iv_len)
    r = cached_keys.get(cached_key, None)
    if r:
@@ -101,8 +94,7 @@ class Encryptor(object):
        return len(self.cipher_iv)
    def get_cipher(self, password, method, op, iv):
-        if hasattr(password, 'encode'):
+        password = common.to_bytes(password)
            password = password.encode('utf-8')
        m = self._method_info
        if m[0] > 0:
            key, iv_ = EVP_BytesToKey(password, m[0], m[1])
@@ -159,12 +151,12 @@ def encrypt_all(password, method, op, data):
 CIPHERS_TO_TEST = [
-    b'aes-128-cfb',
+    'aes-128-cfb',
-    b'aes-256-cfb',
+    'aes-256-cfb',
-    b'rc4-md5',
+    'rc4-md5',
-    b'salsa20',
+    'salsa20',
-    b'chacha20',
+    'chacha20',
-    b'table',
+    'table',
 ]
@@ -1,25 +1,19 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2013-2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 # from ssloop
 # https://github.com/clowwindy/ssloop
@@ -34,6 +28,8 @@ import errno
 import logging
 from collections import defaultdict
 from shadowsocks import shell
 __all__ = ['EventLoop', 'POLL_NULL', 'POLL_IN', 'POLL_OUT', 'POLL_ERR',
           'POLL_HUP', 'POLL_NVAL', 'EVENT_NAMES']
@@ -229,9 +225,7 @@ class EventLoop(object):
                try:
                    handler(events)
                except (OSError, IOError) as e:
-                    logging.error(e)
+                    shell.print_exception(e)
                    import traceback
                    traceback.print_exc()
            if self._handlers_to_remove:
                for handler in self._handlers_to_remove:
                    self._handlers.remove(handler)
@@ -1,25 +1,19 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2012-2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -30,12 +24,11 @@ import logging
 import signal
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../'))
-from shadowsocks import utils, daemon, encrypt, eventloop, tcprelay, udprelay,\
+from shadowsocks import shell, daemon, eventloop, tcprelay, udprelay, asyncdns
    asyncdns
 def main():
-    utils.check_python()
+    shell.check_python()
    # fix py2exe
    if hasattr(sys, "frozen") and sys.frozen in \
@@ -43,14 +36,10 @@ def main():
        p = os.path.dirname(os.path.abspath(sys.executable))
        os.chdir(p)
-    config = utils.get_config(True)
+    config = shell.get_config(True)
    daemon.daemon_exec(config)
    utils.print_shadowsocks()
    encrypt.try_cipher(config['password'], config['method'])
    try:
        logging.info("starting local at %s:%d" %
                     (config['local_address'], config['local_port']))
@@ -73,13 +62,11 @@ def main():
            sys.exit(1)
        signal.signal(signal.SIGINT, int_handler)
        daemon.set_user(config.get('user', None))
        loop.run()
-    except (KeyboardInterrupt, IOError, OSError) as e:
+    except Exception as e:
-        logging.error(e)
+        shell.print_exception(e)
-        if config['verbose']:
+        sys.exit(1)
            import traceback
            traceback.print_exc()
        os._exit(1)
 if __name__ == '__main__':
    main()
@@ -1,25 +1,19 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -80,6 +74,7 @@ class LRUCache(collections.MutableMapping):
        # O(m)
        now = time.time()
        c = 0
        values_closed = list()  # list is cheaper to create
        while len(self._last_visits) > 0:
            least = self._last_visits[0]
            if now - least <= self.timeout:
@@ -89,7 +84,9 @@ class LRUCache(collections.MutableMapping):
                    if key in self._store:
                        if now - self._keys_to_last_time[key] > self.timeout:
                            value = self._store[key]
-                            self.close_callback(value)
+                            if value not in values_closed:
                                self.close_callback(value)
                                values_closed.append(value)
            for key in self._time_to_keys[least]:
                self._last_visits.popleft()
                if key in self._store:
@@ -132,5 +129,21 @@ def test():
    assert 'a' not in c
    assert 'b' not in c
    global close_cb_called
    close_cb_called = False
    def close_cb(t):
        global close_cb_called
        assert not close_cb_called
        close_cb_called = True
    c = LRUCache(timeout=0.1, close_callback=close_cb)
    c['s'] = 1
    c['s']
    time.sleep(0.1)
    c['s']
    time.sleep(0.3)
    c.sweep()
 if __name__ == '__main__':
    test()
@@ -1,25 +1,19 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -30,19 +24,16 @@ import logging
 import signal
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../'))
-from shadowsocks import utils, daemon, encrypt, eventloop, tcprelay, udprelay,\
+from shadowsocks import shell, daemon, eventloop, tcprelay, udprelay, asyncdns
    asyncdns
 def main():
-    utils.check_python()
+    shell.check_python()
-    config = utils.get_config(False)
+    config = shell.get_config(False)
    daemon.daemon_exec(config)
    utils.print_shadowsocks()
    if config['port_password']:
        if config['password']:
            logging.warn('warning: port_password should not be used with '
@@ -57,7 +48,6 @@ def main():
        else:
            config['port_password'][str(server_port)] = config['password']
    encrypt.try_cipher(config['password'], config['method'])
    tcp_servers = []
    udp_servers = []
    dns_resolver = asyncdns.DNSResolver()
@@ -86,13 +76,12 @@ def main():
            loop = eventloop.EventLoop()
            dns_resolver.add_to_loop(loop)
            list(map(lambda s: s.add_to_loop(loop), tcp_servers + udp_servers))
            daemon.set_user(config.get('user', None))
            loop.run()
-        except (KeyboardInterrupt, IOError, OSError) as e:
+        except Exception as e:
-            logging.error(e)
+            shell.print_exception(e)
-            if config['verbose']:
+            sys.exit(1)
                import traceback
                traceback.print_exc()
            os._exit(1)
    if int(config['workers']) > 1:
        if os.name == 'posix':
@@ -1,25 +1,19 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -29,11 +23,14 @@ import json
 import sys
 import getopt
 import logging
-from shadowsocks.common import to_bytes, to_str
+from shadowsocks.common import to_bytes, to_str, IPNetwork
 from shadowsocks import encrypt
 VERBOSE_LEVEL = 5
 verbose = 0
 def check_python():
    info = sys.version_info
@@ -48,6 +45,14 @@ def check_python():
        sys.exit(1)
 def print_exception(e):
    global verbose
    logging.error(e)
    if verbose > 0:
        import traceback
        traceback.print_exc()
 def print_shadowsocks():
    version = ''
    try:
@@ -55,7 +60,7 @@ def print_shadowsocks():
        version = pkg_resources.get_distribution('shadowsocks').version
    except Exception:
        pass
-    print('shadowsocks %s' % version)
+    print('Shadowsocks %s' % version)
 def find_config():
@@ -68,16 +73,37 @@ def find_config():
    return None
-def check_config(config):
+def check_config(config, is_local):
    if config.get('daemon', None) == 'stop':
        # no need to specify configuration for daemon stop
        return
    if is_local and not config.get('password', None):
        logging.error('password not specified')
        print_help(is_local)
        sys.exit(2)
    if not is_local and not config.get('password', None) \
            and not config.get('port_password', None):
        logging.error('password or port_password not specified')
        print_help(is_local)
        sys.exit(2)
    if 'local_port' in config:
        config['local_port'] = int(config['local_port'])
    if 'server_port' in config and type(config['server_port']) != list:
        config['server_port'] = int(config['server_port'])
    if config.get('local_address', '') in [b'0.0.0.0']:
        logging.warn('warning: local set to listen on 0.0.0.0, it\'s not safe')
-    if config.get('server', '') in [b'127.0.0.1', b'localhost']:
+    if config.get('server', '') in ['127.0.0.1', 'localhost']:
        logging.warn('warning: server set to listen on %s:%s, are you sure?' %
                     (to_str(config['server']), config['server_port']))
-    if (config.get('method', '') or '').lower() == b'table':
+    if (config.get('method', '') or '').lower() == 'table':
        logging.warn('warning: table is not safe; please use a safer cipher, '
                     'like AES-256-CFB')
-    if (config.get('method', '') or '').lower() == b'rc4':
+    if (config.get('method', '') or '').lower() == 'rc4':
        logging.warn('warning: RC4 is not safe; please use a safer cipher, '
                     'like AES-256-CFB')
    if config.get('timeout', 300) < 100:
@@ -89,19 +115,28 @@ def check_config(config):
    if config.get('password') in [b'mypassword']:
        logging.error('DON\'T USE DEFAULT PASSWORD! Please change it in your '
                      'config.json!')
-        exit(1)
+        sys.exit(1)
    if config.get('user', None) is not None:
        if os.name != 'posix':
            logging.error('user can be used only on Unix')
            sys.exit(1)
    encrypt.try_cipher(config['password'], config['method'])
 def get_config(is_local):
    global verbose
    logging.basicConfig(level=logging.INFO,
                        format='%(levelname)-s: %(message)s')
    if is_local:
        shortopts = 'hd:s:b:p:k:l:m:c:t:vq'
-        longopts = ['help', 'fast-open', 'pid-file=', 'log-file=']
+        longopts = ['help', 'fast-open', 'pid-file=', 'log-file=', 'user=',
                    'version']
    else:
        shortopts = 'hd:s:p:k:m:c:t:vq'
        longopts = ['help', 'fast-open', 'pid-file=', 'log-file=', 'workers=',
-                    'forbidden-ip=']
+                    'forbidden-ip=', 'user=', 'version']
    try:
        config_path = find_config()
        optlist, args = getopt.getopt(sys.argv[1:], shortopts, longopts)
@@ -122,7 +157,6 @@ def get_config(is_local):
        else:
            config = {}
        optlist, args = getopt.getopt(sys.argv[1:], shortopts, longopts)
        v_count = 0
        for key, value in optlist:
            if key == '-p':
@@ -132,11 +166,11 @@ def get_config(is_local):
            elif key == '-l':
                config['local_port'] = int(value)
            elif key == '-s':
-                config['server'] = to_bytes(value)
+                config['server'] = to_str(value)
            elif key == '-m':
-                config['method'] = to_bytes(value)
+                config['method'] = to_str(value)
            elif key == '-b':
-                config['local_address'] = to_bytes(value)
+                config['local_address'] = to_str(value)
            elif key == '-v':
                v_count += 1
                # '-vv' turns on more verbose mode
@@ -147,6 +181,8 @@ def get_config(is_local):
                config['fast_open'] = True
            elif key == '--workers':
                config['workers'] = int(value)
            elif key == '--user':
                config['user'] = to_str(value)
            elif key == '--forbidden-ip':
                config['forbidden_ip'] = to_str(value).split(',')
            elif key in ('-h', '--help'):
@@ -155,12 +191,15 @@ def get_config(is_local):
                else:
                    print_server_help()
                sys.exit(0)
            elif key == '--version':
                print_shadowsocks()
                sys.exit(0)
            elif key == '-d':
-                config['daemon'] = value
+                config['daemon'] = to_str(value)
            elif key == '--pid-file':
-                config['pid-file'] = value
+                config['pid-file'] = to_str(value)
            elif key == '--log-file':
-                config['log-file'] = value
+                config['log-file'] = to_str(value)
            elif key == '-q':
                v_count -= 1
                config['verbose'] = v_count
@@ -174,44 +213,34 @@ def get_config(is_local):
        print_help(is_local)
        sys.exit(2)
-    config['password'] = config.get('password', '')
+    config['password'] = to_bytes(config.get('password', b''))
-    config['method'] = config.get('method', b'aes-256-cfb')
+    config['method'] = to_str(config.get('method', 'aes-256-cfb'))
    config['port_password'] = config.get('port_password', None)
    config['timeout'] = int(config.get('timeout', 300))
    config['fast_open'] = config.get('fast_open', False)
    config['workers'] = config.get('workers', 1)
    config['pid-file'] = config.get('pid-file', '/var/run/shadowsocks.pid')
    config['log-file'] = config.get('log-file', '/var/log/shadowsocks.log')
    config['workers'] = config.get('workers', 1)
    config['verbose'] = config.get('verbose', False)
-    config['local_address'] = config.get('local_address', '127.0.0.1')
+    config['local_address'] = to_str(config.get('local_address', '127.0.0.1'))
    config['local_port'] = config.get('local_port', 1080)
    if is_local:
        if config.get('server', None) is None:
            logging.error('server addr not specified')
            print_local_help()
            sys.exit(2)
        else:
            config['server'] = to_str(config['server'])
    else:
-        config['server'] = config.get('server', '0.0.0.0')
+        config['server'] = to_str(config.get('server', '0.0.0.0'))
        try:
            config['forbidden_ip'] = \
                IPNetwork(config.get('forbidden_ip', '127.0.0.0/8,::1/128'))
        except Exception as e:
            logging.error(e)
            sys.exit(2)
    config['server_port'] = config.get('server_port', 8388)
    if is_local and not config.get('password', None):
        logging.error('password not specified')
        print_help(is_local)
        sys.exit(2)
    if not is_local and not config.get('password', None) \
            and not config.get('port_password', None):
        logging.error('password or port_password not specified')
        print_help(is_local)
        sys.exit(2)
    if 'local_port' in config:
        config['local_port'] = int(config['local_port'])
    if 'server_port' in config and type(config['server_port']) != list:
        config['server_port'] = int(config['server_port'])
    logging.getLogger('').handlers = []
    logging.addLevelName(VERBOSE_LEVEL, 'VERBOSE')
    if config['verbose'] >= 2:
@@ -224,11 +253,12 @@ def get_config(is_local):
        level = logging.ERROR
    else:
        level = logging.INFO
    verbose = config['verbose']
    logging.basicConfig(level=level,
                        format='%(asctime)s %(levelname)-8s %(message)s',
                        datefmt='%Y-%m-%d %H:%M:%S')
-    check_config(config)
+    check_config(config, is_local)
    return config
@@ -241,15 +271,12 @@ def print_help(is_local):
 def print_local_help():
-    print('''usage: sslocal [-h] -s SERVER_ADDR [-p SERVER_PORT]
+    print('''usage: sslocal [OPTION]...
               [-b LOCAL_ADDR] [-l LOCAL_PORT] -k PASSWORD [-m METHOD]
               [-t TIMEOUT] [-c CONFIG] [--fast-open] [-v] -[d] [-q]
 A fast tunnel proxy that helps you bypass firewalls.
 You can supply configurations via either config file or command line arguments.
 Proxy options:
  -h, --help             show this help message and exit
  -c CONFIG              path to config file
  -s SERVER_ADDR         server address
  -p SERVER_PORT         server port, default: 8388
@@ -261,26 +288,26 @@ Proxy options:
  --fast-open            use TCP_FASTOPEN, requires Linux 3.7+
 General options:
  -h, --help             show this help message and exit
  -d start/stop/restart  daemon mode
  --pid-file PID_FILE    pid file for daemon mode
  --log-file LOG_FILE    log file for daemon mode
  --user USER            username to run as
  -v, -vv                verbose mode
  -q, -qq                quiet mode, only show warnings/errors
  --version              show version information
 Online help: <https://github.com/shadowsocks/shadowsocks>
 ''')
 def print_server_help():
-    print('''usage: ssserver [-h] [-s SERVER_ADDR] [-p SERVER_PORT] -k PASSWORD
+    print('''usage: ssserver [OPTION]...
                -m METHOD [-t TIMEOUT] [-c CONFIG] [--fast-open]
                [--workers WORKERS] [-v] [-d start] [-q]
 A fast tunnel proxy that helps you bypass firewalls.
 You can supply configurations via either config file or command line arguments.
 Proxy options:
  -h, --help             show this help message and exit
  -c CONFIG              path to config file
  -s SERVER_ADDR         server address, default: 0.0.0.0
  -p SERVER_PORT         server port, default: 8388
@@ -292,11 +319,14 @@ Proxy options:
  --forbidden-ip IPLIST  comma seperated IP list forbidden to connect
 General options:
  -h, --help             show this help message and exit
  -d start/stop/restart  daemon mode
  --pid-file PID_FILE    pid file for daemon mode
  --log-file LOG_FILE    log file for daemon mode
  --user USER            username to run as
  -v, -vv                verbose mode
  -q, -qq                quiet mode, only show warnings/errors
  --version              show version information
 Online help: <https://github.com/shadowsocks/shadowsocks>
 ''')
@@ -1,25 +1,19 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2015 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -32,7 +26,7 @@ import logging
 import traceback
 import random
-from shadowsocks import encrypt, eventloop, utils, common
+from shadowsocks import encrypt, eventloop, shell, common
 from shadowsocks.common import parse_header
 # we clear at most TIMEOUTS_CLEAN_SIZE timeouts each time
@@ -43,30 +37,22 @@ TIMEOUT_PRECISION = 4
 MSG_FASTOPEN = 0x20000000
-# SOCKS CMD defination
+# SOCKS command definition
 CMD_CONNECT = 1
 CMD_BIND = 2
 CMD_UDP_ASSOCIATE = 3
 # TCP Relay can be either sslocal or ssserver
 # for sslocal it is called is_local=True
 # for each opening port, we have a TCP Relay
 # for each connection, we have a TCP Relay Handler to handle the connection
 # for each handler, we have 2 sockets:
 #    local:   connected to the client
 #    remote:  connected to remote server
 # for each handler, we have 2 streams:
 #    upstream:    from client to server direction
 #                 read local and write to remote
 #    downstream:  from server to client direction
 #                 read remote and write to local
 # for each handler, it could be at one of several stages:
-# sslocal:
+# as sslocal:
 # stage 0 SOCKS hello received from local, send hello to local
 # stage 1 addr received from local, query DNS for remote
 # stage 2 UDP assoc
@@ -74,7 +60,7 @@ CMD_UDP_ASSOCIATE = 3
 # stage 4 still connecting, more data from local received
 # stage 5 remote connected, piping local and remote
-# ssserver:
+# as ssserver:
 # stage 0 just jump to stage 1
 # stage 1 addr received from local, query DNS for remote
 # stage 3 DNS resolved, connect to remote
@@ -89,11 +75,16 @@ STAGE_CONNECTING = 4
 STAGE_STREAM = 5
 STAGE_DESTROYED = -1
-# stream direction
+# for each handler, we have 2 stream directions:
 #    upstream:    from client to server direction
 #                 read local and write to remote
 #    downstream:  from server to client direction
 #                 read remote and write to local
 STREAM_UP = 0
 STREAM_DOWN = 1
-# stream wait status, indicating it's waiting for reading, etc
+# for each stream, it's waiting for reading, or writing, or both
 WAIT_STATUS_INIT = 0
 WAIT_STATUS_READING = 1
 WAIT_STATUS_WRITING = 2
@@ -112,6 +103,9 @@ class TCPRelayHandler(object):
        self._remote_sock = None
        self._config = config
        self._dns_resolver = dns_resolver
        # TCP Relay works as either sslocal or ssserver
        # if is_local, this is sslocal
        self._is_local = is_local
        self._stage = STAGE_INIT
        self._encryptor = encrypt.Encryptor(config['password'],
@@ -150,8 +144,9 @@ class TCPRelayHandler(object):
        server_port = self._config['server_port']
        if type(server_port) == list:
            server_port = random.choice(server_port)
        if type(server) == list:
            server = random.choice(server)
        logging.debug('chosen server: %s:%d', server, server_port)
        # TODO support multiple server IP
        return server, server_port
    def _update_activity(self):
@@ -208,9 +203,7 @@ class TCPRelayHandler(object):
                            errno.EWOULDBLOCK):
                uncomplete = True
            else:
-                logging.error(e)
+                shell.print_exception(e)
                if self._config['verbose']:
                    traceback.print_exc()
                self.destroy()
                return False
        if uncomplete:
@@ -264,7 +257,7 @@ class TCPRelayHandler(object):
                    self._config['fast_open'] = False
                    self.destroy()
                else:
-                    logging.error(e)
+                    shell.print_exception(e)
                    if self._config['verbose']:
                        traceback.print_exc()
                    self.destroy()
@@ -302,7 +295,7 @@ class TCPRelayHandler(object):
            logging.info('connecting %s:%d from %s:%d' %
                         (common.to_str(remote_addr), remote_port,
                          self._client_address[0], self._client_address[1]))
-            self._remote_address = (remote_addr, remote_port)
+            self._remote_address = (common.to_str(remote_addr), remote_port)
            # pause reading
            self._update_stream(STREAM_UP, WAIT_STATUS_WRITING)
            self._stage = STAGE_DNS
@@ -333,7 +326,7 @@ class TCPRelayHandler(object):
        addrs = socket.getaddrinfo(ip, port, 0, socket.SOCK_STREAM,
                                   socket.SOL_TCP)
        if len(addrs) == 0:
-            raise Exception("getaddrinfo failed for %s:%d" % (ip,  port))
+            raise Exception("getaddrinfo failed for %s:%d" % (ip, port))
        af, socktype, proto, canonname, sa = addrs[0]
        if self._forbidden_iplist:
            if common.to_str(sa[0]) in self._forbidden_iplist:
@@ -387,8 +380,8 @@ class TCPRelayHandler(object):
                        self._update_stream(STREAM_UP, WAIT_STATUS_READWRITING)
                        self._update_stream(STREAM_DOWN, WAIT_STATUS_READING)
                    return
-                except (OSError, IOError) as e:
+                except Exception as e:
-                    logging.error(e)
+                    shell.print_exception(e)
                    if self._config['verbose']:
                        traceback.print_exc()
        self.destroy()
@@ -450,7 +443,7 @@ class TCPRelayHandler(object):
        try:
            self._write_to_sock(data, self._local_sock)
        except Exception as e:
-            logging.error(e)
+            shell.print_exception(e)
            if self._config['verbose']:
                traceback.print_exc()
            # TODO use logging when debug completed
@@ -637,7 +630,7 @@ class TCPRelay(object):
        # we just need a sorted last_activity queue and it's faster than heapq
        # in fact we can do O(1) insertion/remove so we invent our own
        if self._timeouts:
-            logging.log(utils.VERBOSE_LEVEL, 'sweeping timeouts')
+            logging.log(shell.VERBOSE_LEVEL, 'sweeping timeouts')
            now = time.time()
            length = len(self._timeouts)
            pos = self._timeout_offset
@@ -670,7 +663,7 @@ class TCPRelay(object):
        # handle events and dispatch to handlers
        for sock, fd, event in events:
            if sock:
-                logging.log(utils.VERBOSE_LEVEL, 'fd %d %s', fd,
+                logging.log(shell.VERBOSE_LEVEL, 'fd %d %s', fd,
                            eventloop.EVENT_NAMES.get(event, event))
            if sock == self._server_socket:
                if event & eventloop.POLL_ERR:
@@ -688,7 +681,7 @@ class TCPRelay(object):
                                    errno.EWOULDBLOCK):
                        continue
                    else:
-                        logging.error(e)
+                        shell.print_exception(e)
                        if self._config['verbose']:
                            traceback.print_exc()
            else:
@@ -1,25 +1,19 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 # SOCKS5 UDP Request
 # +----+------+------+----------+----------+----------+
@@ -75,7 +69,7 @@ import struct
 import errno
 import random
-from shadowsocks import encrypt, eventloop, lru_cache, common
+from shadowsocks import encrypt, eventloop, lru_cache, common, shell
 from shadowsocks.common import parse_header, pack_addr
@@ -112,7 +106,6 @@ class UDPRelay(object):
        self._closed = False
        self._last_time = time.time()
        self._sockets = set()
        print(config)
        if 'forbidden_ip' in config:
            self._forbidden_iplist = config['forbidden_ip']
        else:
@@ -134,8 +127,9 @@ class UDPRelay(object):
        server_port = self._config['server_port']
        if type(server_port) == list:
            server_port = random.choice(server_port)
        if type(server) == list:
            server = random.choice(server)
        logging.debug('chosen server: %s:%d', server, server_port)
        # TODO support multiple server IP
        return server, server_port
    def _close_client(self, client):
@@ -214,7 +208,7 @@ class UDPRelay(object):
            if err in (errno.EINPROGRESS, errno.EAGAIN):
                pass
            else:
-                logging.error(e)
+                shell.print_exception(e)
    def _handle_client(self, sock):
        data, r_addr = sock.recvfrom(BUF_SIZE)
@@ -0,0 +1,10 @@
 {
    "server":["127.0.0.1", "127.0.0.1"],
    "server_port":8388,
    "local_port":1081,
    "password":"aes_password",
    "timeout":60,
    "method":"aes-256-cfb",
    "local_address":"127.0.0.1",
    "fast_open":false
 }
@@ -1,4 +1,18 @@
 #!/usr/bin/env python
 #
 # Copyright 2015 clowwindy
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
 if __name__ == '__main__':
    import tornado.ioloop
@@ -11,7 +25,7 @@ if __name__ == '__main__':
                with open('/tmp/%s-coverage' % project, 'rb') as f:
                    coverage = f.read().strip()
                    n = int(coverage.strip('%'))
-                    if n > 80:
+                    if n >= 80:
                        color = 'brightgreen'
                    else:
                        color = 'yellow'
@@ -24,9 +24,10 @@ function run_test {
    return 0
 }
 python --version
 coverage erase
 mkdir tmp
-run_test pep8 .
+run_test pep8 --ignore=E402 .
 run_test pyflakes .
 run_test coverage run tests/nose_plugin.py -v
 run_test python setup.py sdist
@@ -40,6 +41,7 @@ run_test python tests/test.py --with-coverage -c tests/salsa20.json
 run_test python tests/test.py --with-coverage -c tests/chacha20.json
 run_test python tests/test.py --with-coverage -c tests/table.json
 run_test python tests/test.py --with-coverage -c tests/server-multi-ports.json
 run_test python tests/test.py --with-coverage -s tests/aes.json -c tests/client-multi-server-ip.json
 run_test python tests/test.py --with-coverage -s tests/server-multi-passwd.json -c tests/server-multi-passwd-client-side.json
 run_test python tests/test.py --with-coverage -c tests/workers.json
 run_test python tests/test.py --with-coverage -s tests/ipv6.json -c tests/ipv6-client-side.json
@@ -47,6 +49,15 @@ run_test python tests/test.py --with-coverage -b "-m rc4-md5 -k testrc4 -s 127.0
 run_test python tests/test.py --with-coverage -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 --workers 1" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -qq -b 127.0.0.1"
 run_test python tests/test.py --with-coverage --should-fail --url="http://127.0.0.1/" -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 --forbidden-ip=127.0.0.1,::1,8.8.8.8" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -b 127.0.0.1"
 # test if DNS works
 run_test python tests/test.py --with-coverage -c tests/aes.json --url="https://clients1.google.com/generate_204"
 # test localhost is in the forbidden list by default
 run_test python tests/test.py --with-coverage --should-fail --tcp-only --url="http://127.0.0.1/" -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -b 127.0.0.1"
 # test localhost is available when forbidden list is empty
 run_test python tests/test.py --with-coverage --tcp-only --url="http://127.0.0.1/" -b "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 --forbidden-ip=" -a "-m aes-256-cfb -k testrc4 -s 127.0.0.1 -p 8388 -l 1081 -t 30 -b 127.0.0.1"
 if [ -f /proc/sys/net/ipv4/tcp_fastopen ] ; then
    if [ 3 -eq `cat /proc/sys/net/ipv4/tcp_fastopen` ] ; then
        # we have to run it twice:
@@ -1,3 +1,19 @@
 #!/usr/bin/env python
 #
 # Copyright 2015 clowwindy
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
 import nose
 from nose.plugins.base import Plugin
@@ -1,25 +1,19 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright (c) 2014 clowwindy
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Copyright 2015 clowwindy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# all copies or substantial portions of the Software.
+# not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#     http://www.apache.org/licenses/LICENSE-2.0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# Unless required by applicable law or agreed to in writing, software
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# License for the specific language governing permissions and limitations
-# SOFTWARE.
+# under the License.
 from __future__ import absolute_import, division, print_function, \
    with_statement
@@ -34,6 +28,8 @@ from subprocess import Popen, PIPE
 python = ['python']
 default_url = 'http://localhost/'
 parser = argparse.ArgumentParser(description='test Shadowsocks')
 parser.add_argument('-c', '--client-conf', type=str, default=None)
 parser.add_argument('-s', '--server-conf', type=str, default=None)
@@ -41,7 +37,8 @@ parser.add_argument('-a', '--client-args', type=str, default=None)
 parser.add_argument('-b', '--server-args', type=str, default=None)
 parser.add_argument('--with-coverage', action='store_true', default=None)
 parser.add_argument('--should-fail', action='store_true', default=None)
-parser.add_argument('--url', type=str, default='http://www.example.com/')
+parser.add_argument('--tcp-only', action='store_true', default=None)
 parser.add_argument('--url', type=str, default=default_url)
 parser.add_argument('--dns', type=str, default='8.8.8.8')
 config = parser.parse_args()
@@ -64,6 +61,8 @@ if config.client_args:
        server_args.extend(config.server_args.split())
    else:
        server_args.extend(config.client_args.split())
 if config.url == default_url:
    server_args.extend(['--forbidden-ip', ''])
 p1 = Popen(server_args, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
 p2 = Popen(client_args, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
@@ -90,7 +89,6 @@ try:
        for fd in r:
            line = fd.readline()
            sys.stderr.write(line)
            if not line:
                if stage == 2 and fd == p3.stdout:
                    stage = 3
@@ -98,6 +96,7 @@ try:
                    stage = 5
            if bytes != str:
                line = str(line, 'utf8')
            sys.stderr.write(line)
            if line.find('starting local') >= 0:
                local_ready = True
            if line.find('starting server') >= 0:
@@ -127,6 +126,8 @@ try:
            else:
                if r != 0:
                    sys.exit(1)
            if config.tcp_only:
                break
            p4 = Popen(['socksify', 'dig', '@%s' % config.dns,
                        'www.google.com'],
                       stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
@@ -6,6 +6,9 @@ PYTHON="coverage run -a -p"
 LOCAL="$PYTHON shadowsocks/local.py"
 SERVER="$PYTHON shadowsocks/server.py"
 assert "$LOCAL --version 2>&1 | grep Shadowsocks | awk -F\" \" '{print \$1}'" "Shadowsocks"
 assert "$SERVER --version 2>&1 | grep Shadowsocks | awk -F\" \" '{print \$1}'" "Shadowsocks"
 assert "$LOCAL 2>&1 | grep ERROR" "ERROR: config not specified"
 assert "$LOCAL 2>&1 | grep usage | cut -d: -f1" "usage"
@@ -30,11 +33,13 @@ $LOCAL 2>/dev/null 1>/dev/null -m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -d sto
 assert "$LOCAL 2>&1 -m rc4-md5 -p 8388 -k testrc4 -d start | grep ERROR |  awk -F\"ERROR\" '{print \$2}'" ": server addr not specified"
 $LOCAL 2>/dev/null 1>/dev/null -m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -d stop
-assert "$LOCAL 2>&1 -m rc4-md5 -p 8388 -s 0.0.0.0 -d start | grep ERROR |  awk -F\"ERROR\" '{print \$2}'" ": password not specified"
+assert "$LOCAL 2>&1 -m rc4-md5 -p 8388 -s 0.0.0.0 -d start | grep ERROR |  awk -F\"ERROR\" '{print \$2}'" "    password not specified"
 $LOCAL 2>/dev/null 1>/dev/null -m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -d stop
-assert "$SERVER 2>&1 -m rc4-md5 -p 8388 -s 0.0.0.0 -d start | grep ERROR |  awk -F\"ERROR\" '{print \$2}'" ": password or port_password not specified"
+assert "$SERVER 2>&1 -m rc4-md5 -p 8388 -s 0.0.0.0 -d start | grep ERROR |  awk -F\"ERROR\" '{print \$2}'" "    password or port_password not specified"
 $LOCAL 2>/dev/null 1>/dev/null -m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -d stop
 assert "$SERVER 2>&1 --forbidden-ip 127.0.0.1/4a -m rc4-md5 -k 12345 -p 8388 -s 0.0.0.0 -d start | grep ERROR |  awk -F\"ERROR\" '{print \$2}'" ": Not a valid CIDR notation: 127.0.0.1/4a"
 $LOCAL 2>/dev/null 1>/dev/null -m rc4-md5 -k testrc4 -s 127.0.0.1 -p 8388 -d stop
 assert_end command
@@ -8,7 +8,7 @@ mkdir -p tmp
 $PYTHON shadowsocks/local.py -c tests/aes.json &
 LOCAL=$!
-$PYTHON shadowsocks/server.py -c tests/aes.json &
+$PYTHON shadowsocks/server.py -c tests/aes.json --forbidden-ip "" &
 SERVER=$!
 sleep 3
@@ -42,10 +42,12 @@ if __name__ == '__main__':
            if ip not in ips:
                ips[ip] = 1
                print(ip)
                sys.stdout.flush()
            else:
                ips[ip] += 1
            if ip not in banned and ips[ip] >= config.count:
                banned.add(ip)
                cmd = 'iptables -A INPUT -s %s -j DROP' % ip
                print(cmd, file=sys.stderr)
                sys.stderr.flush()
                os.system(cmd)
Author	SHA1	Message	Date
clowwindy	082c8a80f4	fix duplicated close in LRUCache close #324	2015-05-19 08:14:47 +08:00
clowwindy	893d21da76	Merge pull request #332 from sky-chen/master flush autoban output	2015-05-03 15:25:14 +08:00
sky	ea7a3e1b58	flush autoban output	2015-05-03 14:34:54 +08:00
clowwindy	e898f92191	Merge pull request #295 from jlund/no-rc4 Use AES in the Usage example instead of RC4.	2015-03-29 12:19:22 +08:00
clowwindy	5c0391d146	Merge pull request #312 from kimw/patch-1 remove duplicated line (refer line 221)	2015-03-14 13:38:19 +08:00
Kim Wong	e17279e5bf	remove duplicated line (refer line 221)	2015-03-14 07:35:43 +08:00
clowwindy	f17da943b3	Merge pull request #305 from lazybios/patch remove duplicate code from shell.py	2015-03-01 16:17:06 +08:00
lazybios	d3831bef8c	remove duplicate code from shell.py	2015-03-01 14:14:35 +08:00
Joshua Lund	b6e6e14b8a	Use AES in the Usage example instead of RC4.	2015-02-14 21:33:40 -07:00
clowwindy	4172639d48	Update README.md	2015-02-12 14:18:18 +08:00
clowwindy	e8488895f0	Merge pull request #291 from felixonmars/py3-remote-address convert remote_address to str so it will be printed more correctly on python 3	2015-02-11 15:53:24 +08:00
Felix Yan	edb7822a7b	convert remote_address to str so it will be printed more correctly on python 3	2015-02-11 10:40:20 +08:00
clowwindy	294556f8bc	bump 2.6.9	2015-02-10 18:26:06 +08:00
clowwindy	1b7ab23f78	release 2.6.8	2015-02-10 18:25:36 +08:00
clowwindy	0e14f3bbef	fix travis	2015-02-10 18:01:53 +08:00
clowwindy	42ce2569c4	also test with real website Now that localhost is used in tests, DNS code is uncovered. Use clients1.google.com/generate_204 to test if a real website works.	2015-02-10 17:43:06 +08:00
clowwindy	581d6e687f	use localhost in test.py Since now the unit tests is huge, using third party website is not polite. So use localhost instead.	2015-02-10 17:38:01 +08:00
clowwindy	d774286dc0	rename utils module into shell Since utils is ambiguous, we want to give the module a more clear role.	2015-02-10 17:26:10 +08:00
clowwindy	cb7062e1c1	implement utils.print_exception() Previously we used logging.error(e) and traceback.print_exc() to output error stack trace. The problem is, we want to output the stack trace only when verbose > 0. The if statement scattered around the code. So we replaced them with the new utils.print_exception() call.	2015-02-10 17:21:29 +08:00
clowwindy	48ddc1714b	move jenkins.sh	2015-02-10 17:02:31 +08:00
clowwindy	dfd81af844	support --version	2015-02-09 14:43:11 +08:00
clowwindy	783a6ef7f2	support multiple server ip on client side	2015-02-09 13:50:46 +08:00
clowwindy	e71ce6c758	fix server check	2015-02-03 18:45:36 +08:00
clowwindy	e564f17505	fix bytes in utils	2015-02-03 18:23:22 +08:00
clowwindy	6d09cd21ca	fix openssl	2015-02-03 18:13:01 +08:00
clowwindy	318d88ec89	use string more	2015-02-03 18:09:07 +08:00
clowwindy	ce805f0aea	license under Apache License v2.0	2015-02-03 14:10:36 +08:00
clowwindy	96a86c028d	update CHANGES	2015-02-02 17:29:57 +08:00
clowwindy	2c59ffb952	update rst	2015-02-02 16:42:37 +08:00
clowwindy	27a0c7754d	bump	2015-02-02 16:23:17 +08:00
clowwindy	0cd261dd10	catch KeyError	2015-02-02 16:22:56 +08:00
clowwindy	fbf15cb942	update command tests	2015-02-02 15:59:44 +08:00
clowwindy	1c81465436	fix command line	2015-02-02 15:57:44 +08:00
clowwindy	73f21ffbf6	do not check config for daemon stop	2015-02-02 15:50:41 +08:00
clowwindy	7aa37cad8e	check cipher before daemon start fix #280	2015-02-02 15:46:22 +08:00
clowwindy	ae99698b4e	implement --user fix @278	2015-02-02 15:38:55 +08:00
clowwindy	da65d0a2ee	update coverage_server	2015-02-01 17:15:10 +08:00
clowwindy	3b7755bd5e	fix a travis issue	2015-02-01 09:38:32 +08:00
clowwindy	5a7225c54b	fix a problem in test arguments	2015-02-01 09:27:18 +08:00
clowwindy	4aba904d6e	fix typo	2015-02-01 09:24:49 +08:00
clowwindy	b77f419336	test if localhost is in the default forbidden list	2015-02-01 09:23:45 +08:00
clowwindy	c39bbbe237	test invalid CIDR	2015-02-01 09:13:29 +08:00
clowwindy	453a9c61a6	show CIDR error more friendly	2015-02-01 09:09:35 +08:00
clowwindy	54181ef821	Merge pull request #279 from planetmeow/develop/CIDRForbidden Implement CIDR forbidden blacklist	2015-02-01 09:00:08 +08:00
Sunny	17624d0b99	Fix large file test since forbidden ip list is default to localhost Use an empty forbidden ip list to override default list should work.	2015-02-01 02:40:48 +08:00
Sunny	a0aa9173a8	Fix for Python3 map changed behavior In Python3, map returns an iterator instead of list in Python2, which cause map "lazier" than before, wrap with list() force it running.	2015-02-01 02:37:30 +08:00
Sunny	79b9b53dbe	Never process empty string and prevent infinite loop If user provide an empty string as network range, inet_pton will treate it as an IPv6 unspecified address, it seems a bug but I can't confirm. Then empty string will be converted to 0, 0 & 1 always be zero, so it caused dead loop.	2015-02-01 01:57:17 +08:00
Sunny	070108f78b	Disable forbidden ip feature for local shadowsocks Since forbidden ip is server-side only, disable it for local-side. This commit also supress warning about IPv6 loopback because I can confirm ::1/128 is the only loopback address, not like IPv4.	2015-02-01 01:34:23 +08:00
Sunny	b11d848986	Fix for Python3 lambda behavior change In Python3, lambda no longer support use tuple as syntax. So, ugly changes is inevitable.	2015-02-01 01:34:18 +08:00
Sunny	aa28796524	Make common fit PEP8	2015-02-01 01:34:13 +08:00
Sunny	8af359ae05	Use IPNetwork supporting forbidden ip feature in config utils This commit also make "forbidden_ip" field available in config file. If no forbidden ip specified in command line and config file, default to "127.0.0.0/8,::1".	2015-01-31 22:56:23 +08:00
Sunny	100ebcf064	Add IPNetwork class to support CIDR calculation Usage: Use IPNetwork(str\|list<str>) to create an IPNetwork object. Use operator 'in' to determine whether the specified IP address is in the IP network or not, like: >>> '192.168.1.1' in IPNetwork('192.168.1.0/24') True Both IPv4 and IPv6 address are supported. Note: When using string to initialize the IPNetwork, a comma seperated IP network list should be provided. Currently, IPNetwork just support standard CIDR like: x.x.x.x/y eg. 192.168.1.0/24 ::x/y eg. ::1/10 If pure IP address was provided, it will be treated as implicit IP network, like 192.168.0.0 will be treated as 192.168.0.0/16 and 192.168.1.1 will be treated as 192.168.1.1/32 This implicit translate may cause some unexpected behavior, like user provide 192.168.2.0 and expect it will be treated as 192.168.2.0/24 but actually it will be translated to 192.168.2.0/23 because there are 9 continuous 0 from right. In order to avoid confusion, a warning message will be displayed when pure IP address was provided. Other variants of CIDR are not supported yet.	2015-01-31 22:56:16 +08:00
Sunny	8783e0e9ae	Move is_ip from asyncdns to common Since implement CIDR forbidden need this function, move it to common file seems to be a better choice.	2015-01-31 22:56:09 +08:00
clowwindy	ada97ab6d9	improve comments	2015-01-31 02:58:40 +08:00
clowwindy	5316b3bf11	update .gitignore	2015-01-28 17:17:05 +08:00
clowwindy	4a2d98b280	update coverage url	2015-01-24 14:43:11 +08:00
clowwindy	51f47ccb91	update coverage url	2015-01-24 14:28:39 +08:00
clowwindy	70ebd2ef28	bump	2015-01-23 17:35:32 +08:00
clowwindy	1f8819f790	fix #270	2015-01-23 17:33:48 +08:00
clowwindy	0e6a4cd8ff	output python version in unit tests	2015-01-23 14:06:01 +08:00
clowwindy	f4052fbc84	fix MANIFEST.in	2015-01-21 14:32:55 +08:00
clowwindy	5e5d25efd9	Update CONTRIBUTING.md	2015-01-19 16:20:08 +08:00
clowwindy	2e9ce11ea1	bump	2015-01-18 18:32:04 +08:00
clowwindy	6efb3d00e4	fix #264	2015-01-16 18:52:40 +08:00
clowwindy	13413267dc	Update README.md	2015-01-16 17:06:48 +08:00
clowwindy	bd22e3ef75	try every dll that matches by name in PATH	2015-01-16 16:50:18 +08:00
clowwindy	5179e018e2	bump	2015-01-14 13:12:12 +08:00
clowwindy	af6c6f3f23	also search lib* for library names	2015-01-14 12:59:43 +08:00
clowwindy	5c05a74727	fix a potential name conflict	2015-01-13 00:42:27 +08:00
clowwindy	53a7e4d0e4	remove print	2015-01-12 23:21:16 +08:00
clowwindy	5e476843ec	fix python3	2015-01-12 23:19:24 +08:00