Commits August 2011

commits@gajim.org

3 participants
99 discussions

gajim: add test for connection
by Jefry Lagrange 15 Aug '11

15 Aug '11

changeset 85fc19efaa78 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=85fc19efaa78 description: add test for connection diffstat: test/unit/test_socks5.py | 55 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-) diffs (103 lines): diff -r 502cb90088fb -r 85fc19efaa78 test/unit/test_socks5.py --- a/test/unit/test_socks5.py Mon Aug 15 00:05:10 2011 -0400 +++ b/test/unit/test_socks5.py Mon Aug 15 12:16:17 2011 -0400 @@ -8,8 +8,10 @@ from mock import Mock import sys +import socket from common.socks5 import * +from common import jingle_xtls class fake_sock(Mock): def __init__(self, sockobj): @@ -20,7 +22,7 @@ def setup_stream(self): sha1 = self.sockobj._get_sha1_auth() - + self.incoming = [] self.incoming.append(self.sockobj._get_auth_response()) self.incoming.append( @@ -71,8 +73,11 @@ 'port': 1, 'initiator' : None, 'target' : None} + queue = Mock() + queue.file_props = {} #self.sockobj = Socks5Receiver(fake_idlequeue(), streamhost, None) - self.sockobj = Socks5Sender(fake_idlequeue(), None, None, Mock() ) + self.sockobj = Socks5Sender(fake_idlequeue(), None, 'server', Mock() , + None, None, True, file_props={}) sock = fake_sock(self.sockobj) self.sockobj._sock = sock self.sockobj._recv = sock._recv @@ -87,6 +92,7 @@ # Something that the sender needs self.sockobj.file_props = {} self.sockobj.file_props['type'] = 'r' + self.sockobj.file_props['paused'] = '' self.sockobj.queue = Mock() self.sockobj.queue.process_result = self._pollend @@ -100,6 +106,49 @@ assert(sock.incoming == []) assert(sock.outgoing == []) + def test_connection_server(self): + return + mocksock = self.sockobj._sock + mocksock.setup_stream() + #self.sockobj._sock.switch_stream() + s = socket.socket(2, 1, 6) + server = ('127.0.0.1', 28000) + + s.connect(server) + + s.send(mocksock.outgoing.pop(0)) + self.assertEquals(s.recv(64), mocksock.incoming.pop(0)) + + s.send(mocksock.outgoing.pop(0)) + self.assertEquals(s.recv(64), mocksock.incoming.pop(0)) + + def test_connection_client(self): + + + mocksock = self.sockobj._sock + mocksock.setup_stream() + mocksock.switch_stream() + s = socket.socket(10, 1, 6) + + + s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) + s.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) + + netadd = ('::', 28000, 0, 0) + s.bind(netadd) + s.listen(socket.SOMAXCONN) + (s, address) = s.accept() + + + self.assertEquals(s.recv(64), mocksock.incoming.pop(0)) + s.send(mocksock.outgoing.pop(0)) + + buff = s.recv(64) + inco = mocksock.incoming.pop(0) + #self.assertEquals(s.recv(64), mocksock.incoming.pop(0)) + s.send(mocksock.outgoing.pop(0)) + def test_client_negoc(self): return self.sockobj._sock.setup_stream() @@ -111,7 +160,7 @@ self._check_inout() def test_server_negoc(self): - + return self.sockobj._sock.setup_stream() self.sockobj._sock.switch_stream() try:

1 0

gajim: Wait until candidate negociation ends; Socks5 connection ...
by Jefry Lagrange 15 Aug '11

15 Aug '11

changeset ae34122435e2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ae34122435e2 description: Wait until candidate negociation ends; Socks5 connection problem fixed diffstat: src/common/jingle_ft.py | 158 +++++++++++++++++++++++++++++++++++++---------- src/common/socks5.py | 141 +++++++++++++++++++++++++++-------------- 2 files changed, 217 insertions(+), 82 deletions(-) diffs (truncated from 571 to 300 lines): diff -r 4655081ec8d0 -r ae34122435e2 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sun Aug 14 23:49:23 2011 -0400 +++ b/src/common/jingle_ft.py Sun Aug 14 23:59:39 2011 -0400 @@ -35,7 +35,17 @@ STATE_ACCEPTED = 2 STATE_TRANSPORT_INFO = 3 STATE_PROXY_ACTIVATED = 4 -STATE_TRANSPORT_REPLACE = 5 +# We send the candidates and we are waiting for a reply +STATE_CAND_SENT_PENDING_REPLY = 5 +# We received the candidates and we are waiting to reply +STATE_CAND_RECEIVED_PENDING_REPLY = 6 +# We have sent and received the candidates +# This also includes any candidate-error received or sent +STATE_CAND_SENT_AND_RECEIVED = 7 +# We are transfering the file +STATE_TRANSFERING = 8 +STATE_TRANSPORT_REPLACE = 9 + class JingleFileTransfer(JingleContent): def __init__(self, session, transport=None, file_props=None, @@ -88,7 +98,7 @@ self.session = session self.media = 'file' - + self.nominated_cand = {} def __on_session_initiate(self, stanza, content, error, action): gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, @@ -152,10 +162,20 @@ def __on_transport_info(self, stanza, content, error, action): log.info("__on_transport_info") - if not self.weinitiate: # proxy activated from initiator - return + #if not self.weinitiate: # proxy activated from initiator + # return if content.getTag('transport').getTag('candidate-error'): - self.session.transport_replace() + self.nominated_cand['peer-cand'] = False + if self.state == STATE_CAND_SENT_PENDING_REPLY: + #self.state = STATE_CAND_SENT_AND_RECEIVED + if not self.nominated_cand['our-cand'] and \ + not self.nominated_cand['peer-cand']: + if not self.weinitiate: + return + self.session.transport_replace() + else: + self.state = STATE_CAND_RECEIVED_PENDING_REPLY + return streamhost_cid = content.getTag('transport').getTag('candidate-used').\ getAttr('cid') @@ -167,29 +187,17 @@ if streamhost_used == None: log.info("unknow streamhost") return - if streamhost_used['type'] == 'proxy': - self.file_props['streamhost-used'] = True - for proxy in self.file_props['proxyhosts']: - if proxy['host'] == streamhost_used['host'] and \ - proxy['port'] == streamhost_used['port'] and \ - proxy['jid'] == streamhost_used['jid']: - host_used = proxy - break - if 'streamhosts' not in self.file_props: - self.file_props['streamhosts'] = [] - self.file_props['streamhosts'].append(streamhost_used) - self.file_props['is_a_proxy'] = True - receiver = Socks5Receiver(gajim.idlequeue, streamhost_used, - self.file_props['sid'], self.file_props) - gajim.socks5queue.add_receiver(self.session.connection.name, - receiver) - streamhost_used['idx'] = receiver.queue_idx - gajim.socks5queue.on_success[self.file_props['sid']] = \ - self.transport._on_proxy_auth_ok + # We save the candidate nominated by peer + self.nominated_cand['peer-cand'] = streamhost_used + if self.state == STATE_CAND_SENT_PENDING_REPLY: + response = stanza.buildReply('result') + self.session.connection.connection.send(response) + self.start_transfer(streamhost_used) + raise xmpp.NodeProcessed else: - jid = gajim.get_jid_without_resource(self.session.ourjid) - gajim.socks5queue.send_file(self.file_props, - self.session.connection.name) + self.state = STATE_CAND_RECEIVED_PENDING_REPLY + + def __on_iq_result(self, stanza, content, error, action): log.info("__on_iq_result") @@ -221,6 +229,16 @@ elif self.weinitiate and self.state == STATE_INITIALIZED: # proxy activated self.state = STATE_PROXY_ACTIVATED + elif self.state == STATE_CAND_SENT_AND_RECEIVED: + + if not self.nominated_cand['our-cand'] and \ + not self.nominated_cand['peer-cand']: + if not self.weinitiate: + return + self.session.transport_replace() + return + # initiate transfer + self.start_transfer(None) def send_candidate_used(self, streamhost): """ @@ -229,7 +247,13 @@ log.info('send_candidate_used') if streamhost is None: return - + + self.nominated_cand['our-cand'] = streamhost + if self.state == STATE_CAND_RECEIVED_PENDING_REPLY: + self.state = STATE_CAND_SENT_AND_RECEIVED + else: + self.state = STATE_CAND_SENT_PENDING_REPLY + content = xmpp.Node('content') content.setAttr('creator', 'initiator') content.setAttr('name', self.name) @@ -246,9 +270,16 @@ self.session.send_transport_info(content) + def _on_connect_error(self, to, _id, sid, code=404): - if code == 404 and self.file_props['sid'] == sid: - self.send_error_candidate() + self.nominated_cand['our-cand'] = False + self.send_error_candidate() + + if self.state == STATE_CAND_RECEIVED_PENDING_REPLY: + self.state = STATE_CAND_SENT_AND_RECEIVED + else: + self.state = STATE_CAND_SENT_PENDING_REPLY + log.info('connect error, sid=' + sid) @@ -297,20 +328,81 @@ fingerprint = None if self.use_security: fingerprint = 'server' - return + if self.weinitiate: listener = gajim.socks5queue.start_listener(port, sha_str, - self._store_socks5_sid, self.file_props['sid'], + self._store_socks5_sid, self.file_props, fingerprint=fingerprint, type='sender') else: listener = gajim.socks5queue.start_listener(port, sha_str, - self._store_socks5_sid, self.file_props['sid'], + self._store_socks5_sid, self.file_props, fingerprint=fingerprint, type='receiver') if not listener: # send error message, notify the user return + def isOurCandUsed(self): + if self.nominated_cand['peer-cand'] == False: + return True + if self.nominated_cand['our-cand'] == False: + return False + + peer_pr = int(self.nominated_cand['peer-cand']['priority']) + our_pr = int(self.nominated_cand['our-cand']['priority']) + + if peer_pr != our_pr: + if peer_pr > our_pr: + # Choose peer host + return False + else: + # Choose our host + return True + else: + if self.weinitiate: + # Choose our host + return True + else: + # Choose peer host + return False + + + + def start_transfer(self, streamhost_used): + + self.state = STATE_TRANSFERING + + if self.isOurCandUsed(): + print 'our' + else: + print 'peer' + + + # FIXME if streamhost_used is none where do we get the proxy host + if streamhost_used and streamhost_used['type'] == 'proxy': + self.file_props['streamhost-used'] = True + for proxy in self.file_props['proxyhosts']: + if proxy['host'] == streamhost_used['host'] and \ + proxy['port'] == streamhost_used['port'] and \ + proxy['jid'] == streamhost_used['jid']: + host_used = proxy + break + if 'streamhosts' not in self.file_props: + self.file_props['streamhosts'] = [] + self.file_props['streamhosts'].append(streamhost_used) + self.file_props['is_a_proxy'] = True + receiver = Socks5Receiver(gajim.idlequeue, streamhost_used, + self.file_props['sid'], self.file_props) + gajim.socks5queue.add_receiver(self.session.connection.name, + receiver) + streamhost_used['idx'] = receiver.queue_idx + gajim.socks5queue.on_success[self.file_props['sid']] = \ + self.transport._on_proxy_auth_ok + else: + jid = gajim.get_jid_without_resource(self.session.ourjid) + gajim.socks5queue.send_file(self.file_props, + self.session.connection.name) + def get_content(desc): return JingleFileTransfer diff -r 4655081ec8d0 -r ae34122435e2 src/common/socks5.py --- a/src/common/socks5.py Sun Aug 14 23:49:23 2011 -0400 +++ b/src/common/socks5.py Sun Aug 14 23:59:39 2011 -0400 @@ -84,16 +84,18 @@ self.on_success = {} # {id: cb} self.on_failure = {} # {id: cb} - def start_listener(self, port, sha_str, sha_handler, sid, fingerprint=None, + def start_listener(self, port, sha_str, sha_handler, fp, fingerprint=None, type='sender'): """ Start waiting for incomming connections on (host, port) and do a socks5 authentication using sid for generated SHA """ + sid = fp['sid'] self.type = type # It says whether we are sending or receiving self.sha_handlers[sha_str] = (sha_handler, sid) if self.listener is None: - self.listener = Socks5Listener(self.idlequeue, port, fingerprint=fingerprint) + self.listener = Socks5Listener(self.idlequeue, port, fp, + fingerprint=fingerprint) self.listener.queue = self self.listener.bind() if self.listener.started is False: @@ -130,7 +132,7 @@ self.on_failure[sid] = on_failure file_props = self.files_props[account][sid] file_props['failure_cb'] = on_failure - + # add streamhosts to the queue for streamhost in file_props['streamhosts']: if 'type' in streamhost and streamhost['type'] == 'proxy': @@ -149,8 +151,8 @@ file_props['sha_str'], self, mode='client' , _sock=None, host=str(streamhost['host']), port=int(streamhost['port']), fingerprint=fp, - connected=False) - socks5obj.file_props = file_props + connected=False, file_props=file_props) + #socks5obj.file_props = file_props socks5obj.streamhost = streamhost self.add_sockobj(account, socks5obj, type='sender') @@ -234,7 +236,7 @@ return # failure_cb exists - this means that it has never been called if 'failure_cb' in file_props and file_props['failure_cb']: - file_props['failure_cb'](streamhost['initiator'], streamhost['idx'], + file_props['failure_cb'](streamhost['initiator'], None, file_props['sid'], code = 404) del(file_props['failure_cb']) @@ -258,14 +260,6 @@ return 1 return None - def get_file_from_sender(self, file_props, account): - if file_props is None: - return - if 'hash' in file_props and file_props['hash'] in self.senders: - sender = self.senders[file_props['hash']] - sender.account = account - result = self.get_file_contents(0) - self.process_result(result, sender) def result_sha(self, sha_str, idx): if sha_str in self.sha_handlers: @@ -313,7 +307,9 @@

1 0

gajim: merged
by Jefry Lagrange 15 Aug '11

15 Aug '11

changeset 502cb90088fb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=502cb90088fb description: merged

1 0

gajim: get priority from candidate stanza
by Jefry Lagrange 15 Aug '11

15 Aug '11

changeset 4655081ec8d0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4655081ec8d0 description: get priority from candidate stanza diffstat: src/common/jingle_transport.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 747515a04fb8 -r 4655081ec8d0 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Mon Aug 08 19:43:07 2011 -0400 +++ b/src/common/jingle_transport.py Sun Aug 14 23:49:23 2011 -0400 @@ -141,7 +141,8 @@ 'host': candidate['host'], 'port': candidate['port'], 'cid': candidate['cid'], - 'type': typ + 'type': typ, + 'priority': candidate['priority'] } candidates.append(cand)

1 0

gajim: bidirectional jingle FT with socks5
by Jefry Lagrange 15 Aug '11

15 Aug '11

changeset 747515a04fb8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=747515a04fb8 description: bidirectional jingle FT with socks5 diffstat: src/common/jingle_ft.py | 57 ++- src/common/socks5.py | 796 +++++++++++++++++++++++++++-------------------- 2 files changed, 490 insertions(+), 363 deletions(-) diffs (truncated from 1041 to 300 lines): diff -r 5ab4d5d22ccc -r 747515a04fb8 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Aug 01 23:13:56 2011 -0400 +++ b/src/common/jingle_ft.py Mon Aug 08 19:43:07 2011 -0400 @@ -51,6 +51,7 @@ self.callbacks['session-terminate'] += [self.__on_session_terminate] self.callbacks['transport-accept'] += [self.__on_transport_accept] self.callbacks['transport-replace'] += [self.__on_transport_replace] + self.callbacks['session-accept-sent'] += [self._listen_host] # fallback transport method self.callbacks['transport-reject'] += [self.__on_transport_reject] self.callbacks['transport-info'] += [self.__on_transport_info] @@ -117,7 +118,8 @@ for host in self.file_props['streamhosts']: host['initiator'] = self.session.initiator host['target'] = self.session.responder - + host['sid'] = self.file_props['sid'] + response = stanza.buildReply('result') con.connection.send(response) @@ -130,7 +132,8 @@ fingerprint = 'client' gajim.socks5queue.connect_to_hosts(self.session.connection.name, self.file_props['sid'], self.send_candidate_used, - self._on_connect_error, fingerprint=fingerprint) + self._on_connect_error, fingerprint=fingerprint, + receiving=False) raise xmpp.NodeProcessed @@ -195,25 +198,8 @@ self.state = STATE_INITIALIZED self.session.connection.files_props[self.file_props['sid']] = \ self.file_props - receiver = self.file_props['receiver'] - sender = self.file_props['sender'] - - sha_str = helpers.get_auth_sha(self.file_props['sid'], sender, - receiver) - self.file_props['sha_str'] = sha_str - - port = gajim.config.get('file_transfers_port') - - fingerprint = None - if self.use_security: - fingerprint = 'server' - listener = gajim.socks5queue.start_listener(port, sha_str, - self._store_socks5_sid, self.file_props['sid'], - fingerprint=fingerprint) - - if not listener: - return - # send error message, notify the user + # Listen on configured port for file transfer + self._listen_host() elif not self.weinitiate and self.state == STATE_NOT_STARTED: # session-accept iq-result if not self.negotiated: @@ -295,7 +281,36 @@ def _store_socks5_sid(self, sid, hash_id): # callback from socsk5queue.start_listener self.file_props['hash'] = hash_id + + def _listen_host(self, stanza=None, content=None, error=None + , action=None): + + receiver = self.file_props['receiver'] + sender = self.file_props['sender'] + sha_str = helpers.get_auth_sha(self.file_props['sid'], sender, + receiver) + self.file_props['sha_str'] = sha_str + + port = gajim.config.get('file_transfers_port') + + fingerprint = None + if self.use_security: + fingerprint = 'server' + return + if self.weinitiate: + listener = gajim.socks5queue.start_listener(port, sha_str, + self._store_socks5_sid, self.file_props['sid'], + fingerprint=fingerprint, type='sender') + else: + listener = gajim.socks5queue.start_listener(port, sha_str, + self._store_socks5_sid, self.file_props['sid'], + fingerprint=fingerprint, type='receiver') + + if not listener: + # send error message, notify the user + return + def get_content(desc): return JingleFileTransfer diff -r 5ab4d5d22ccc -r 747515a04fb8 src/common/socks5.py --- a/src/common/socks5.py Mon Aug 01 23:13:56 2011 -0400 +++ b/src/common/socks5.py Mon Aug 08 19:43:07 2011 -0400 @@ -84,11 +84,13 @@ self.on_success = {} # {id: cb} self.on_failure = {} # {id: cb} - def start_listener(self, port, sha_str, sha_handler, sid, fingerprint=None): + def start_listener(self, port, sha_str, sha_handler, sid, fingerprint=None, + type='sender'): """ Start waiting for incomming connections on (host, port) and do a socks5 authentication using sid for generated SHA """ + self.type = type # It says whether we are sending or receiving self.sha_handlers[sha_str] = (sha_handler, sid) if self.listener is None: self.listener = Socks5Listener(self.idlequeue, port, fingerprint=fingerprint) @@ -123,7 +125,7 @@ return 0 def connect_to_hosts(self, account, sid, on_success=None, on_failure=None, - fingerprint=None): + fingerprint=None, receiving=True): self.on_success[sid] = on_success self.on_failure[sid] = on_failure file_props = self.files_props[account][sid] @@ -135,38 +137,59 @@ fp = None else: fp = fingerprint - receiver = Socks5Receiver(self.idlequeue, streamhost, sid, - file_props, fingerprint=fp) - self.add_receiver(account, receiver) - streamhost['idx'] = receiver.queue_idx + if receiving: + self.type = 'receiver' + socks5obj = Socks5Receiver(self.idlequeue, streamhost, sid, + 'client', file_props, + fingerprint=fp) + self.add_sockobj(account, socks5obj) + else: + self.type = 'sender' + socks5obj = Socks5Sender(self.idlequeue, + file_props['sha_str'], self, mode='client' , + _sock=None, host=str(streamhost['host']), + port=int(streamhost['port']), fingerprint=fp, + connected=False) + socks5obj.file_props = file_props + socks5obj.streamhost = streamhost + self.add_sockobj(account, socks5obj, type='sender') + + socks5obj.file_props = file_props + streamhost['idx'] = socks5obj.queue_idx def _socket_connected(self, streamhost, file_props): """ Called when there is a host connected to one of the senders's - streamhosts. Stop othere attempts for connections + streamhosts. Stop other attempts for connections """ for host in file_props['streamhosts']: if host != streamhost and 'idx' in host: if host['state'] == 1: # remove current - self.remove_receiver(streamhost['idx']) + if self.type == 'sender': + self.remove_sender(streamhost['idx'], False) + else: + self.remove_receiver(streamhost['idx']) return # set state -2, meaning that this streamhost is stopped, # but it may be connectected later if host['state'] >= 0: - self.remove_receiver(host['idx']) + if self.type == 'sender': + self.remove_sender(host['idx'], False) + else: + self.remove_receiver(host['idx']) host['idx'] = -1 host['state'] = -2 - def reconnect_receiver(self, receiver, streamhost): + def reconnect_client(self, client, streamhost): """ Check the state of all streamhosts and if all has failed, then emit connection failure cb. If there are some which are still not connected try to establish connection to one of them """ - self.idlequeue.remove_timeout(receiver.fd) - self.idlequeue.unplug_idle(receiver.fd) - file_props = receiver.file_props + self.idlequeue.remove_timeout(client.fd) + self.idlequeue.unplug_idle(client.fd) + file_props = client.file_props streamhost['state'] = -1 # boolean, indicates that there are hosts, which are not tested yet unused_hosts = False @@ -180,20 +203,22 @@ for host in file_props['streamhosts']: if host['state'] == -2: host['state'] = 0 - receiver = Socks5Receiver(self.idlequeue, host, host['sid'], - file_props) - self.add_receiver(receiver.account, receiver) - host['idx'] = receiver.queue_idx + # FIXME: make the sender reconnect also + print 'reconnecting using socks receiver' + client = Socks5Receiver(self.idlequeue, host, host['sid'], + 'client',file_props) + self.add_sockobj(client.account, client) + host['idx'] = client.queue_idx # we still have chances to connect return if 'received-len' not in file_props or file_props['received-len'] == 0: # there are no other streamhosts and transfer hasn't started - self._connection_refused(streamhost, file_props, receiver.queue_idx) + self._connection_refused(streamhost, file_props, client.queue_idx) else: # transfer stopped, it is most likely stopped from sender - receiver.disconnect() + client.disconnect() file_props['error'] = -1 - self.process_result(-1, receiver) + self.process_result(-1, client) def _connection_refused(self, streamhost, file_props, idx): """ @@ -213,20 +238,23 @@ file_props['sid'], code = 404) del(file_props['failure_cb']) - def add_receiver(self, account, sock5_receiver): + def add_sockobj(self, account, sockobj, type='receiver'): """ - Add new file request + Add new file a sockobj type receiver or sendder """ - self.readers[self.idx] = sock5_receiver - sock5_receiver.queue_idx = self.idx - sock5_receiver.queue = self - sock5_receiver.account = account + if type == 'receiver': + self.readers[self.idx] = sockobj + else: + self.senders[self.idx] = sockobj + sockobj.queue_idx = self.idx + sockobj.queue = self + sockobj.account = account self.idx += 1 - result = sock5_receiver.connect() + result = sockobj.connect() self.connected += 1 if result is not None: - result = sock5_receiver.main() - self.process_result(result, sock5_receiver) + result = sockobj.main() + self.process_result(result, sockobj) return 1 return None @@ -325,13 +353,26 @@ def on_connection_accepted(self, sock): sock_hash = sock.__hash__() - if sock_hash not in self.senders: + if self.type == 'sender' and (sock_hash not in self.senders): self.senders[sock_hash] = Socks5Sender(self.idlequeue, sock_hash, self, - sock[0], sock[1][0], sock[1][1], fingerprint='server') + sock[0], 'server', sock[1][0], sock[1][1], + fingerprint='server') # Start waiting for data self.idlequeue.plug_idle(self.senders[sock_hash], False, True) self.connected += 1 - + + if self.type == 'receiver' and (sock_hash not in self.readers): + sh = {} + sh['host'] = sock[1][0] + sh['port'] = sock[1][1] + sh['initiator'] = None + sh['target'] = None + self.readers[sock_hash] = Socks5Receiver(idlequeue=self.idlequeue, + streamhost=sh,sid=None, file_props=None, + mode='server',fingerprint='server') + self.readers[sock_hash].set_sock(sock[0]) + self.connected += 1 + def process_result(self, result, actor): """ Take appropriate actions upon the result: @@ -373,10 +414,13 @@ """ if idx != -1: if idx in self.senders: + sender = self.senders[idx] if do_disconnect: self.senders[idx].disconnect() return else: + self.idlequeue.unplug_idle(sender.fd) + self.idlequeue.remove_timeout(sender.fd) del(self.senders[idx]) if self.connected > 0:

1 0

gajim: correctly set transient window for muc error dialogs. Fix...
by Yann Leboulanger 14 Aug '11

14 Aug '11

changeset f7a45be37bf5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f7a45be37bf5 description: correctly set transient window for muc error dialogs. Fixes #6943 diffstat: src/gui_interface.py | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diffs (55 lines): diff -r 6810bb1bbf28 -r f7a45be37bf5 src/gui_interface.py --- a/src/gui_interface.py Sun Aug 14 11:57:44 2011 +0200 +++ b/src/gui_interface.py Sun Aug 14 12:19:43 2011 +0200 @@ -244,8 +244,15 @@ gc_control.error_dialog = None gc_control.error_dialog = dialogs.ErrorDialog(pritext, sectext, on_response_ok=on_close, on_response_cancel=on_close) + gc_control.error_dialog.set_modal(False) + if gc_control.parent_win: + gc_control.error_dialog.set_transient_for( + gc_control.parent_win.window) else: - dialogs.ErrorDialog(pritext, sectext) + d = dialogs.ErrorDialog(pritext, sectext) + if gc_control and gc_control.parent_win: + d.set_transient_for(gc_control.parent_win.window) + d.set_modal(False) def handle_gc_password_required(self, account, room_jid, nick): def on_ok(text): @@ -281,8 +288,8 @@ # maximum user number reached self.handle_gc_error(gc_control, _('Unable to join group chat'), - _('Maximum number of users for %s has been reached') % \ - obj.room_jid) + _('Maximum number of users for %s has been reached')\ + % obj.room_jid) elif (obj.errcode == '401') or (obj.errcon == 'not-authorized'): # password required to join self.handle_gc_password_required(obj.conn.name, obj.room_jid, @@ -290,19 +297,20 @@ elif (obj.errcode == '403') or (obj.errcon == 'forbidden'): # we are banned self.handle_gc_error(gc_control, _('Unable to join group chat'), - _('You are banned from group chat %s.') % obj.room_jid) + _('You are banned from group chat %s.') % \ + obj.room_jid) elif (obj.errcode == '404') or (obj.errcon in ('item-not-found', 'remote-server-not-found')): # group chat does not exist self.handle_gc_error(gc_control, _('Unable to join group chat'), - _('Group chat %s does not exist.') % obj.room_jid) + _('Group chat %s does not exist.') % obj.room_jid) elif (obj.errcode == '405') or (obj.errcon == 'not-allowed'): self.handle_gc_error(gc_control, _('Unable to join group chat'), _('Group chat creation is restricted.')) elif (obj.errcode == '406') or (obj.errcon == 'not-acceptable'): self.handle_gc_error(gc_control, _('Unable to join group chat'), _('Your registered nickname must be used in group chat ' - '%s.') % obj.room_jid) + '%s.') % obj.room_jid) elif (obj.errcode == '407') or (obj.errcon == \ 'registration-required'): self.handle_gc_error(gc_control, _('Unable to join group chat'),

1 0

gajim: set transient for roster windows to error / warning dialo...
by Yann Leboulanger 14 Aug '11

14 Aug '11

changeset 6810bb1bbf28 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6810bb1bbf28 description: set transient for roster windows to error / warning dialogs. Fixes #6942 diffstat: src/dialogs.py | 72 +++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 21 deletions(-) diffs (144 lines): diff -r b9cb32f5badd -r 6810bb1bbf28 src/dialogs.py --- a/src/dialogs.py Wed Aug 10 22:40:30 2011 +0200 +++ b/src/dialogs.py Sun Aug 14 11:57:44 2011 +0200 @@ -1534,12 +1534,16 @@ """ def __init__(self, pritext, sectext='', on_response_ok=None, - on_response_cancel=None): + on_response_cancel=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - HigDialog.__init__(self, None, - gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext, - self.on_response_ok, self.on_response_cancel) + if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + parent = gajim.interface.roster.window + else: + parent = None + HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok, + self.on_response_cancel) self.set_modal(False) def on_response_ok(self, widget): @@ -1566,14 +1570,12 @@ """ def __init__(self, pritext, sectext='', transient_for=None): - HigDialog.__init__(self, None, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, - pritext, sectext) - self.set_modal(False) - if transient_for is None and hasattr(gajim.interface, 'roster') and \ + if not transient_for and hasattr(gajim.interface, 'roster') and \ gajim.interface.roster: transient_for = gajim.interface.roster.window - if transient_for: - self.set_transient_for(transient_for) + HigDialog.__init__(self, transient_for, gtk.MESSAGE_WARNING, + gtk.BUTTONS_OK, pritext, sectext) + self.set_modal(False) self.popup() class InformationDialog(HigDialog): @@ -1582,10 +1584,13 @@ """ def __init__(self, pritext, sectext=''): - HigDialog.__init__(self, None, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, + if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + parent = gajim.interface.roster.window + else: + parent = None + HigDialog.__init__(self, parent, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, pritext, sectext) self.set_modal(False) - self.set_transient_for(gajim.interface.roster.window) self.popup() class ErrorDialog(HigDialog): @@ -1595,7 +1600,11 @@ def __init__(self, pritext, sectext='', on_response_ok=None, on_response_cancel=None): - HigDialog.__init__( self, None, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, + if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + parent = gajim.interface.roster.window + else: + parent = None + HigDialog.__init__(self, parent, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, pritext, sectext, on_response_ok=on_response_ok, on_response_cancel=on_response_cancel) self.popup() @@ -1609,8 +1618,13 @@ on_response_no=None): self.user_response_yes = on_response_yes self.user_response_no = on_response_no - HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, - pritext, sectext, on_response_yes=self.on_response_yes, + if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + parent = gajim.interface.roster.window + else: + parent = None + HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION, + gtk.BUTTONS_YES_NO, pritext, sectext, + on_response_yes=self.on_response_yes, on_response_no=self.on_response_no) if checktext: @@ -1658,7 +1672,11 @@ self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, + if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + parent = gajim.interface.roster.window + else: + parent = None + HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) @@ -1708,7 +1726,11 @@ self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, + if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + parent = gajim.interface.roster.window + else: + parent = None + HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) @@ -1772,7 +1794,11 @@ self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, + if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + parent = gajim.interface.roster.window + else: + parent = None + HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) @@ -1828,9 +1854,13 @@ """ def __init__(self, pritext, sectext='', propose_resume=True, - on_response=None): - HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, gtk.BUTTONS_CANCEL, - pritext, sectext) + on_response=None): + if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + parent = gajim.interface.roster.window + else: + parent = None + HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION, + gtk.BUTTONS_CANCEL, pritext, sectext) self.on_response = on_response

1 0

gajim: fix var name
by Yann Leboulanger 10 Aug '11

10 Aug '11

changeset b9cb32f5badd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b9cb32f5badd description: fix var name diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r aff50f8377df -r b9cb32f5badd src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Aug 09 22:20:17 2011 +0300 +++ b/src/common/connection_handlers_events.py Wed Aug 10 22:40:30 2011 +0200 @@ -2106,7 +2106,7 @@ {'nick': gajim.get_name_from_jid(account, self.jid),\ 'status': helpers.get_uf_show(pres_obj.show)} if pres_obj.status: - text = text + " : " + pres_obj.status + self.popup_text = self.popup_text + " : " + pres_obj.status self.popup_event_type = _('Contact Changed Status') elif event == 'contact_connected': self.popup_title = _('%(nickname)s Signed In') % \

1 0

gajim: coding style
by Fomin Denis 09 Aug '11

09 Aug '11

changeset 53e25bac6d44 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=53e25bac6d44 description: coding style diffstat: src/htmltextview.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diffs (28 lines): diff -r b91124d65d95 -r 53e25bac6d44 src/htmltextview.py --- a/src/htmltextview.py Tue Aug 09 11:38:58 2011 +0200 +++ b/src/htmltextview.py Tue Aug 09 22:16:26 2011 +0300 @@ -76,14 +76,19 @@ # styles for elements element_styles = { - 'u' : ';text-decoration: underline', + 'u' : ';text-decoration: underline', 'em' : ';font-style: oblique', - 'cite' : '; background-color:rgb(170,190,250); font-style: oblique', + 'cite' : '; background-color:rgb(170,190,250);' + 'font-style: oblique', 'li' : '; margin-left: 1em; margin-right: 10%', 'strong' : ';font-weight: bold', - 'pre' : '; background-color:rgb(190,190,190); font-family: monospace; white-space: pre; margin-left: 1em; margin-right: 10%', - 'kbd' : ';background-color:rgb(210,210,210);font-family: monospace', - 'blockquote': '; background-color:rgb(170,190,250); margin-left: 2em; margin-right: 10%', + 'pre' : '; background-color:rgb(190,190,190);' + 'font-family: monospace; white-space: pre;' + 'margin-left: 1em; margin-right: 10%', + 'kbd' : ';background-color:rgb(210,210,210);' + 'font-family: monospace', + 'blockquote' : '; background-color:rgb(170,190,250);' + 'margin-left: 2em; margin-right: 10%', 'dt' : ';font-weight: bold; font-style: oblique', 'dd' : ';margin-left: 2em; font-style: oblique' }

1 0

gajim: merge
by Fomin Denis 09 Aug '11

09 Aug '11

changeset aff50f8377df in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aff50f8377df description: merge diffstat: src/htmltextview.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diffs (28 lines): diff -r a9fb1c99aff3 -r aff50f8377df src/htmltextview.py --- a/src/htmltextview.py Tue Aug 09 17:14:13 2011 +0200 +++ b/src/htmltextview.py Tue Aug 09 22:20:17 2011 +0300 @@ -76,14 +76,19 @@ # styles for elements element_styles = { - 'u' : ';text-decoration: underline', + 'u' : ';text-decoration: underline', 'em' : ';font-style: oblique', - 'cite' : '; background-color:rgb(170,190,250); font-style: oblique', + 'cite' : '; background-color:rgb(170,190,250);' + 'font-style: oblique', 'li' : '; margin-left: 1em; margin-right: 10%', 'strong' : ';font-weight: bold', - 'pre' : '; background-color:rgb(190,190,190); font-family: monospace; white-space: pre; margin-left: 1em; margin-right: 10%', - 'kbd' : ';background-color:rgb(210,210,210);font-family: monospace', - 'blockquote': '; background-color:rgb(170,190,250); margin-left: 2em; margin-right: 10%', + 'pre' : '; background-color:rgb(190,190,190);' + 'font-family: monospace; white-space: pre;' + 'margin-left: 1em; margin-right: 10%', + 'kbd' : ';background-color:rgb(210,210,210);' + 'font-family: monospace', + 'blockquote' : '; background-color:rgb(170,190,250);' + 'margin-left: 2em; margin-right: 10%', 'dt' : ';font-weight: bold; font-style: oblique', 'dd' : ';margin-left: 2em; font-style: oblique' }

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2011