fuzzgun appIndicator and also additional createAddresses through API functionality #137

Merged
Atheros1 merged 14 commits from master into master 2013-05-08 22:44:39 +02:00
Showing only changes of commit 3ab48c2fe3 - Show all commits

View File

@ -210,20 +210,20 @@ class singleListener(threading.Thread):
print 'incoming connection is from a host in shared.connectedHostsList (we are already connected to it). Ignoring it.' print 'incoming connection is from a host in shared.connectedHostsList (we are already connected to it). Ignoring it.'
a.close() a.close()
a,(HOST,PORT) = sock.accept()""" a,(HOST,PORT) = sock.accept()"""
rd = receiveDataThread()
rd.daemon = True # close the main program even if there are threads left
#self.emit(SIGNAL("passObjectThrough(PyQt_PyObject)"),rd)
objectsOfWhichThisRemoteNodeIsAlreadyAware = {} objectsOfWhichThisRemoteNodeIsAlreadyAware = {}
rd.setup(a,HOST,PORT,-1,objectsOfWhichThisRemoteNodeIsAlreadyAware)
shared.printLock.acquire()
print self, 'connected to', HOST,'during INCOMING request.'
shared.printLock.release()
rd.start()
sd = sendDataThread() sd = sendDataThread()
sd.setup(a,HOST,PORT,-1,objectsOfWhichThisRemoteNodeIsAlreadyAware) sd.setup(a,HOST,PORT,-1,objectsOfWhichThisRemoteNodeIsAlreadyAware)
sd.start() sd.start()
rd = receiveDataThread()
rd.daemon = True # close the main program even if there are threads left
rd.setup(a,HOST,PORT,-1,objectsOfWhichThisRemoteNodeIsAlreadyAware)
rd.start()
shared.printLock.acquire()
print self, 'connected to', HOST,'during INCOMING request.'
shared.printLock.release()
#This thread is created either by the synSenderThread(for outgoing connections) or the singleListenerThread(for incoming connectiosn). #This thread is created either by the synSenderThread(for outgoing connections) or the singleListenerThread(for incoming connectiosn).
class receiveDataThread(threading.Thread): class receiveDataThread(threading.Thread):