pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ping: properly process IQ errors, always display error condition

Browse source
This commit is contained in:
Georg Lukas 2017-07-20 11:24:48 +02:00 committed by mathieui
parent 12136b48a5
commit 6fb3151202
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/ping.py
View file

@ -69,11 +69,14 @@ class Plugin(BasePlugin):
if iq['type'] == 'error': if iq['type'] == 'error':
error_condition = iq['error']['condition'] error_condition = iq['error']['condition']
reply = error_condition reply = error_condition
if error_condition in ('remote-server-timeout', 'remote-server-not-found'): # These IQ errors are not ping errors:
# 'service-unavailable': official "not supported" response as of RFC6120 (§8.4) and XEP-0199 (§4.1)
# 'feature-not-implemented': inoffcial not-supported response from many clients
if error_condition not in ('service-unavailable', 'feature-not-implemented'):
error = True error = True
error_text = iq['error']['text'] error_text = iq['error']['text']
if error_text: if error_text:
reply = '%s: %s' % (error_condition, error_text) reply = '%s: %s' % (error_condition, error_text)
if error: if error:
message = '%s did not respond to ping: %s' % (jid, reply) message = '%s did not respond to ping: %s' % (jid, reply)
else: else: