diff options
| author | Jefry Lagrange <jefry.reyes@gmail.com> | 2011-07-23 02:00:29 +0400 |
|---|---|---|
| committer | Jefry Lagrange <jefry.reyes@gmail.com> | 2011-07-23 02:00:29 +0400 |
| commit | 6402505983ec451b77648e3a082001ee9aced47d (patch) | |
| tree | 135650ff9bf19b01ffce11cf0d8e52ce0ecefa7c | |
| parent | 11f1c8c275cf0d61b27084204307da14c32bab45 (diff) | |
fix candidate-error
| -rw-r--r-- | src/common/jingle_content.py | 2 | ||||
| -rw-r--r-- | src/common/jingle_transport.py | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/common/jingle_content.py b/src/common/jingle_content.py index 005d45831..dcc7e5bf8 100644 --- a/src/common/jingle_content.py +++ b/src/common/jingle_content.py @@ -145,7 +145,7 @@ class JingleContent(object): Sends a candidate-error when we can't connect to a candidate. """ content = self.__content() - tp = self.transport.make_transport() + tp = self.transport.make_transport(add_candidates=False) tp.addChild(name='candidate-error') content.addChild(node=tp) self.session.send_transport_info(content) diff --git a/src/common/jingle_transport.py b/src/common/jingle_transport.py index 3cd191d21..8db288b48 100644 --- a/src/common/jingle_transport.py +++ b/src/common/jingle_transport.py @@ -117,11 +117,14 @@ class JingleTransportSocks5(JingleTransport): return xmpp.Node('candidate', attrs=attrs) - def make_transport(self, candidates=None): - self._add_local_ips_as_candidates() - self._add_additional_candidates() - self._add_proxy_candidates() - transport = JingleTransport.make_transport(self, candidates) + def make_transport(self, candidates=None, add_candidates = True): + if add_candidates: + self._add_local_ips_as_candidates() + self._add_additional_candidates() + self._add_proxy_candidates() + transport = JingleTransport.make_transport(self, candidates) + else: + transport = xmpp.Node('transport') transport.setNamespace(xmpp.NS_JINGLE_BYTESTREAM) transport.setAttr('sid', self.sid) return transport |