diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 20:54:02 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 20:54:02 +0000 |
| commit | dd7981da8ce9ae81b77c43c308cab8b664b63276 (patch) | |
| tree | d06cb20f9a9f0cd762aaf0e7206b0cf8faa0dcd5 /third_party/libjingle/mods-since-v0_4_0.diff | |
| parent | ce08079cf7f61aa56f11dd502690e4318b1db035 (diff) | |
| download | chromium_src-dd7981da8ce9ae81b77c43c308cab8b664b63276.zip chromium_src-dd7981da8ce9ae81b77c43c308cab8b664b63276.tar.gz chromium_src-dd7981da8ce9ae81b77c43c308cab8b664b63276.tar.bz2 | |
Split up PreXmppAuth and SaslHandler.
Created a X-GOOGLE-TOKEN-only SaslHandler class for use by sync.
BUG=38034
TEST=manual
Review URL: http://codereview.chromium.org/904006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle/mods-since-v0_4_0.diff')
| -rw-r--r-- | third_party/libjingle/mods-since-v0_4_0.diff | 51 |
1 files changed, 47 insertions, 4 deletions
diff --git a/third_party/libjingle/mods-since-v0_4_0.diff b/third_party/libjingle/mods-since-v0_4_0.diff index 94eb14d..307439e4 100644 --- a/third_party/libjingle/mods-since-v0_4_0.diff +++ b/third_party/libjingle/mods-since-v0_4_0.diff @@ -1317,6 +1317,13 @@ diff -r libjingle-0.4.0/talk/xmpp/jid.cc libjingle/files/talk/xmpp/jid.cc < #include "talk/xmpp/constants.h" --- > #include "talk/xmpp/xmppconstants.h" +diff -r libjingle-0.4.0/talk/xmpp/prexmppauth.h libjingle/files/talk/xmpp/prexmppauth.h +33d32 +< #include "talk/xmpp/saslhandler.h" +64c63 +< class PreXmppAuth : public SaslHandler { +--- +> class PreXmppAuth { diff -r libjingle-0.4.0/talk/xmpp/saslcookiemechanism.h libjingle/files/talk/xmpp/saslcookiemechanism.h 33c33 < #include "talk/xmpp/constants.h" @@ -1363,19 +1370,55 @@ diff -r libjingle-0.4.0/talk/xmpp/xmppclient.cc libjingle/files/talk/xmpp/xmppcl < #include "talk/xmpp/constants.h" --- > #include "talk/xmpp/xmppconstants.h" -261a262,263 +32a33 +> #include "talk/xmpp/saslhandler.h" +68a70 +> scoped_ptr<SaslHandler> sasl_handler_; +93c95,99 +< XmppClient::Connect(const XmppClientSettings & settings, const std::string & lang, AsyncSocket * socket, PreXmppAuth * pre_auth) { +--- +> XmppClient::Connect(const XmppClientSettings & settings, +> const std::string & lang, +> AsyncSocket * socket, +> PreXmppAuth * pre_auth, +> SaslHandler * sasl_handler) { +139a146 +> d_->sasl_handler_.reset(sasl_handler); +200a208,215 +> if (d_->sasl_handler_.get()) { +> d_->engine_->SetSaslHandler(d_->sasl_handler_.release()); +> } +> else { +> d_->engine_->SetSaslHandler(new PlainSaslHandler( +> d_->engine_->GetUser(), d_->pass_, d_->allow_plain_)); +> } +> +209,210d223 +< d_->engine_->SetSaslHandler(new PlainSaslHandler( +< d_->engine_->GetUser(), d_->pass_, d_->allow_plain_)); +253,254d265 +< // transfer ownership of pre_auth_ to engine +< d_->engine_->SetSaslHandler(d_->pre_auth_.release()); +261a273,274 > d_->pre_engine_error_ = XmppEngine::ERROR_SOCKET; > d_->pre_engine_subcode_ = d_->socket_->GetError(); -347c349 +347c360 < //#ifdef _DEBUG --- > //#if !defined(NDEBUG) -375c377 +375c388 < //#ifdef _DEBUG --- > //#if !defined(NDEBUG) diff -r libjingle-0.4.0/talk/xmpp/xmppclient.h libjingle/files/talk/xmpp/xmppclient.h -141c141 +42a43 +> class SaslHandler; +80c81,82 +< PreXmppAuth * preauth); +--- +> PreXmppAuth * preauth, +> SaslHandler * sasl_handler); +141c143 < std::string XmppClient::GetStateName(int state) const { --- > std::string GetStateName(int state) const { |