From d56ba5814964ba5b394e879bebdbb844505c0f03 Mon Sep 17 00:00:00 2001
From: Dimitur Kirov <dkirov@gmail.com>
Date: Thu, 4 Aug 2005 08:59:03 +0000
Subject: [PATCH] added debug messages

---
 src/common/connection.py | 6 ++++++
 src/common/socks5.py     | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/common/connection.py b/src/common/connection.py
index 8cb229335..b34945bc8 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -462,20 +462,24 @@ class Connection:
 		gajim.log.debug('_siResultCB')
 		id = iq_obj.getAttr('id')
 		if not self.files_props.has_key(id):
+			gajim.log.debug('files_props - no key' + str(id))
 			return 
 		file_props = self.files_props[id]
 		if file_props is None:
+			gajim.log.debug('files_props none')
 			return
 		file_props['receiver'] = str(iq_obj.getFrom())
 		jid = iq_obj.getFrom().getStripped().encode('utf8')
 		si = iq_obj.getTag('si')
 		feature = si.setTag('feature')
 		if feature.getNamespace() != common.xmpp.NS_FEATURE:
+			gajim.log.debug('wrong ns' + str(feature.getNamespace()))
 			return
 		form_tag = feature.getTag('x')
 		form = common.xmpp.DataForm(node=form_tag)
 		field = form.getField('stream-method')
 		if field.getValue() != common.xmpp.NS_BYTESTREAM:
+			gajim.log.debug('wrong field stream' + str(field.getValue()))
 			return
 		self.send_socks5_info(file_props)
 		raise common.xmpp.NodeProcessed
@@ -492,6 +496,7 @@ class Connection:
 		return
 	
 	def send_socks5_info(self, file_props):
+		gajim.log.debug('send_socks5_info' + str(file_props))
 		if type(self.peerhost) != tuple:
 			return
 		port = gajim.config.get('file_transfers_port')
@@ -501,6 +506,7 @@ class Connection:
 		listener = gajim.socks5queue.start_listener(self.peerhost[0], port, 
 			sha_str, self.result_socks5_sid, file_props['sid'])
 		if listener == None:
+			gajim.log.debug(_('UNABLE TO SET LISTENER ON %s %s') % (self.peerhost[0], port))
 			# FIXME - raise error dialog that address is in use
 			return
 		iq = common.xmpp.Protocol(name = 'iq', to = str(file_props['receiver']), 
diff --git a/src/common/socks5.py b/src/common/socks5.py
index 167d0e8ae..0d3d0927f 100644
--- a/src/common/socks5.py
+++ b/src/common/socks5.py
@@ -51,8 +51,10 @@ class SocksQueue:
 			self.listener = Socks5Listener(host, port)
 			self.listener.bind()
 			if self.listener.started is False:
+				print 'LISTENER IS NOT STARTED'
 				return None
 			self.connected += 1
+			print 'LISTENER STARTED'
 		return self.listener
 	
 	def result_sha(self, sha_str, idx):
@@ -463,14 +465,16 @@ class Socks5Listener:
 			self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
 			self._serv.bind(('0.0.0.0', self.port))
 			self._serv.listen(socket.SOMAXCONN)
+			self._serv.setblocking(False)
 		except Exception, (errno, errstr):
+			print 'EXCEPTION BINDING', (errno, errstr)
 			return None
-		self._serv.setblocking(False)
 		self.started = True
 	
 	def accept_conn(self):
-		self._serv.accept.__doc__
+		print 'ACCEPTED CONNECTION', 
 		_sock  = self._serv.accept()
+		print _sock
 		_sock[0].setblocking(False)
 		return _sock