summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc68
1 files changed, 34 insertions, 34 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc
index 470c2dc2..9b3fe9bc 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc
@@ -127,11 +127,11 @@ XmppLoginTask::Advance() {
}
case LOGINSTATE_TLS_INIT: {
- const XmlElement * pelTls = GetFeature(QN_TLS_STARTTLS);
+ const XmlElement * pelTls = GetFeature(TQN_TLS_STARTTLS);
if (!pelTls)
return Failure(XmppEngine::ERROR_TLS);
- XmlElement el(QN_TLS_STARTTLS, true);
+ XmlElement el(TQN_TLS_STARTTLS, true);
pctx_->InternalSendStanza(&el);
state_ = LOGINSTATE_TLS_REQUESTED;
continue;
@@ -140,7 +140,7 @@ XmppLoginTask::Advance() {
case LOGINSTATE_TLS_REQUESTED: {
if (NULL == (element = NextStanza()))
return true;
- if (element->Name() != QN_TLS_PROCEED)
+ if (element->Name() != TQN_TLS_PROCEED)
return Failure(XmppEngine::ERROR_TLS);
// The proper domain to verify against is the real underlying
@@ -155,7 +155,7 @@ XmppLoginTask::Advance() {
}
case LOGINSTATE_AUTH_INIT: {
- const XmlElement * pelSaslAuth = GetFeature(QN_SASL_MECHANISMS);
+ const XmlElement * pelSaslAuth = GetFeature(TQN_SASL_MECHANISMS);
if (!pelSaslAuth) {
return Failure(XmppEngine::ERROR_AUTH);
}
@@ -163,9 +163,9 @@ XmppLoginTask::Advance() {
// Collect together the SASL auth mechanisms presented by the server
std::vector<std::string> mechanisms;
for (const XmlElement * pelMech =
- pelSaslAuth->FirstNamed(QN_SASL_MECHANISM);
+ pelSaslAuth->FirstNamed(TQN_SASL_MECHANISM);
pelMech;
- pelMech = pelMech->NextNamed(QN_SASL_MECHANISM)) {
+ pelMech = pelMech->NextNamed(TQN_SASL_MECHANISM)) {
mechanisms.push_back(pelMech->BodyText());
}
@@ -199,7 +199,7 @@ XmppLoginTask::Advance() {
return true;
if (element->Name().Namespace() != NS_SASL)
return Failure(XmppEngine::ERROR_AUTH);
- if (element->Name() == QN_SASL_CHALLENGE) {
+ if (element->Name() == TQN_SASL_CHALLENGE) {
XmlElement * response = sasl_mech_->HandleSaslChallenge(element);
if (response == NULL) {
return Failure(XmppEngine::ERROR_AUTH);
@@ -209,7 +209,7 @@ XmppLoginTask::Advance() {
state_ = LOGINSTATE_SASL_RUNNING;
continue;
}
- if (element->Name() != QN_SASL_SUCCESS) {
+ if (element->Name() != TQN_SASL_SUCCESS) {
return Failure(XmppEngine::ERROR_UNAUTHORIZED);
}
@@ -220,20 +220,20 @@ XmppLoginTask::Advance() {
}
case LOGINSTATE_BIND_INIT: {
- const XmlElement * pelBindFeature = GetFeature(QN_BIND_BIND);
- const XmlElement * pelSessionFeature = GetFeature(QN_SESSION_SESSION);
+ const XmlElement * pelBindFeature = GetFeature(TQN_BIND_BIND);
+ const XmlElement * pelSessionFeature = GetFeature(TQN_SESSION_SESSION);
if (!pelBindFeature || !pelSessionFeature)
return Failure(XmppEngine::ERROR_BIND);
- XmlElement iq(QN_IQ);
- iq.AddAttr(QN_TYPE, "set");
+ XmlElement iq(TQN_IQ);
+ iq.AddAttr(TQN_TYPE, "set");
iqId_ = pctx_->NextId();
- iq.AddAttr(QN_ID, iqId_);
- iq.AddElement(new XmlElement(QN_BIND_BIND, true));
+ iq.AddAttr(TQN_ID, iqId_);
+ iq.AddElement(new XmlElement(TQN_BIND_BIND, true));
if (pctx_->requested_resource_ != STR_EMPTY) {
- iq.AddElement(new XmlElement(QN_BIND_RESOURCE), 1);
+ iq.AddElement(new XmlElement(TQN_BIND_RESOURCE), 1);
iq.AddText(pctx_->requested_resource_, 2);
}
pctx_->InternalSendStanza(&iq);
@@ -245,15 +245,15 @@ XmppLoginTask::Advance() {
if (NULL == (element = NextStanza()))
return true;
- if (element->Name() != QN_IQ || element->Attr(QN_ID) != iqId_ ||
- element->Attr(QN_TYPE) == "get" || element->Attr(QN_TYPE) == "set")
+ if (element->Name() != TQN_IQ || element->Attr(TQN_ID) != iqId_ ||
+ element->Attr(TQN_TYPE) == "get" || element->Attr(TQN_TYPE) == "set")
return true;
- if (element->Attr(QN_TYPE) != "result" || element->FirstElement() == NULL ||
- element->FirstElement()->Name() != QN_BIND_BIND)
+ if (element->Attr(TQN_TYPE) != "result" || element->FirstElement() == NULL ||
+ element->FirstElement()->Name() != TQN_BIND_BIND)
return Failure(XmppEngine::ERROR_BIND);
- fullJid_ = Jid(element->FirstElement()->TextNamed(QN_BIND_JID));
+ fullJid_ = Jid(element->FirstElement()->TextNamed(TQN_BIND_JID));
if (!fullJid_.IsFull()) {
return Failure(XmppEngine::ERROR_BIND);
}
@@ -264,12 +264,12 @@ XmppLoginTask::Advance() {
}
// now request session
- XmlElement iq(QN_IQ);
- iq.AddAttr(QN_TYPE, "set");
+ XmlElement iq(TQN_IQ);
+ iq.AddAttr(TQN_TYPE, "set");
iqId_ = pctx_->NextId();
- iq.AddAttr(QN_ID, iqId_);
- iq.AddElement(new XmlElement(QN_SESSION_SESSION, true));
+ iq.AddAttr(TQN_ID, iqId_);
+ iq.AddElement(new XmlElement(TQN_SESSION_SESSION, true));
pctx_->InternalSendStanza(&iq);
state_ = LOGINSTATE_SESSION_REQUESTED;
@@ -279,11 +279,11 @@ XmppLoginTask::Advance() {
case LOGINSTATE_SESSION_REQUESTED: {
if (NULL == (element = NextStanza()))
return true;
- if (element->Name() != QN_IQ || element->Attr(QN_ID) != iqId_ ||
- element->Attr(QN_TYPE) == "get" || element->Attr(QN_TYPE) == "set")
+ if (element->Name() != TQN_IQ || element->Attr(TQN_ID) != iqId_ ||
+ element->Attr(TQN_TYPE) == "get" || element->Attr(TQN_TYPE) == "set")
return false;
- if (element->Attr(QN_TYPE) != "result")
+ if (element->Attr(TQN_TYPE) != "result")
return Failure(XmppEngine::ERROR_BIND);
pctx_->SignalBound(fullJid_);
@@ -301,26 +301,26 @@ XmppLoginTask::Advance() {
bool
XmppLoginTask::HandleStartStream(const XmlElement *element) {
- if (element->Name() != QN_STREAM_STREAM)
+ if (element->Name() != TQN_STREAM_STREAM)
return false;
- if (element->Attr(QN_XMLNS) != "jabber:client")
+ if (element->Attr(TQN_XMLNS) != "jabber:client")
return false;
- if (element->Attr(QN_VERSION) != "1.0")
+ if (element->Attr(TQN_VERSION) != "1.0")
return false;
- if (!element->HasAttr(QN_ID))
+ if (!element->HasAttr(TQN_ID))
return false;
- streamId_ = element->Attr(QN_ID);
+ streamId_ = element->Attr(TQN_ID);
return true;
}
bool
XmppLoginTask::HandleFeatures(const XmlElement *element) {
- if (element->Name() != QN_STREAM_FEATURES)
+ if (element->Name() != TQN_STREAM_FEATURES)
return false;
pelFeatures_.reset(new XmlElement(*element));
@@ -328,7 +328,7 @@ XmppLoginTask::HandleFeatures(const XmlElement *element) {
}
const XmlElement *
-XmppLoginTask::GetFeature(const QName & name) {
+XmppLoginTask::GetFeature(const TQName & name) {
return pelFeatures_->FirstNamed(name);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 01:26:33 +0000