|
@ -28,9 +28,8 @@ if sys.version_info < (2, 6): |
|
|
else: |
|
|
else: |
|
|
import json |
|
|
import json |
|
|
|
|
|
|
|
|
# do this before monkey patch |
|
|
|
|
|
import udprelay |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# TODO remove gevent |
|
|
try: |
|
|
try: |
|
|
import gevent |
|
|
import gevent |
|
|
import gevent.monkey |
|
|
import gevent.monkey |
|
@ -39,6 +38,7 @@ except ImportError: |
|
|
gevent = None |
|
|
gevent = None |
|
|
print >>sys.stderr, 'warning: gevent not found, using threading instead' |
|
|
print >>sys.stderr, 'warning: gevent not found, using threading instead' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import socket |
|
|
import socket |
|
|
import select |
|
|
import select |
|
|
import threading |
|
|
import threading |
|
@ -48,6 +48,7 @@ import logging |
|
|
import getopt |
|
|
import getopt |
|
|
import encrypt |
|
|
import encrypt |
|
|
import utils |
|
|
import utils |
|
|
|
|
|
import udprelay |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def send_all(sock, data): |
|
|
def send_all(sock, data): |
|
|