diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2014-09-15 16:03:52 +0400 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2014-09-15 16:03:52 +0400 |
| commit | a764cb538475dfe0230776953755786547ad5db4 (patch) | |
| tree | e382cf25e6093b012cf1add62ce1a251291741f6 /src/common | |
| parent | 3cc708516e630c4f82d2bea487d9eb6c25705401 (diff) | |
remove useless test
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/connection_handlers.py | 2 | ||||
| -rw-r--r-- | src/common/protocol/bytestream.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index e2a82d0a1..898018646 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1232,8 +1232,6 @@ class ConnectionHandlersBase: if obj.mtype == 'error': if not obj.msgtxt: obj.msgtxt = _('message') - if not obj.msgtxt: - return True self.dispatch_error_message(obj.stanza, obj.msgtxt, obj.session, obj.fjid, obj.timestamp) return True diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py index 312155efc..a032e561d 100644 --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -393,7 +393,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): my_ips = [self.peerhost[0]] # The ip we're connected to server with # all IPs from local DNS for addr in socket.getaddrinfo(socket.gethostname(), None): - if not addr[4][0] in my_ips and not addr[4][0].startswith('127'): + if not addr[4][0] in my_ips and not addr[4][0].startswith('127') and not addr[4][0] == '::1': my_ips.append(addr[4][0]) sender = file_props.sender |