Merge pull request #154 from kpdyer/dev

merge to master for 0.2.16

.travis.yml

@@ -0,0 +1,16 @@
+language:
+  - python
+  - cpp
+compiler:
+  - gcc
+  - clang
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y libgmp-dev
+python:
+  - "2.6"
+  - "2.7"
+install:
+  - "pip install -r requirements.txt"
+script: 
+  - "python setup.py test"

README.md

@@ -1,6 +1,8 @@
 fteproxy
 ========
 
+[![Build Status](https://travis-ci.org/kpdyer/fteproxy.svg?branch=master)](https://travis-ci.org/kpdyer/fteproxy)
+
 * homepage: https://fteproxy.org
 * source code: https://github.com/kpdyer/fteproxy
 * publication: https://kpdyer.com/publications/ccs2013-fte.pdf
@@ -15,6 +17,17 @@ fteproxy is powered by Format-Transforming Encryption [1] and was presented at C
 
 [1] [Protocol Misidentification Made Easy with Format-Transforming Encryption](https://kpdyer.com/publications/ccs2013-fte.pdf), Kevin P. Dyer, Scott E. Coull, Thomas Ristenpart and Thomas Shrimpton
 
+Quick Start
+-----------
+
+On Linux/OSX, use pip to install fteproxy.
+
+```console
+pip install fteproxy
+```
+
+On Windows, download pre-compiled binaries, located at: https://fteproxy.org/download
+
 Dependencies
 --------
 
@@ -43,7 +56,6 @@ Documentation
 
 See: https://fteproxy.org/documentation
 
-
 Author
 ------
 

fteproxy/VERSION

@@ -1 +1 @@
-0.2.16-beta
+0.2.16

fteproxy/network_io.py

@@ -55,7 +55,6 @@ def close_socket(sock, lock=None):
     """
 
     try:
-        fte.warn('Closing socket: '+sock)
         if lock is not None:
             with lock:
                 sock.close()

fteproxy/relay.py

@@ -85,7 +85,6 @@ def __init__(self, local_ip, local_port,
                  remote_ip, remote_port):
         threading.Thread.__init__(self)
 
-        self._workers = []
         self._running = False
         self._local_ip = local_ip
         self._local_port = local_port
@@ -130,8 +129,6 @@ def run(self):
                 w2 = worker(new_stream, conn)
                 w1.start()
                 w2.start()
-                self._workers.append(w1)
-                self._workers.append(w2)
             except socket.timeout:
                 continue
             except socket.error as e:
@@ -141,9 +138,6 @@ def run(self):
                 fteproxy.warn('exception in fteproxy.listener: ' + str(e))
                 break
 
-        for w in self._workers:
-            w.stop()
-
     def stop(self):
         """Terminate the thread and stop listening on ``local_ip:local_port``.
         """

fteproxy/tests/test_record_layer.py

@@ -30,7 +30,7 @@
 class Tests(unittest.TestCase):
 
     @classmethod
-    def setUpClass(self):
+    def setUp(self):
         fteproxy.conf.setValue('runtime.mode', 'client')
         self.record_layers_info = []
         self.record_layers_outgoing = []

requirements.txt

@@ -0,0 +1,6 @@
+fte
+pyptlib
+obfsproxy
+twisted
+txsocksx
+parsley

setup_tbb.py

@@ -15,8 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with fteproxy.  If not, see <http://www.gnu.org/licenses/>.
 
-from distutils.core import setup
-from distutils.core import Extension
+from setuptools import setup
+from setuptools import Extension
 
 import glob
 import sys
@@ -40,4 +40,5 @@
       author_email='[email protected]',
       url='https://github.com/kpdyer/fteproxy',
       packages=['fteproxy', 'fteproxy.defs', 'fteproxy.tests'],
+      install_requires=['txsocksx', 'parsley', 'pyptlib', 'obfsproxy', 'twisted', 'fte']
       )