diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 23:43:29 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 23:43:29 +0000 |
commit | 773f1d23da2eddbcf6eda173b4a027dc3a0baeb6 (patch) | |
tree | 7f249dfee18b9b51d0047565db1c27553338b9ae /remoting | |
parent | b984117d96c91bb2e9cdaec4ab7ee1ba81365d8f (diff) | |
download | chromium_src-773f1d23da2eddbcf6eda173b4a027dc3a0baeb6.zip chromium_src-773f1d23da2eddbcf6eda173b4a027dc3a0baeb6.tar.gz chromium_src-773f1d23da2eddbcf6eda173b4a027dc3a0baeb6.tar.bz2 |
Remove session-reject message from jingle_messages.
session-reject is not defined in Jingle spec.
BUG=None
TEST=Compiles.
Review URL: http://codereview.chromium.org/8028038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/protocol/jingle_messages.cc | 10 | ||||
-rw-r--r-- | remoting/protocol/jingle_messages.h | 1 | ||||
-rw-r--r-- | remoting/protocol/pepper_session.cc | 18 | ||||
-rw-r--r-- | remoting/protocol/pepper_session.h | 1 |
4 files changed, 2 insertions, 28 deletions
diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc index 44cc551..a7c71c3 100644 --- a/remoting/protocol/jingle_messages.cc +++ b/remoting/protocol/jingle_messages.cc @@ -29,7 +29,6 @@ const char kXmlNamespace[] = "http://www.w3.org/XML/1998/namespace"; const char kSessionInitiateAction[] = "session-initiate"; const char kSessionAcceptAction[] = "session-accept"; const char kSessionTerminateAction[] = "session-terminate"; -const char kSessionRejectAction[] = "session-return"; const char kTransportInfoAction[] = "transport-info"; const int kPortMin = 1000; @@ -142,8 +141,6 @@ bool JingleMessage::ParseXml(const buzz::XmlElement* stanza, action = SESSION_ACCEPT; } else if (action_str == kSessionTerminateAction) { action = SESSION_TERMINATE; - } else if (action_str == kSessionRejectAction) { - action = SESSION_REJECT; } else if (action_str == kTransportInfoAction) { action = TRANSPORT_INFO; } else { @@ -157,7 +154,7 @@ bool JingleMessage::ParseXml(const buzz::XmlElement* stanza, return false; } - if (action == SESSION_TERMINATE || action == SESSION_REJECT) { + if (action == SESSION_TERMINATE) { const XmlElement* reason_tag = jingle_tag->FirstNamed(QName(kJingleNamespace, "reason")); if (reason_tag && reason_tag->FirstElement()) @@ -241,9 +238,6 @@ buzz::XmlElement* JingleMessage::ToXml() { case SESSION_TERMINATE: action_attr = kSessionTerminateAction; break; - case SESSION_REJECT: - action_attr = kSessionRejectAction; - break; case TRANSPORT_INFO: action_attr = kTransportInfoAction; break; @@ -256,7 +250,7 @@ buzz::XmlElement* JingleMessage::ToXml() { if (action == SESSION_INITIATE) jingle_tag->AddAttr(QName(kEmptyNamespace, "initiator"), from); - if (action == SESSION_TERMINATE || action == SESSION_REJECT) { + if (action == SESSION_TERMINATE) { XmlElement* reason_tag = new XmlElement(QName(kJingleNamespace, "reason")); jingle_tag->AddElement(reason_tag); diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h index 0d20cd3..f997de8 100644 --- a/remoting/protocol/jingle_messages.h +++ b/remoting/protocol/jingle_messages.h @@ -29,7 +29,6 @@ struct JingleMessage { UNKNOWN_ACTION, SESSION_INITIATE, SESSION_ACCEPT, - SESSION_REJECT, SESSION_TERMINATE, TRANSPORT_INFO, }; diff --git a/remoting/protocol/pepper_session.cc b/remoting/protocol/pepper_session.cc index 03167a90..e7cdf15 100644 --- a/remoting/protocol/pepper_session.cc +++ b/remoting/protocol/pepper_session.cc @@ -222,10 +222,6 @@ void PepperSession::OnIncomingMessage(const JingleMessage& message, ProcessTransportInfo(message); break; - case JingleMessage::SESSION_REJECT: - OnReject(message, reply); - break; - case JingleMessage::SESSION_TERMINATE: OnTerminate(message, reply); break; @@ -267,23 +263,9 @@ void PepperSession::ProcessTransportInfo(const JingleMessage& message) { } } -void PepperSession::OnReject(const JingleMessage& message, - JingleMessageReply* reply) { - if (state_ != CONNECTING) { - *reply = JingleMessageReply(JingleMessageReply::UNEXPECTED_REQUEST); - return; - } - - // TODO(sergeyu): Parse exact rejection reason from reply and pass it - // to OnError(). - OnError(ERROR_SESSION_REJECTED); -} - void PepperSession::OnTerminate(const JingleMessage& message, JingleMessageReply* reply) { if (state_ == CONNECTING) { - // If we are not connected yet, then interpret terminate message - // as rejection. OnError(ERROR_SESSION_REJECTED); return; } diff --git a/remoting/protocol/pepper_session.h b/remoting/protocol/pepper_session.h index 99b9f6a..93bb6ef 100644 --- a/remoting/protocol/pepper_session.h +++ b/remoting/protocol/pepper_session.h @@ -107,7 +107,6 @@ class PepperSession : public Session { // Message handlers for incoming messages. void OnAccept(const JingleMessage& message, JingleMessageReply* reply); - void OnReject(const JingleMessage& message, JingleMessageReply* reply); void OnTerminate(const JingleMessage& message, JingleMessageReply* reply); void ProcessTransportInfo(const JingleMessage& message); |