Migrated all sockets code to i2p.socket

Author: metamarcdw

.gitignore

@@ -1,5 +1,7 @@
 **pyc
 **dat
+**txt
+**bak
 **.DS_Store
 src/build
 src/dist

src/bitmessagemain.py

@@ -16,7 +16,6 @@
 # The next 3 are used for the API
 import singleton
 import os
-import socket
 import ctypes
 from struct import pack
 import sys
@@ -65,56 +64,6 @@ def connectToStream(streamNumber):
         a.setup(streamNumber, selfInitiatedConnections)
         a.start()
 
-def _fixWinsock():
-    if not ('win32' in sys.platform) and not ('win64' in sys.platform):
-        return
-
-    # Python 2 on Windows doesn't define a wrapper for
-    # socket.inet_ntop but we can make one ourselves using ctypes
-    if not hasattr(socket, 'inet_ntop'):
-        addressToString = ctypes.windll.ws2_32.WSAAddressToStringA
-        def inet_ntop(family, host):
-            if family == socket.AF_INET:
-                if len(host) != 4:
-                    raise ValueError("invalid IPv4 host")
-                host = pack("hH4s8s", socket.AF_INET, 0, host, "\0" * 8)
-            elif family == socket.AF_INET6:
-                if len(host) != 16:
-                    raise ValueError("invalid IPv6 host")
-                host = pack("hHL16sL", socket.AF_INET6, 0, 0, host, 0)
-            else:
-                raise ValueError("invalid address family")
-            buf = "\0" * 64
-            lengthBuf = pack("I", len(buf))
-            addressToString(host, len(host), None, buf, lengthBuf)
-            return buf[0:buf.index("\0")]
-        socket.inet_ntop = inet_ntop
-
-    # Same for inet_pton
-    if not hasattr(socket, 'inet_pton'):
-        stringToAddress = ctypes.windll.ws2_32.WSAStringToAddressA
-        def inet_pton(family, host):
-            buf = "\0" * 28
-            lengthBuf = pack("I", len(buf))
-            if stringToAddress(str(host),
-                               int(family),
-                               None,
-                               buf,
-                               lengthBuf) != 0:
-                raise socket.error("illegal IP address passed to inet_pton")
-            if family == socket.AF_INET:
-                return buf[4:8]
-            elif family == socket.AF_INET6:
-                return buf[8:24]
-            else:
-                raise ValueError("invalid address family")
-        socket.inet_pton = inet_pton
-
-    # These sockopts are needed on for IPv6 support
-    if not hasattr(socket, 'IPPROTO_IPV6'):
-        socket.IPPROTO_IPV6 = 41
-    if not hasattr(socket, 'IPV6_V6ONLY'):
-        socket.IPV6_V6ONLY = 27
 
 # This thread, of which there is only one, runs the API.
 class singleAPI(threading.Thread):
@@ -139,7 +88,6 @@ def run(self):
 
 class Main:
     def start(self, daemon=False):
-        _fixWinsock()
 
         shared.daemon = daemon
         # is the application already running?  If yes then exit.

src/class_outgoingSynSender.py

@@ -3,7 +3,7 @@
 import random
 import shared
 import socks
-import socket
+from i2p import socket
 import sys
 import tr
 
@@ -31,7 +31,12 @@ def _getPeer(self):
             peer = shared.trustedPeer
             shared.knownNodes[self.streamNumber][peer] = time.time()
         else:
-            peer, = random.sample(shared.knownNodes[self.streamNumber], 1)
+            try:
+                peer, = random.sample(shared.knownNodes[self.streamNumber], 1)
+            except ValueError:
+                with shared.printLock:
+                    print "knownNodes is empty. Cannot _getPeer"
+                    return None
         shared.knownNodesLock.release()
 
         return peer
@@ -47,8 +52,10 @@ def run(self):
                 break
             random.seed()
             peer = self._getPeer()
+            if not peer:
+                break
             shared.alreadyAttemptedConnectionsListLock.acquire()
-            while peer in shared.alreadyAttemptedConnectionsList or peer.host in shared.connectedHostsList:
+            while peer in shared.alreadyAttemptedConnectionsList or peer.dest in shared.connectedHostsList:
                 shared.alreadyAttemptedConnectionsListLock.release()
                 # print 'choosing new sample'
                 random.seed()
@@ -64,12 +71,9 @@ def run(self):
                 shared.alreadyAttemptedConnectionsListLock.acquire()
             shared.alreadyAttemptedConnectionsList[peer] = 0
             shared.alreadyAttemptedConnectionsListLock.release()
-            if peer.host.find(':') == -1:
-                address_family = socket.AF_INET
-            else:
-                address_family = socket.AF_INET6
+
             try:
-                sock = socks.socksocket(address_family, socket.SOCK_STREAM)
+                sock = socks.socksocket(shared.i2psession, socket.SOCK_STREAM)
             except:
                 """
                 The line can fail on Windows systems which aren't
@@ -91,65 +95,20 @@ def run(self):
                 continue
             # This option apparently avoids the TIME_WAIT state so that we
             # can rebind faster
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            # sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             sock.settimeout(20)
             if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and shared.verbose >= 2:
                 with shared.printLock:
                     print 'Trying an outgoing connection to', peer
 
-                # sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS4a':
-                if shared.verbose >= 2:
-                    with shared.printLock:
-                        print '(Using SOCKS4a) Trying an outgoing connection to', peer
-
-                proxytype = socks.PROXY_TYPE_SOCKS4
-                sockshostname = shared.config.get(
-                    'bitmessagesettings', 'sockshostname')
-                socksport = shared.config.getint(
-                    'bitmessagesettings', 'socksport')
-                rdns = True  # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway.
-                if shared.config.getboolean('bitmessagesettings', 'socksauthentication'):
-                    socksusername = shared.config.get(
-                        'bitmessagesettings', 'socksusername')
-                    sockspassword = shared.config.get(
-                        'bitmessagesettings', 'sockspassword')
-                    sock.setproxy(
-                        proxytype, sockshostname, socksport, rdns, socksusername, sockspassword)
-                else:
-                    sock.setproxy(
-                        proxytype, sockshostname, socksport, rdns)
-            elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS5':
-                if shared.verbose >= 2:
-                    with shared.printLock:
-                        print '(Using SOCKS5) Trying an outgoing connection to', peer
-
-                proxytype = socks.PROXY_TYPE_SOCKS5
-                sockshostname = shared.config.get(
-                    'bitmessagesettings', 'sockshostname')
-                socksport = shared.config.getint(
-                    'bitmessagesettings', 'socksport')
-                rdns = True  # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway.
-                if shared.config.getboolean('bitmessagesettings', 'socksauthentication'):
-                    socksusername = shared.config.get(
-                        'bitmessagesettings', 'socksusername')
-                    sockspassword = shared.config.get(
-                        'bitmessagesettings', 'sockspassword')
-                    sock.setproxy(
-                        proxytype, sockshostname, socksport, rdns, socksusername, sockspassword)
-                else:
-                    sock.setproxy(
-                        proxytype, sockshostname, socksport, rdns)
-
             try:
-                sock.connect((peer.host, peer.port))
+                sock.connect(peer.dest)
                 rd = receiveDataThread()
                 rd.daemon = True  # close the main program even if there are threads left
                 someObjectsOfWhichThisRemoteNodeIsAlreadyAware = {} # This is not necessairly a complete list; we clear it from time to time to save memory.
                 sendDataThreadQueue = Queue.Queue() # Used to submit information to the send data thread for this connection. 
                 rd.setup(sock, 
-                         peer.host, 
-                         peer.port, 
+                         peer.dest, 
                          self.streamNumber,
                          someObjectsOfWhichThisRemoteNodeIsAlreadyAware, 
                          self.selfInitiatedConnections, 
@@ -160,7 +119,7 @@ def run(self):
 
 
                 sd = sendDataThread(sendDataThreadQueue)
-                sd.setup(sock, peer.host, peer.port, self.streamNumber,
+                sd.setup(sock, peer.dest, self.streamNumber,
                          someObjectsOfWhichThisRemoteNodeIsAlreadyAware)
                 sd.start()
                 sd.sendVersionMessage()
@@ -189,22 +148,10 @@ def run(self):
                     with shared.printLock:
                         print 'deleting', peer, 'from shared.knownNodes because it is more than 48 hours old and we could not connect to it.'
 
-            except socks.Socks5AuthError as err:
-                shared.UISignalQueue.put((
-                    'updateStatusBar', tr.translateText(
-                    "MainWindow", "SOCKS5 Authentication problem: %1").arg(str(err))))
-            except socks.Socks5Error as err:
-                pass
-                print 'SOCKS5 error. (It is possible that the server wants authentication).)', str(err)
-            except socks.Socks4Error as err:
-                print 'Socks4Error:', err
-            except socket.error as err:
-                if shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS':
-                    print 'Bitmessage MIGHT be having trouble connecting to the SOCKS server. ' + str(err)
-                else:
-                    if shared.verbose >= 1:
-                        with shared.printLock:
-                            print 'Could NOT connect to', peer, 'during outgoing attempt.', err
+            except socket.Error as err:
+                if shared.verbose >= 1:
+                    with shared.printLock:
+                        print 'Could NOT connect to', peer, 'during outgoing attempt.', err
 
                 deletedPeer = None
                 with shared.knownNodesLock:
@@ -231,3 +178,4 @@ def run(self):
                 import traceback
                 traceback.print_exc()
             time.sleep(0.1)
+