Commits

commits@gajim.org

17632 discussions

gajim: Default to RosterWindow as transient for CommonInputDialog
by Gajim 04 Oct '16

04 Oct '16

changeset da67239e3e2c in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=da67239e3e2c description: Default to RosterWindow as transient for CommonInputDialog diffstat: src/dialogs.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r a3b8feebd691 -r da67239e3e2c src/dialogs.py --- a/src/dialogs.py Tue Oct 04 18:50:59 2016 +0200 +++ b/src/dialogs.py Tue Oct 04 22:05:18 2016 +0200 @@ -2017,6 +2017,8 @@ self.vbox = self.xml.get_object('vbox') if transient_for: self.dialog.set_transient_for(transient_for) + else: + self.dialog.set_transient_for(gajim.interface.roster.window) self.ok_handler = ok_handler okbutton = self.xml.get_object('okbutton')

1 0

gajim: Fix NoneType Error introduced in a10e0df42f31
by Gajim 04 Oct '16

04 Oct '16

changeset 1cfe2d62f639 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1cfe2d62f639 description: Fix NoneType Error introduced in a10e0df42f31 diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r da67239e3e2c -r 1cfe2d62f639 src/gui_interface.py --- a/src/gui_interface.py Tue Oct 04 22:05:18 2016 +0200 +++ b/src/gui_interface.py Tue Oct 04 22:25:44 2016 +0200 @@ -295,7 +295,7 @@ def handle_event_gc_presence(self, obj): gc_control = obj.gc_control parent_win = None - if gc_control.parent_win: + if gc_control and gc_control.parent_win: parent_win = gc_control.parent_win.window if obj.ptype == 'error': if obj.errcode == '503':

1 0

gajim: Better alignment for elements in ChatWindow and GroupChat...
by Gajim 04 Oct '16

04 Oct '16

changeset a3b8feebd691 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a3b8feebd691 description: Better alignment for elements in ChatWindow and GroupChatWindow diffstat: data/gui/chat_control.ui | 30 ++++++++++++++++-------------- data/gui/groupchat_control.ui | 19 ++++++++++++------- src/chat_control.py | 9 +++++++++ 3 files changed, 37 insertions(+), 21 deletions(-) diffs (275 lines): diff -r 72bcd2e76aaf -r a3b8feebd691 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Mon Oct 03 22:43:17 2016 +0200 +++ b/data/gui/chat_control.ui Tue Oct 04 18:50:59 2016 +0200 @@ -38,9 +38,9 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">1</property> <property name="use_markup">True</property> + <property name="xalign">0</property> </object> </child> </object> @@ -286,6 +286,10 @@ </object> <object class="GtkBox" id="chat_control_hbox"> <property name="can_focus">True</property> + <property name="margin_left">7</property> + <property name="margin_right">7</property> + <property name="margin_top">5</property> + <property name="margin_bottom">7</property> <property name="spacing">1</property> <child> <object class="GtkPaned" id="paned1"> @@ -296,13 +300,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">5</property> <child> <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">3</property> - <property name="margin_right">3</property> - <property name="margin_bottom">1</property> <child> <object class="GtkBox" id="hbox3004"> <property name="visible">True</property> @@ -332,9 +334,9 @@ <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label">Contact name</property> <property name="use_markup">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -346,10 +348,10 @@ <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> + <property name="xalign">0</property> <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> </object> <packing> @@ -498,11 +500,11 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> <property name="height_request">60</property> <property name="can_focus">True</property> - <property name="border_width">3</property> <property name="shadow_type">in</property> <child> <placeholder/> @@ -519,6 +521,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">3</property> <child> <object class="GtkButton" id="authentication_button"> <property name="can_focus">True</property> @@ -529,8 +532,8 @@ <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="lock_image"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-dialog-authentication</property> <property name="icon_size">1</property> </object> @@ -538,7 +541,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -546,7 +549,6 @@ <object class="GtkScrolledWindow" id="message_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">3</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">never</property> <property name="shadow_type">in</property> @@ -563,7 +565,7 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -878,7 +880,6 @@ <property name="relief">none</property> <property name="focus_on_click">False</property> <property name="orientation">vertical</property> - <property name="size">menu</property> <property name="adjustment">adjustment1</property> <property name="icons">audio-volume-muted audio-volume-high @@ -911,9 +912,7 @@ <property name="has_tooltip">True</property> <property name="relief">none</property> <property name="focus_on_click">False</property> - <property name="yalign">0.4699999988079071</property> <property name="orientation">vertical</property> - <property name="size">menu</property> <property name="adjustment">adjustment2</property> <property name="icons">audio-mic-volume-muted audio-mic-volume-high @@ -976,6 +975,7 @@ <child> <object class="GtkButton" id="send_button"> <property name="label" translatable="yes">_Send</property> + <property name="width_request">80</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -984,6 +984,7 @@ <property name="tooltip_text" translatable="yes">Send message</property> <property name="image">image4</property> <property name="use_underline">True</property> + <property name="always_show_image">True</property> </object> <packing> <property name="expand">False</property> @@ -996,6 +997,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> diff -r 72bcd2e76aaf -r a3b8feebd691 data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Mon Oct 03 22:43:17 2016 +0200 +++ b/data/gui/groupchat_control.ui Tue Oct 04 18:50:59 2016 +0200 @@ -12,15 +12,16 @@ <child> <object class="GtkBox" id="groupchat_control_vbox"> <property name="can_focus">True</property> - <property name="border_width">3</property> + <property name="margin_left">7</property> + <property name="margin_right">7</property> + <property name="margin_top">5</property> + <property name="margin_bottom">7</property> <property name="orientation">vertical</property> + <property name="spacing">5</property> <child> <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">3</property> - <property name="margin_right">3</property> - <property name="margin_bottom">1</property> <child> <object class="GtkBox" id="hbox3024"> <property name="visible">True</property> @@ -49,9 +50,9 @@ <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label">room jid</property> <property name="use_markup">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -63,10 +64,10 @@ <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -94,7 +95,6 @@ <object class="GtkPaned" id="hpaned"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">3</property> <property name="position">495</property> <property name="position_set">True</property> <signal name="notify" handler="on_hpaned_notify" swapped="no"/> @@ -103,6 +103,7 @@ <property name="width_request">0</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_right">4</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -150,6 +151,7 @@ <property name="width_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="margin_left">4</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> <child> @@ -178,6 +180,7 @@ </child> <child> <object class="GtkBox" id="actions_hbox"> + <property name="height_request">34</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -407,12 +410,14 @@ <child> <object class="GtkButton" id="send_button"> <property name="label" translatable="yes">_Send</property> + <property name="width_request">80</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Send message</property> <property name="image">image1</property> <property name="use_underline">True</property> + <property name="always_show_image">True</property> </object> <packing> <property name="expand">False</property> diff -r 72bcd2e76aaf -r a3b8feebd691 src/chat_control.py --- a/src/chat_control.py Mon Oct 03 22:43:17 2016 +0200 +++ b/src/chat_control.py Tue Oct 04 18:50:59 2016 +0200 @@ -1475,6 +1475,15 @@ # Add lock image to show chat encryption self.lock_image = self.xml.get_object('lock_image') + # Remove padding from authentication button or else it will + # be higher than the message box + style_provider = Gtk.CssProvider() + css = 'GtkButton { padding-top: 0px; padding-bottom: 0px}' + style_provider.load_from_data(css.encode()) + context = self.authentication_button.get_style_context() + context.add_provider(style_provider, + Gtk.STYLE_PROVIDER_PRIORITY_USER) + # Convert to GC icon img = self.xml.get_object('convert_to_gc_button_image') img.set_from_pixbuf(gtkgui_helpers.load_icon(

1 0

gajim: Restore correct window size in single window mode
by Gajim 03 Oct '16

03 Oct '16

changeset 72bcd2e76aaf in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=72bcd2e76aaf description: Restore correct window size in single window mode diffstat: src/message_window.py | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diffs (36 lines): diff -r e66fb2abadd8 -r 72bcd2e76aaf src/message_window.py --- a/src/message_window.py Mon Oct 03 16:34:16 2016 +0200 +++ b/src/message_window.py Mon Oct 03 22:43:17 2016 +0200 @@ -996,19 +996,16 @@ """ Resizes window according to config settings """ + hpaned = gajim.config.get('roster_hpaned_position') if self.mode in (self.ONE_MSG_WINDOW_ALWAYS, - self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER): + self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER): size = (gajim.config.get('msgwin-width'), gajim.config.get('msgwin-height')) if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - parent_size = win.window.get_size() # Need to add the size of the now visible paned handle, otherwise # the saved width of the message window decreases by this amount - s = GObject.Value() - s.init(GObject.TYPE_INT) - win.parent_paned.style_get_property('handle-size', s) - handle_size = s.get_int() - size = (parent_size[0] + size[0] + handle_size, size[1]) + handle_size = win.parent_paned.style_get_property('handle-size') + size = (hpaned + size[0] + handle_size, size[1]) elif self.mode == self.ONE_MSG_WINDOW_PERACCT: size = (gajim.config.get_per('accounts', acct, 'msgwin-width'), gajim.config.get_per('accounts', acct, 'msgwin-height')) @@ -1022,7 +1019,7 @@ return win.resize(size[0], size[1]) if win.parent_paned: - win.parent_paned.set_position(gajim.config.get('roster_hpaned_position')) + win.parent_paned.set_position(hpaned) def _position_window(self, win, acct, type_): """

1 0

gajim: Restore correct window size in single window mode
by Gajim 03 Oct '16

03 Oct '16

changeset 2eace08470b1 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2eace08470b1 description: Restore correct window size in single window mode diffstat: src/message_window.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (31 lines): diff -r e64a6f0077ca -r 2eace08470b1 src/message_window.py --- a/src/message_window.py Mon Oct 03 16:35:17 2016 +0200 +++ b/src/message_window.py Mon Oct 03 23:02:23 2016 +0200 @@ -997,16 +997,16 @@ """ Resizes window according to config settings """ + hpaned = gajim.config.get('roster_hpaned_position') if self.mode in (self.ONE_MSG_WINDOW_ALWAYS, self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER): size = (gajim.config.get('msgwin-width'), gajim.config.get('msgwin-height')) if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - parent_size = win.window.get_size() # Need to add the size of the now visible paned handle, otherwise # the saved width of the message window decreases by this amount handle_size = win.parent_paned.style_get_property('handle-size') - size = (parent_size[0] + size[0] + handle_size, size[1]) + size = (hpaned + size[0] + handle_size, size[1]) elif self.mode == self.ONE_MSG_WINDOW_PERACCT: size = (gajim.config.get_per('accounts', acct, 'msgwin-width'), gajim.config.get_per('accounts', acct, 'msgwin-height')) @@ -1020,7 +1020,7 @@ return win.resize(size[0], size[1]) if win.parent_paned: - win.parent_paned.set_position(gajim.config.get('roster_hpaned_position')) + win.parent_paned.set_position(hpaned) def _position_window(self, win, acct, type_): """

1 0

gajim: Fix missing time reference - Fixes #8399
by Gajim 03 Oct '16

03 Oct '16

changeset e66fb2abadd8 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e66fb2abadd8 description: Fix missing time reference - Fixes #8399 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7798d6f62f3e -r e66fb2abadd8 src/common/connection.py --- a/src/common/connection.py Sat Oct 01 17:35:10 2016 +0200 +++ b/src/common/connection.py Mon Oct 03 16:34:16 2016 +0200 @@ -377,7 +377,7 @@ form_node, user_nick, attention, correction_msg, callback) return # Encryption failed, do not send message - tim = localtime() + tim = time.localtime() gajim.nec.push_incoming_event(MessageNotSentEvent(None, conn=self, jid=jid, message=msgtxt, error=error, time_=tim, session=session))

1 0

gajim: Fix missing time reference - Fixes #8399
by Gajim 03 Oct '16

03 Oct '16

changeset e64a6f0077ca in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=e64a6f0077ca description: Fix missing time reference - Fixes #8399 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7e9f231826e8 -r e64a6f0077ca src/common/connection.py --- a/src/common/connection.py Sun Oct 02 14:17:39 2016 +0200 +++ b/src/common/connection.py Mon Oct 03 16:35:17 2016 +0200 @@ -394,7 +394,7 @@ form_node, user_nick, attention, correction_msg, callback) return # Encryption failed, do not send message - tim = localtime() + tim = time.localtime() gajim.nec.push_incoming_event(MessageNotSentEvent(None, conn=self, jid=jid, message=msgtxt, error=error, time_=tim, session=session))

1 0

gajim: Display version/os information correctly in VCard window
by Gajim 02 Oct '16

02 Oct '16

changeset 7798d6f62f3e in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7798d6f62f3e description: Display version/os information correctly in VCard window On contacts with multiple resources, not all information was displayed. diffstat: src/vcard.py | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 15 deletions(-) diffs (83 lines): diff -r 1b283c3e80e5 -r 7798d6f62f3e src/vcard.py --- a/src/vcard.py Sun Oct 02 14:15:15 2016 +0100 +++ b/src/vcard.py Sat Oct 01 17:35:10 2016 +0200 @@ -312,16 +312,29 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.contact.jid and obj.fjid != self.real_jid: + if self.gc_contact: + if obj.fjid != self.contact.jid: + return + elif gajim.get_jid_without_resource(obj.fjid) != self.contact.jid: return i = 0 client = '' os = '' while i in self.os_info: - if not self.os_info[i]['resource'] or \ - self.os_info[i]['resource'] == obj.resource: - self.os_info[i]['client'] = obj.client_info - self.os_info[i]['os'] = obj.os_info + if self.os_info[i]['resource'] == obj.resource: + if obj.client_info: + self.os_info[i]['client'] = obj.client_info + else: + self.os_info[i]['client'] = Q_('?Client:Unknown') + if obj.os_info: + self.os_info[i]['os'] = obj.os_info + else: + self.os_info[i]['os'] = Q_('?OS:Unknown') + else: + if not self.os_info[i]['client']: + self.os_info[i]['client'] = Q_('?Client:Unknown') + if not self.os_info[i]['os']: + self.os_info[i]['os'] = Q_('?OS:Unknown') if i > 0: client += '\n' os += '\n' @@ -329,10 +342,6 @@ os += self.os_info[i]['os'] i += 1 - if client == '': - client = Q_('?Client:Unknown') - if os == '': - os = Q_('?OS:Unknown') self.xml.get_object('client_name_version_label').set_text(client) self.xml.get_object('os_label').set_text(os) self.os_info_arrived = True @@ -342,21 +351,27 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.contact.jid and obj.fjid != self.real_jid: + if self.gc_contact: + if obj.fjid != self.contact.jid: + return + elif gajim.get_jid_without_resource(obj.fjid) != self.contact.jid: return i = 0 time_s = '' while i in self.time_info: - if not self.time_info[i]['resource'] or \ - self.time_info[i]['resource'] == obj.resource: - self.time_info[i]['time'] = obj.time_info + if self.time_info[i]['resource'] == obj.resource: + if obj.time_info: + self.time_info[i]['time'] = obj.time_info + else: + self.time_info[i]['time'] = Q_('?Time:Unknown') + else: + if not self.time_info[i]['time']: + self.time_info[i]['time'] = Q_('?Time:Unknown') if i > 0: time_s += '\n' time_s += self.time_info[i]['time'] i += 1 - if time_s == '': - time_s = Q_('?Time:Unknown') self.xml.get_object('time_label').set_text(time_s) self.entity_time_arrived = True

1 0

gajim: Remove other resolvers
by Gajim 02 Oct '16

02 Oct '16

changeset c325f1e92a4e in /home/hg/repos/gajim author: Linus Heckemann <git(a)sphalerite.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c325f1e92a4e description: Remove other resolvers diffstat: src/common/resolver.py | 306 ------------------------------------------------- src/gui_interface.py | 4 - 2 files changed, 0 insertions(+), 310 deletions(-) diffs (truncated from 337 to 300 lines): diff -r 3dd54c6dc369 -r c325f1e92a4e src/common/resolver.py --- a/src/common/resolver.py Sun Oct 02 14:02:04 2016 +0100 +++ b/src/common/resolver.py Sun Oct 02 14:09:06 2016 +0100 @@ -35,22 +35,6 @@ from gi.repository import Gio, GLib -# it is good to check validity of arguments, when calling system commands -ns_type_pattern = re.compile('^[a-z]+$') - -# match srv host_name -host_pattern = re.compile('^[a-z0-9\-._]*[a-z0-9]\.[a-z]{2,}$') - -try: - #raise ImportError("Manually disabled libasync") - import libasyncns - USE_LIBASYNCNS = True - log.info("libasyncns-python loaded") -except ImportError: - USE_LIBASYNCNS = False - log.debug("Import of libasyncns-python failed, getaddrinfo will block", exc_info=True) - - def get_resolver(idlequeue): return GioResolver() @@ -101,296 +85,6 @@ def start_resolve(self, host, type_): pass -# FIXME: API usage is not consistent! This one requires that process is called -class LibAsyncNSResolver(CommonResolver): - """ - Asynchronous resolver using libasyncns-python. process() method has to be - called in order to proceed the pending requests. Based on patch submitted by - Damien Thebault. - """ - - def __init__(self): - self.asyncns = libasyncns.Asyncns() - CommonResolver.__init__(self) - - def start_resolve(self, host, type_): - type_ = libasyncns.ns_t_srv - if type_ == 'txt': type_ = libasyncns.ns_t_txt - resq = self.asyncns.res_query(host, libasyncns.ns_c_in, type_) - resq.userdata = {'host':host, 'type':type_} - - # getaddrinfo to be done - #def resolve_name(self, dname, callback): - #resq = self.asyncns.getaddrinfo(dname) - #resq.userdata = {'callback':callback, 'dname':dname} - - def _on_ready(self, host, type_, result_list): - if type_ == libasyncns.ns_t_srv: type_ = 'srv' - elif type_ == libasyncns.ns_t_txt: type_ = 'txt' - - CommonResolver._on_ready(self, host, type_, result_list) - - def process(self): - try: - self.asyncns.wait(False) - resq = self.asyncns.get_next() - except: - return True - if type(resq) == libasyncns.ResQuery: - # TXT or SRV result - while resq is not None: - try: - rl = resq.get_done() - except Exception: - rl = [] - hosts = [] - requested_type = resq.userdata['type'] - requested_host = resq.userdata['host'] - if rl: - for r in rl: - if r['type'] != requested_type: - # Answer doesn't contain valid SRV data - continue - r['prio'] = r['pref'] - hosts.append(r) - self._on_ready(host=requested_host, type_=requested_type, - result_list=hosts) - try: - resq = self.asyncns.get_next() - except Exception: - resq = None - elif type(resq) == libasyncns.AddrInfoQuery: - # getaddrinfo result (A or AAAA) - rl = resq.get_done() - resq.userdata['callback'](resq.userdata['dname'], rl) - return True - - -class NSLookupResolver(CommonResolver): - """ - Asynchronous DNS resolver calling nslookup. Processing of pending requests - is invoked from idlequeue which is watching file descriptor of pipe of - stdout of nslookup process. - """ - - def __init__(self, idlequeue): - self.idlequeue = idlequeue - self.process = False - CommonResolver.__init__(self) - - def parse_srv_result(self, fqdn, result): - """ - Parse the output of nslookup command and return list of properties: - 'host', 'port','weight', 'priority' corresponding to the found srv hosts - """ - if os.name == 'nt': - return self._parse_srv_result_nt(fqdn, result) - elif os.name == 'posix': - return self._parse_srv_result_posix(fqdn, result) - - def _parse_srv_result_nt(self, fqdn, result): - # output from win32 nslookup command - if not result: - return [] - hosts = [] - result = result.decode(sys.stdout.encoding) - lines = result.replace('\r', '').split('\n') - current_host = None - for line in lines: - line = line.lstrip() - if line == '': - continue - if line.startswith(fqdn): - rest = line[len(fqdn):] - if rest.find('service') > -1: - current_host = {} - elif isinstance(current_host, dict): - res = line.strip().split('=') - if len(res) != 2: - if len(current_host) == 4: - hosts.append(current_host) - current_host = None - continue - prop_type = res[0].strip() - prop_value = res[1].strip() - if prop_type.find('prio') > -1: - try: - current_host['prio'] = int(prop_value) - except ValueError: - continue - elif prop_type.find('weight') > -1: - try: - current_host['weight'] = int(prop_value) - except ValueError: - continue - elif prop_type.find('port') > -1: - try: - current_host['port'] = int(prop_value) - except ValueError: - continue - elif prop_type.find('host') > -1: - # strip '.' at the end of hostname - if prop_value[-1] == '.': - prop_value = prop_value[:-1] - current_host['host'] = prop_value - if len(current_host) == 4: - hosts.append(current_host) - current_host = None - return hosts - - def _parse_srv_result_posix(self, fqdn, result): - # typical output of bind-tools nslookup command: - # _xmpp-client._tcp.jabber.org service = 30 30 5222 jabber.org. - if not result: - return [] - ufqdn = helpers.ascii_to_idn(fqdn) # Unicode domain name - hosts = [] - lines = result.split('\n') - for line in lines: - if line == '': - continue - domain = None - if line.startswith(fqdn): - domain = fqdn # For nslookup 9.5 - elif line.startswith(ufqdn): - domain = ufqdn # For nslookup 9.6 - if domain: - rest = line[len(domain):].split('=') - if len(rest) != 2: - continue - answer_type, props_str = rest - if answer_type.strip() != 'service': - continue - props = props_str.strip().split(' ') - if len(props) < 4: - continue - prio, weight, port, host = props[-4:] - if host[-1] == '.': - host = host[:-1] - try: - prio = int(prio) - weight = int(weight) - port = int(port) - except ValueError: - continue - hosts.append({'host': host, 'port': port, 'weight': weight, - 'prio': prio}) - return hosts - - def _on_ready(self, host, type_, result): - # nslookup finished, parse the result and call the handlers - result_list = self.parse_srv_result(host, result) - CommonResolver._on_ready(self, host, type_, result_list) - - def start_resolve(self, host, type_): - """ - Spawn new nslookup process and start waiting for results - """ - ns = NsLookup(self._on_ready, host, type_) - ns.set_idlequeue(self.idlequeue) - ns.commandtimeout = 20 - ns.start() - - -class HostResolver(CommonResolver): - """ - Asynchronous DNS resolver calling host. Processing of pending requests - is invoked from idlequeue which is watching file descriptor of pipe of - stdout of host process. - """ - - def __init__(self, idlequeue): - self.idlequeue = idlequeue - self.process = False - CommonResolver.__init__(self) - - def parse_srv_result(self, fqdn, result): - """ - Parse the output of host command and return list of properties: - 'host', 'port','weight', 'priority' corresponding to the found srv hosts - """ - # typical output of host command: - # _xmpp-client._tcp.jabber.org has SRV record 30 30 5222 jabber.org. - if not result: - return [] - ufqdn = helpers.ascii_to_idn(fqdn) # Unicode domain name - hosts = [] - lines = result.split('\n') - for line in lines: - if line == '': - continue - domain = None - if line.startswith(fqdn): - domain = fqdn # For nslookup 9.5 - elif line.startswith(ufqdn): - domain = ufqdn # For nslookup 9.6 - if domain: - # add 4 for ' has' after domain name - rest = line[len(domain)+4:].split('record') - if len(rest) != 2: - continue - answer_type, props_str = rest - if answer_type.strip() != 'SRV': - continue - props = props_str.strip().split(' ') - if len(props) < 4: - continue - prio, weight, port, host = props[-4:] - if host[-1] == '.': - host = host[:-1] - try: - prio = int(prio) - weight = int(weight) - port = int(port) - except ValueError: - continue - hosts.append({'host': host, 'port': port, 'weight': weight, - 'prio': prio}) - return hosts - - def _on_ready(self, host, type_, result): - # host finished, parse the result and call the handlers - result_list = self.parse_srv_result(host, result) - CommonResolver._on_ready(self, host, type_, result_list) - - def start_resolve(self, host, type_): - """ - Spawn new nslookup process and start waiting for results - """ - ns = Host(self._on_ready, host, type_) - ns.set_idlequeue(self.idlequeue) - ns.commandtimeout = 20 - ns.start() - -class NsLookup(IdleCommand): - def __init__(self, on_result, host='_xmpp-client', type_='srv'): - IdleCommand.__init__(self, on_result) - self.commandtimeout = 10 - self.host = host.lower() - self.type_ = type_.lower() - if not host_pattern.match(self.host): - # invalid host name - log.error('Invalid host: %s' % self.host)

1 0

gajim: Fix resolver test code
by Gajim 02 Oct '16

02 Oct '16

changeset 1b283c3e80e5 in /home/hg/repos/gajim author: Linus Heckemann <git(a)sphalerite.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1b283c3e80e5 description: Fix resolver test code diffstat: src/common/resolver.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (18 lines): diff -r c325f1e92a4e -r 1b283c3e80e5 src/common/resolver.py --- a/src/common/resolver.py Sun Oct 02 14:09:06 2016 +0100 +++ b/src/common/resolver.py Sun Oct 02 14:15:15 2016 +0100 @@ -147,6 +147,7 @@ resolver.resolve(host, on_result) win = Gtk.Window() win.set_border_width(6) + win.connect('remove', Gtk.main_quit) text_view = Gtk.Entry() text_view.set_text('_xmpp-client._tcp.jabber.org') hbox = Gtk.HBox() @@ -158,6 +159,4 @@ win.add(hbox) win.show_all() GLib.timeout_add(200, idlequeue.process) - if USE_LIBASYNCNS: - GLib.timeout_add(200, resolver.process) Gtk.main()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits