dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Store the glooxRegistration inside the XmppClient

Browse source
This commit is contained in:
phosit 2026-03-27 19:51:03 +01:00
parent 4a5b5ddfad
commit 1da954d455
No known key found for this signature in database
GPG key ID: C9430B600671C268
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/lobby/XmppClient.cpp
View file

@ -139,7 +139,7 @@ XmppClient::XmppClient(const ScriptInterface* scriptInterface, const std::string
// If we are registering, only use the server name
m_client{CreateClient(regOpt, sUsername, m_server, sPassword)},
m_mucRoom{CreateMucRoom(this, regOpt, m_client, sRoom, m_server, sNick)},
m_registration(nullptr),
m_registration{&m_client},
m_sessionManager{&m_client, this},
m_regOpt(regOpt),
m_username(sUsername),
@ -190,8 +190,7 @@ XmppClient::XmppClient(const ScriptInterface* scriptInterface, const std::string
m_client.registerMessageHandler(this);
m_registration = new gloox::Registration(&m_client);
m_registration->registerRegistrationHandler(this);
m_registration.registerRegistrationHandler(this);
// Uncomment to see the raw stanzas
// m_client.logInstance().registerLogHandler(gloox::LogLevelDebug, gloox::LogAreaAll, this);
@ -212,7 +211,6 @@ XmppClient::~XmppClient()
this->disconnect();
DbgXMPP("XmppClient destroyed");
delete m_registration;
// Workaround for memory leak in gloox 1.0/1.0.1
m_client.removePresenceExtension(gloox::ExtCaps);
@ -264,7 +262,7 @@ void XmppClient::onConnect()
}
if (m_regOpt)
m_registration->fetchRegistrationFields();
m_registration.fetchRegistrationFields();
}
/**
@ -537,7 +535,7 @@ void XmppClient::handleRegistrationFields(const gloox::JID&, int fields, std::st
gloox::RegistrationFields vals;
vals.username = m_username;
vals.password = m_password;
m_registration->createAccount(fields, vals);
m_registration.createAccount(fields, vals);
}
#if GLOOXVERSION >= 0x010100
@ -1213,7 +1211,7 @@ std::string XmppClient::GetUsername() const
*/
void XmppClient::ChangePassword(const std::string& newPassword)
{
m_registration->changePassword(m_client.jid().username(), newPassword);
m_registration.changePassword(m_client.jid().username(), newPassword);
}
/**

2
source/lobby/XmppClient.h
View file

@ -49,7 +49,7 @@ private:
// Components
gloox::Client m_client;
std::optional<gloox::MUCRoom> m_mucRoom;
gloox::Registration* m_registration;
gloox::Registration m_registration;
gloox::Jingle::SessionManager m_sessionManager;
// Account infos