copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

coding standards

Browse source
This commit is contained in:
Jefry Lagrange 2012-08-23 17:53:17 -04:00
parent 4585c85458
commit db7bba378a
1 changed files with 2 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/common/jingle_session.py
View file

@ -91,15 +91,12 @@ class JingleSession(object):
if not sid: if not sid:
sid = con.connection.getAnID() sid = con.connection.getAnID()
self.sid = sid # sessionid self.sid = sid # sessionid
# iq stanza id, used to determine which sessions to summon callback # iq stanza id, used to determine which sessions to summon callback
# later on when iq-result stanza arrives # later on when iq-result stanza arrives
if iq_id is not None: if iq_id is not None:
self.iq_ids = [iq_id] self.iq_ids = [iq_id]
else: else:
self.iq_ids = [] self.iq_ids = []
self.accepted = True # is this session accepted by user self.accepted = True # is this session accepted by user
# Hash algorithm that we are using to calculate the integrity of the # Hash algorithm that we are using to calculate the integrity of the
# file. Could be 'md5', 'sha-1', etc... # file. Could be 'md5', 'sha-1', etc...
@ -134,7 +131,6 @@ class JingleSession(object):
'iq-result': [self.__broadcast], 'iq-result': [self.__broadcast],
'iq-error': [self.__on_error], 'iq-error': [self.__on_error],
} }
def collect_iq_id(self, iq_id): def collect_iq_id(self, iq_id):
if iq_id is not None: if iq_id is not None:
@ -190,7 +186,6 @@ class JingleSession(object):
def get_content(self, media=None, name=None): def get_content(self, media=None, name=None):
if media is None: if media is None:
return return
for content in self.contents.values(): for content in self.contents.values():
if content.media == media: if content.media == media:
if name is None or content.name == name: if name is None or content.name == name:
@ -204,7 +199,6 @@ class JingleSession(object):
Creator must be one of ('we', 'peer', 'initiator', 'responder') Creator must be one of ('we', 'peer', 'initiator', 'responder')
""" """
assert creator in ('we', 'peer', 'initiator', 'responder') assert creator in ('we', 'peer', 'initiator', 'responder')
if (creator == 'we' and self.weinitiate) or (creator == 'peer' and \ if (creator == 'we' and self.weinitiate) or (creator == 'peer' and \
not self.weinitiate): not self.weinitiate):
creator = 'initiator' creator = 'initiator'
@ -214,7 +208,6 @@ class JingleSession(object):
content.creator = creator content.creator = creator
content.name = name content.name = name
self.contents[(creator, name)] = content self.contents[(creator, name)] = content
if (creator == 'initiator') == self.weinitiate: if (creator == 'initiator') == self.weinitiate:
# The content is from us, accept it # The content is from us, accept it
content.accepted = True content.accepted = True
@ -236,7 +229,6 @@ class JingleSession(object):
''' '''
Currently used for transport replacement Currently used for transport replacement
''' '''
content = self.contents[(creator,name)] content = self.contents[(creator,name)]
transport.set_sid(content.transport.sid) transport.set_sid(content.transport.sid)
transport.set_file_props(content.transport.file_props) transport.set_file_props(content.transport.file_props)
@ -244,7 +236,6 @@ class JingleSession(object):
# The content will have to be resend now that it is modified # The content will have to be resend now that it is modified
content.sent = False content.sent = False
content.accepted = True content.accepted = True
def on_session_state_changed(self, content=None): def on_session_state_changed(self, content=None):
if self.state == JingleStates.ended: if self.state == JingleStates.ended:
@ -342,9 +333,7 @@ class JingleSession(object):
else: else:
# it's an iq-result (ack) stanza # it's an iq-result (ack) stanza
action = 'iq-result' action = 'iq-result'
callables = self.callbacks[action] callables = self.callbacks[action]
try: try:
for callable in callables: for callable in callables:
callable(stanza=stanza, jingle=jingle, error=error, action=action) callable(stanza=stanza, jingle=jingle, error=error, action=action)
@ -384,14 +373,12 @@ class JingleSession(object):
self.modify_content(creator, name, transport) self.modify_content(creator, name, transport)
cont = self.contents[(creator, name)] cont = self.contents[(creator, name)]
cont.transport = transport cont.transport = transport
stanza, jingle = self.__make_jingle('transport-replace') stanza, jingle = self.__make_jingle('transport-replace')
self.__append_contents(jingle) self.__append_contents(jingle)
self.__broadcast(stanza, jingle, None, 'transport-replace') self.__broadcast(stanza, jingle, None, 'transport-replace')
self.connection.connection.send(stanza) self.connection.connection.send(stanza)
self.state = JingleStates.pending self.state = JingleStates.pending
def __on_transport_replace(self, stanza, jingle, error, action): def __on_transport_replace(self, stanza, jingle, error, action):
for content in jingle.iterTags('content'): for content in jingle.iterTags('content'):
creator = content['creator'] creator = content['creator']
@ -404,14 +391,12 @@ class JingleSession(object):
# Anyway, content's transport is not modifiable yet # Anyway, content's transport is not modifiable yet
pass pass
elif transport_ns == xmpp.NS_JINGLE_IBB: elif transport_ns == xmpp.NS_JINGLE_IBB:
transport = JingleTransportIBB() transport = JingleTransportIBB()
self.modify_content(creator, name, transport) self.modify_content(creator, name, transport)
self.state = JingleStates.pending self.state = JingleStates.pending
self.contents[(creator,name)].state = STATE_TRANSPORT_REPLACE self.contents[(creator,name)].state = STATE_TRANSPORT_REPLACE
self.__ack(stanza, jingle, error, action) self.__ack(stanza, jingle, error, action)
self.__session_accept() self.__session_accept()
else: else:
stanza, jingle = self.__make_jingle('transport-reject') stanza, jingle = self.__make_jingle('transport-reject')
content = jingle.setTag('content', attrs={'creator': creator, content = jingle.setTag('content', attrs={'creator': creator,
@ -446,7 +431,6 @@ class JingleSession(object):
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info', type_='modify') self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info', type_='modify')
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
def __on_content_remove(self, stanza, jingle, error, action): def __on_content_remove(self, stanza, jingle, error, action):
for content in jingle.iterTags('content'): for content in jingle.iterTags('content'):
@ -469,7 +453,6 @@ class JingleSession(object):
if self.state != JingleStates.pending: if self.state != JingleStates.pending:
raise OutOfOrder raise OutOfOrder
self.state = JingleStates.active self.state = JingleStates.active
def __on_content_accept(self, stanza, jingle, error, action): def __on_content_accept(self, stanza, jingle, error, action):
""" """
@ -485,18 +468,15 @@ class JingleSession(object):
def __on_content_add(self, stanza, jingle, error, action): def __on_content_add(self, stanza, jingle, error, action):
if self.state == JingleStates.ended: if self.state == JingleStates.ended:
raise OutOfOrder raise OutOfOrder
parse_result = self.__parse_contents(jingle) parse_result = self.__parse_contents(jingle)
contents = parse_result[0] contents = parse_result[0]
rejected_contents = parse_result[1] rejected_contents = parse_result[1]
for name, creator in rejected_contents: for name, creator in rejected_contents:
# TODO # TODO
content = JingleContent() content = JingleContent()
self.add_content(name, content, creator) self.add_content(name, content, creator)
self.__content_reject(content) self.__content_reject(content)
self.contents[(content.creator, content.name)].destroy() self.contents[(content.creator, content.name)].destroy()
gajim.nec.push_incoming_event(JingleRequestReceivedEvent(None, gajim.nec.push_incoming_event(JingleRequestReceivedEvent(None,
conn=self.connection, jingle_session=self, contents=contents)) conn=self.connection, jingle_session=self, contents=contents))
@ -507,22 +487,16 @@ class JingleSession(object):
""" """
if self.state != JingleStates.ended: if self.state != JingleStates.ended:
raise OutOfOrder raise OutOfOrder
self.initiator = jingle['initiator'] self.initiator = jingle['initiator']
self.responder = self.ourjid self.responder = self.ourjid
self.peerjid = self.initiator self.peerjid = self.initiator
self.accepted = False # user did not accept this session yet self.accepted = False # user did not accept this session yet
# TODO: If the initiator is unknown to the receiver (e.g., via presence # TODO: If the initiator is unknown to the receiver (e.g., via presence
# subscription) and the receiver has a policy of not communicating via # subscription) and the receiver has a policy of not communicating via
# Jingle with unknown entities, it SHOULD return a <service-unavailable/> # Jingle with unknown entities, it SHOULD return a <service-unavailable/>
# error. # error.
# Lets check what kind of jingle session does the peer want # Lets check what kind of jingle session does the peer want
contents, contents_rejected, reason_txt = self.__parse_contents(jingle) contents, contents_rejected, reason_txt = self.__parse_contents(jingle)
# If we are not receivin a file # If we are not receivin a file
# Check if there's already a session with this user: # Check if there's already a session with this user:
if contents[0][0] != 'file': if contents[0][0] != 'file':
@ -534,9 +508,6 @@ class JingleSession(object):
self.__ack(stanza, jingle, error, action) self.__ack(stanza, jingle, error, action)
self._session_terminate(reason) self._session_terminate(reason)
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
# If there's no content we understand... # If there's no content we understand...
if not contents: if not contents:
# TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate # TODO: http://xmpp.org/extensions/xep-0166.html#session-terminate
@ -545,9 +516,7 @@ class JingleSession(object):
self.__ack(stanza, jingle, error, action) self.__ack(stanza, jingle, error, action)
self._session_terminate(reason) self._session_terminate(reason)
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
self.state = JingleStates.pending self.state = JingleStates.pending
# Send event about starting a session # Send event about starting a session
gajim.nec.push_incoming_event(JingleRequestReceivedEvent(None, gajim.nec.push_incoming_event(JingleRequestReceivedEvent(None,
conn=self.connection, jingle_session=self, contents=contents)) conn=self.connection, jingle_session=self, contents=contents))
@ -560,13 +529,11 @@ class JingleSession(object):
# for cn in self.contents.values(): # for cn in self.contents.values():
# cn.on_stanza(stanza, None, error, action) # cn.on_stanza(stanza, None, error, action)
# return # return
# special case: iq-result stanza does not come with a jingle element # special case: iq-result stanza does not come with a jingle element
if action == 'iq-result': if action == 'iq-result':
for cn in self.contents.values(): for cn in self.contents.values():
cn.on_stanza(stanza, None, error, action) cn.on_stanza(stanza, None, error, action)
return return
for content in jingle.iterTags('content'): for content in jingle.iterTags('content'):
name = content['name'] name = content['name']
creator = content['creator'] creator = content['creator']
@ -588,7 +555,6 @@ class JingleSession(object):
else: else:
# TODO # TODO
text = reason text = reason
if reason == 'cancel' and self.session_type_FT: if reason == 'cancel' and self.session_type_FT:
gajim.nec.push_incoming_event(JingleTransferCancelledEvent(None, gajim.nec.push_incoming_event(JingleTransferCancelledEvent(None,
conn=self.connection, jingle_session=self, media=None, conn=self.connection, jingle_session=self, media=None,
@ -606,7 +572,6 @@ class JingleSession(object):
contents = [] contents = []
contents_rejected = [] contents_rejected = []
reasons = set() reasons = set()
for element in jingle.iterTags('content'): for element in jingle.iterTags('content'):
transport = get_jingle_transport(element.getTag('transport')) transport = get_jingle_transport(element.getTag('transport'))
if transport: if transport:
@ -627,28 +592,22 @@ class JingleSession(object):
else: else:
contents_rejected.append((element['name'], 'peer')) contents_rejected.append((element['name'], 'peer'))
reasons.add('unsupported-applications') reasons.add('unsupported-applications')
failure_reason = None failure_reason = None
# Store the first reason of failure # Store the first reason of failure
for reason in ('failed-application', 'unsupported-transports', for reason in ('failed-application', 'unsupported-transports',
'unsupported-applications'): 'unsupported-applications'):
if reason in reasons: if reason in reasons:
failure_reason = reason failure_reason = reason
break break
return (contents, contents_rejected, failure_reason) return (contents, contents_rejected, failure_reason)
def __dispatch_error(self, error=None, text=None, type_=None): def __dispatch_error(self, error=None, text=None, type_=None):
if text: if text:
text = '%s (%s)' % (error, text) text = '%s (%s)' % (error, text)
if type_ != 'modify': if type_ != 'modify':
gajim.nec.push_incoming_event(JingleErrorReceivedEvent(None, gajim.nec.push_incoming_event(JingleErrorReceivedEvent(None,
conn=self.connection, jingle_session=self, conn=self.connection, jingle_session=self,
reason=text or error)) reason=text or error))
def __reason_from_stanza(self, stanza): def __reason_from_stanza(self, stanza):
# TODO: Move to GUI? # TODO: Move to GUI?
@ -674,7 +633,6 @@ class JingleSession(object):
attrs = {'action': action, attrs = {'action': action,
'sid': self.sid, 'sid': self.sid,
'initiator' : self.initiator} 'initiator' : self.initiator}
jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE)
if reason is not None: if reason is not None:
jingle.addChild(node=reason) jingle.addChild(node=reason)
@ -805,3 +763,5 @@ class JingleSession(object):
def content_negotiated(self, media): def content_negotiated(self, media):
gajim.nec.push_incoming_event(JingleConnectedReceivedEvent(None, gajim.nec.push_incoming_event(JingleConnectedReceivedEvent(None,
conn=self.connection, jingle_session=self, media=media)) conn=self.connection, jingle_session=self, media=media))