Commits November 2014

commits@gajim.org

1 participants
63 discussions

gajim: close FT port as soon as we know it won't be used for the...
by Gajim 14 Nov '14

14 Nov '14

changeset 3c14a927ee34 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3c14a927ee34 description: close FT port as soon as we know it won't be used for the transfer. diffstat: src/common/jingle_ft.py | 3 ++- src/common/jingle_ftstates.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletions(-) diffs (30 lines): diff -r bfcd83790200 -r 3c14a927ee34 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sun Jun 01 22:32:44 2014 +0200 +++ b/src/common/jingle_ft.py Mon Jun 16 21:32:01 2014 +0200 @@ -282,7 +282,8 @@ streamhost_used = cand break if streamhost_used == None or streamhost_used['type'] == 'proxy': - if not gajim.socks5queue.listener.connections: + if gajim.socks5queue.listener and \ + not gajim.socks5queue.listener.connections: gajim.socks5queue.listener.disconnect() if content.getTag('transport').getTag('activated'): self.state = STATE_TRANSFERING diff -r bfcd83790200 -r 3c14a927ee34 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Sun Jun 01 22:32:44 2014 +0200 +++ b/src/common/jingle_ftstates.py Mon Jun 16 21:32:01 2014 +0200 @@ -151,9 +151,13 @@ if self.jft.isOurCandUsed(): mode = 'client' streamhost_used = self.jft.nominated_cand['our-cand'] + gajim.socks5queue.remove_server(self.jft.file_props.sid) else: mode = 'server' streamhost_used = self.jft.nominated_cand['peer-cand'] + gajim.socks5queue.remove_client(self.jft.file_props.sid) +# our_cand = self.jft.nominated_cand['our-cand'] +# gajim.socks5queue.remove_receiver(our_cand['idx']) if streamhost_used['type'] == 'proxy': self.jft.file_props.is_a_proxy = True if self.jft.file_props.type_ == 's' and self.jft.weinitiate:

1 0

gajim: fix gobject warning when hidding tooltips
by Gajim 14 Nov '14

14 Nov '14

changeset 8d1329041439 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8d1329041439 description: fix gobject warning when hidding tooltips diffstat: src/conversation_textview.py | 7 +++++-- src/disco.py | 5 +++-- src/groupchat_control.py | 3 ++- src/htmltextview.py | 5 +++-- src/roster_window.py | 15 +++++++++------ src/tooltips.py | 5 +++++ 6 files changed, 27 insertions(+), 13 deletions(-) diffs (212 lines): diff -r 3c14a927ee34 -r 8d1329041439 src/conversation_textview.py --- a/src/conversation_textview.py Mon Jun 16 21:32:01 2014 +0200 +++ b/src/conversation_textview.py Sat Jun 21 10:39:34 2014 +0200 @@ -616,6 +616,7 @@ GLib.idle_add(self.scroll_to_end) def show_xep0184_warning_tooltip(self): + self.xep0184_warning_tooltip.timeout = 0 w = self.tv.get_window(Gtk.TextWindowType.TEXT) device = w.get_display().get_device_manager().get_client_pointer() pointer = w.get_device_position(device) @@ -637,6 +638,7 @@ 'message got lost.'), 8, position[1] + y) def show_line_tooltip(self): + self.line_tooltip.timeout = 0 w = self.tv.get_window(Gtk.TextWindowType.TEXT) device = w.get_display().get_device_manager().get_client_pointer() pointer = w.get_device_position(device) @@ -711,11 +713,12 @@ elif tag == tag_table.lookup('xep0184-warning'): xep0184_warning = True - if self.line_tooltip.timeout != 0: + if self.line_tooltip.timeout != 0 or self.line_tooltip.shown: # Check if we should hide the line tooltip if not over_line: self.line_tooltip.hide_tooltip() - if self.xep0184_warning_tooltip.timeout != 0: + if self.xep0184_warning_tooltip.timeout != 0 or \ + self.xep0184_warning_tooltip.shown: # Check if we should hide the XEP-184 warning tooltip if not xep0184_warning: self.xep0184_warning_tooltip.hide_tooltip() diff -r 3c14a927ee34 -r 8d1329041439 src/disco.py --- a/src/disco.py Mon Jun 16 21:32:01 2014 +0200 +++ b/src/disco.py Sat Jun 21 10:39:34 2014 +0200 @@ -1294,6 +1294,7 @@ return 0 def _show_tooltip(self, state): + self.tooltip.timeout = 0 view = self.window.services_treeview w = view.get_window() device = w.get_display().get_device_manager().get_client_pointer() @@ -1313,13 +1314,13 @@ # These are all callbacks to make tooltips work def on_treeview_leave_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip() def on_treeview_motion_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() if props: diff -r 3c14a927ee34 -r 8d1329041439 src/groupchat_control.py --- a/src/groupchat_control.py Mon Jun 16 21:32:01 2014 +0200 +++ b/src/groupchat_control.py Sat Jun 21 10:39:34 2014 +0200 @@ -2690,7 +2690,7 @@ def on_list_treeview_motion_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() if props: @@ -2719,6 +2719,7 @@ self.tooltip.hide_tooltip() def show_tooltip(self, contact): + self.tooltip.timeout = 0 if not self.list_treeview.get_window(): # control has been destroyed since tooltip was requested return diff -r 3c14a927ee34 -r 8d1329041439 src/htmltextview.py --- a/src/htmltextview.py Mon Jun 16 21:32:01 2014 +0200 +++ b/src/htmltextview.py Sat Jun 21 10:39:34 2014 +0200 @@ -877,7 +877,7 @@ self.tagSthAtSth.connect('event', self.hyperlink_handler, 'sth_at_sth') def __destroy_event(self, widget): - if self.tooltip.timeout != 0: + if self.tooltip.timeout != 0 or self.tooltip.shown: self.tooltip.hide_tooltip() def __leave_event(self, widget, event): @@ -887,6 +887,7 @@ self._changed_cursor = False def show_tooltip(self, tag): + self.tooltip.timeout = 0 if not self.tooltip.win: # check if the current pointer is still over the line w = self.get_window(Gtk.TextWindowType.TEXT) @@ -915,7 +916,7 @@ y = pointer[2] tags = widget.get_iter_at_location(x, y).get_tags() anchor_tags = [tag for tag in tags if getattr(tag, 'is_anchor', False)] - if self.tooltip.timeout != 0: + if self.tooltip.timeout != 0 or self.tooltip.shown: # Check if we should hide the line tooltip if not anchor_tags: self.tooltip.hide_tooltip() diff -r 3c14a927ee34 -r 8d1329041439 src/roster_window.py --- a/src/roster_window.py Mon Jun 16 21:32:01 2014 +0200 +++ b/src/roster_window.py Sat Jun 21 10:39:34 2014 +0200 @@ -2051,6 +2051,7 @@ vb.set_no_show_all(True) def show_tooltip(self, contact): + self.tooltip.timeout = 0 device = self.tree.get_window().get_display().get_device_manager().\ get_client_pointer() pointer = self.tree.get_window().get_device_position(device) @@ -2068,7 +2069,6 @@ else: self.tooltip.hide_tooltip() - def authorize(self, widget, jid, account): """ Authorize a contact (by re-sending auth menuitem) @@ -2865,14 +2865,14 @@ def on_roster_treeview_leave_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip() def on_roster_treeview_motion_notify_event(self, widget, event): model = widget.get_model() props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() if props: @@ -2885,7 +2885,8 @@ return if model[titer][C_TYPE] in ('contact', 'self_contact'): # we're on a contact entry in the roster - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + if (not self.tooltip.shown and self.tooltip.timeout == 0) or \ + self.tooltip.id != props[0]: account = model[titer][C_ACCOUNT] jid = model[titer][C_JID] self.tooltip.id = row @@ -2901,7 +2902,8 @@ self.tooltip.timeout = GLib.timeout_add(500, self.show_tooltip, connected_contacts) elif model[titer][C_TYPE] == 'groupchat': - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + if (not self.tooltip.shown and self.tooltip.timeout == 0) or \ + self.tooltip.id != props[0]: account = model[titer][C_ACCOUNT] jid = model[titer][C_JID] self.tooltip.id = row @@ -2911,7 +2913,8 @@ self.show_tooltip, contact) elif model[titer][C_TYPE] == 'account': # we're on an account entry in the roster - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + if (not self.tooltip.shown and self.tooltip.timeout == 0) or \ + self.tooltip.id != props[0]: account = model[titer][C_ACCOUNT] if account == 'all': self.tooltip.id = row diff -r 3c14a927ee34 -r 8d1329041439 src/tooltips.py --- a/src/tooltips.py Mon Jun 16 21:32:01 2014 +0200 +++ b/src/tooltips.py Sat Jun 21 10:39:34 2014 +0200 @@ -72,6 +72,7 @@ self.id = None self.cur_data = None self.check_last_time = None + self.shown = False def populate(self, data): """ @@ -148,6 +149,8 @@ widget_height is the height of the widget on which we show the tooltip. widget_y_position is vertical position of the widget on the screen. """ + if self.shown: + return self.cur_data = data # set tooltip contents self.populate(data) @@ -163,6 +166,7 @@ self.preferred_position = [pointer_x, preferred_y] self.widget_height = widget_height self.win.show_all() + self.shown = True def hide_tooltip(self): if self.timeout > 0: @@ -174,6 +178,7 @@ self.id = None self.cur_data = None self.check_last_time = None + self.shown = False @staticmethod def colorize_status(status):

1 0

gajim: continue fixing gobject warnings
by Gajim 14 Nov '14

14 Nov '14

changeset 80c4fa3d55f2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=80c4fa3d55f2 description: continue fixing gobject warnings diffstat: src/filetransfers_window.py | 5 +++-- src/groupchat_control.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diffs (41 lines): diff -r 8d1329041439 -r 80c4fa3d55f2 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Jun 21 10:39:34 2014 +0200 +++ b/src/filetransfers_window.py Sat Jun 21 10:41:13 2014 +0200 @@ -759,7 +759,7 @@ pointer = w.get_device_position(device) props = widget.get_path_at_pos(int(event.x), int(event.y)) self.height_diff = pointer[2] - int(event.y) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() if props: @@ -788,7 +788,7 @@ pointer = w.get_device_position(device) props = self.tree.get_path_at_pos(pointer[1], pointer[2] - self.height_diff) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip() @@ -956,6 +956,7 @@ self.set_status(file_props, 'stop') def show_tooltip(self, widget): + self.tooltip.timeout = 0 if self.height_diff == 0: self.tooltip.hide_tooltip() return diff -r 8d1329041439 -r 80c4fa3d55f2 src/groupchat_control.py --- a/src/groupchat_control.py Sat Jun 21 10:39:34 2014 +0200 +++ b/src/groupchat_control.py Sat Jun 21 10:41:13 2014 +0200 @@ -2714,7 +2714,7 @@ def on_list_treeview_leave_notify_event(self, widget, event): props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0: + if self.tooltip.timeout > 0 or self.tooltip.shown: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip()

1 0

gajim: require latest nbxmpp version
by Gajim 14 Nov '14

14 Nov '14

changeset 0190104f1259 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0190104f1259 description: require latest nbxmpp version diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 80c4fa3d55f2 -r 0190104f1259 src/gajim.py --- a/src/gajim.py Sat Jun 21 10:41:13 2014 +0200 +++ b/src/gajim.py Wed Jul 02 18:03:40 2014 +0200 @@ -69,7 +69,7 @@ pass HAS_NBXMPP=True -MIN_NBXMPP_VER = "0.3.3" +MIN_NBXMPP_VER = "0.5" try: import nbxmpp except ImportError:

1 0

gajim: make string translatable in filetranfer context menu. Fix...
by Gajim 14 Nov '14

14 Nov '14

changeset 9c3e121af11f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9c3e121af11f description: make string translatable in filetranfer context menu. Fixes #7740 diffstat: data/gui/filetransfers.ui | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (39 lines): diff -r 28f7c471eabd -r 9c3e121af11f data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Tue Apr 22 13:11:00 2014 +0200 +++ b/data/gui/filetransfers.ui Wed Apr 23 21:53:40 2014 +0200 @@ -17,7 +17,7 @@ <object class="GtkMenuItem" id="continue_menuitem"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label">Con_tinue</property> + <property name="label" translatable="yes">Con_tinue</property> <property name="use_underline">True</property> <signal name="activate" handler="on_continue_menuitem_activate" swapped="no"/> </object> @@ -25,7 +25,7 @@ <child> <object class="GtkMenuItem" id="pause_menuitem"> <property name="can_focus">False</property> - <property name="label">_Pause</property> + <property name="label" translatable="yes">_Pause</property> <property name="use_underline">True</property> <signal name="activate" handler="on_pause_menuitem_activate" swapped="no"/> </object> @@ -33,7 +33,7 @@ <child> <object class="GtkMenuItem" id="cancel_menuitem"> <property name="can_focus">False</property> - <property name="label">_Cancel</property> + <property name="label" translatable="yes">_Cancel</property> <property name="use_underline">True</property> <signal name="activate" handler="on_cancel_menuitem_activate" swapped="no"/> </object> @@ -47,7 +47,7 @@ <child> <object class="GtkMenuItem" id="open_folder_menuitem"> <property name="can_focus">False</property> - <property name="label">_Open Containing Folder</property> + <property name="label" translatable="yes">_Open Containing Folder</property> <property name="use_underline">True</property> <signal name="activate" handler="on_open_folder_menuitem_activate" swapped="no"/> </object>

1 0

gajim: fix sending candidates and computing hash in jingle file ...
by Gajim 14 Nov '14

14 Nov '14

changeset 6b496ce3bb49 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6b496ce3bb49 description: fix sending candidates and computing hash in jingle file transfer. Fixes #7669 diffstat: src/common/jingle_ft.py | 2 +- src/common/jingle_transport.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 9c3e121af11f -r 6b496ce3bb49 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Apr 23 21:53:40 2014 +0200 +++ b/src/common/jingle_ft.py Fri Apr 25 12:48:39 2014 +0200 @@ -110,7 +110,7 @@ STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) } - + if jingle_xtls.PYOPENSSL_PRESENT: cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], jingle_xtls.SELF_SIGNED_CERTIFICATE) diff -r 9c3e121af11f -r 6b496ce3bb49 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Wed Apr 23 21:53:40 2014 +0200 +++ b/src/common/jingle_transport.py Fri Apr 25 12:48:39 2014 +0200 @@ -69,7 +69,7 @@ candidates is None) """ if not candidates: - candidates = self._iter_candidates() + candidates = list(self._iter_candidates()) else: candidates = (self.make_candidate(candidate) for candidate in candidates) transport = nbxmpp.Node('transport', payload=candidates)

1 0

gajim: fix sending codecs
by Gajim 14 Nov '14

14 Nov '14

changeset e768f450374d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e768f450374d description: fix sending codecs diffstat: src/common/jingle_rtp.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6b496ce3bb49 -r e768f450374d src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Apr 25 12:48:39 2014 +0200 +++ b/src/common/jingle_rtp.py Fri May 30 20:37:19 2014 +0200 @@ -158,7 +158,7 @@ def _fill_content(self, content): content.addChild(nbxmpp.NS_JINGLE_RTP + ' description', - attrs={'media': self.media}, payload=self.iter_codecs()) + attrs={'media': self.media}, payload=list(self.iter_codecs())) def _setup_funnel(self): self.funnel = Gst.ElementFactory.make('funnel', None)

1 0

gajim: Fix AcronymsExpander plugin
by Gajim 14 Nov '14

14 Nov '14

changeset 4807f93f1f26 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4807f93f1f26 description: Fix AcronymsExpander plugin diffstat: plugins/acronyms_expander/acronyms_expander.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (20 lines): diff -r e768f450374d -r 4807f93f1f26 plugins/acronyms_expander/acronyms_expander.py --- a/plugins/acronyms_expander/acronyms_expander.py Fri May 30 20:37:19 2014 +0200 +++ b/plugins/acronyms_expander/acronyms_expander.py Sat May 31 11:46:47 2014 +0400 @@ -25,6 +25,7 @@ ''' import sys +import os from gi.repository import Gtk from gi.repository import GObject @@ -63,6 +64,8 @@ @log_calls('AcronymsExpanderPlugin') def get_own_acronyms_list(self): data_file = self.local_file_path('acronyms') + if not os.path.isfile(data_file): + return {} data = open(data_file, 'r') acronyms = eval(data.read()) data.close()

1 0

gajim: correctly compute hash when doing jingle FT
by Gajim 14 Nov '14

14 Nov '14

changeset 2d3ae551c740 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2d3ae551c740 description: correctly compute hash when doing jingle FT diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4807f93f1f26 -r 2d3ae551c740 src/gui_interface.py --- a/src/gui_interface.py Sat May 31 11:46:47 2014 +0400 +++ b/src/gui_interface.py Sun Jun 01 15:40:17 2014 +0200 @@ -966,7 +966,7 @@ ft_win.set_status(file_props, 'ok') h = Hashes() try: - file_ = open(file_props.file_name, 'r') + file_ = open(file_props.file_name, 'rb') except: return hash_ = h.calculateHash(file_props.algo, file_)

1 0

gajim: add new function to close socket
by Gajim 14 Nov '14

14 Nov '14

changeset 431190e7f461 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=431190e7f461 description: add new function to close socket diffstat: src/common/socks5.py | 71 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 43 insertions(+), 28 deletions(-) diffs (107 lines): diff -r 2d3ae551c740 -r 431190e7f461 src/common/socks5.py --- a/src/common/socks5.py Sun Jun 01 15:40:17 2014 +0200 +++ b/src/common/socks5.py Sun Jun 01 15:42:06 2014 +0200 @@ -365,6 +365,28 @@ elif self.progress_transfer_cb is not None: self.progress_transfer_cb(actor.account, actor.file_props) + def remove_receiver_by_key(self, key, do_disconnect=True): + reader = self.readers[key] + self.idlequeue.unplug_idle(reader.fd) + self.idlequeue.remove_timeout(reader.fd) + if do_disconnect: + reader.disconnect() + else: + if reader.streamhost is not None: + reader.streamhost['state'] = -1 + del(self.readers[key]) + + def remove_sender_by_key(self, key, do_disconnect=True): + sender = self.senders[key] + if do_disconnect: + sender.disconnect() + else: + self.idlequeue.unplug_idle(sender.fd) + self.idlequeue.remove_timeout(sender.fd) + del(self.senders[key]) + if self.connected > 0: + self.connected -= 1 + def remove_receiver(self, idx, do_disconnect=True, remove_all=False): """ Remove reciver from the list and decrease the number of active @@ -373,20 +395,10 @@ if idx != -1: for key in self.readers.keys(): if idx in key: - reader = self.readers[key] - self.idlequeue.unplug_idle(reader.fd) - self.idlequeue.remove_timeout(reader.fd) - if do_disconnect: - reader.disconnect() - del self.readers[key] - if not remove_all: - break - else: - if reader.streamhost is not None: - reader.streamhost['state'] = -1 - del(self.readers[key]) - if not remove_all: - break + self.remove_receiver_by_key(key, + do_disconnect=do_disconnect) + if not remove_all: + break def remove_sender(self, idx, do_disconnect=True, remove_all=False): """ @@ -396,24 +408,27 @@ if idx != -1: for key in self.senders.keys(): if idx in key: - sender = self.senders[key] - if do_disconnect: - sender.disconnect() - if not remove_all: - break - else: - self.idlequeue.unplug_idle(sender.fd) - self.idlequeue.remove_timeout(sender.fd) - del(self.senders[key]) - if self.connected > 0: - self.connected -= 1 - if not remove_all: - break + self.remove_sender_by_key(key, do_disconnect=do_disconnect) + if not remove_all: + break if len(self.senders) == 0 and self.listener is not None: self.listener.disconnect() self.listener = None self.connected -= 1 + def remove_by_mode(self, sid, mode, do_disconnect=True): + for (key, sock) in self.senders.items(): + if key[0] == sid and sock.mode == mode: + self.remove_sender_by_key(key) + for (key, sock) in self.readers.items(): + if key[0] == sid and sock.mode == mode: + self.remove_receiver_by_key(key) + + def remove_server(self, sid, do_disconnect=True): + self.remove_by_mode(sid, 'server') + + def remove_client(self, sid, do_disconnect=True): + self.remove_by_mode(sid, 'client') class Socks5(object): def __init__(self, idlequeue, host, port, initiator, target, sid): @@ -770,7 +785,7 @@ self.close_file() self.idlequeue.remove_timeout(self.fd) self.idlequeue.unplug_idle(self.fd) - if self.mode == 'server': + if self.mode == 'server' and self.queue.listener: try: self.queue.listener.connections.remove(self._sock) except ValueError:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2014