sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Upgrade gloox to the development trunk version on Windows, refs #3004. This commit needs a rebuild of the glooxwrapper.

Browse Source 
This fixes #4705: the TLS connection now works on Windows, also tested
with certificate verification and with TLSv1.2 (so TLSv1.0 can now be
disabled server-side).

Ideally we should have waited for the release of version 1.0.25, but the
development seems to have mostly stopped upstream.

Tested By: maroder
Differential Revision: https://code.wildfiregames.com/D4910
This was SVN commit r27490.
This commit is contained in:
Nicolas Auvray 2023-01-26 15:43:42 +00:00
parent f88b1a88f6
commit fa1fc26241
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/lobby/glooxwrapper/glooxwrapper.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2023 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -209,7 +209,11 @@ public:
m_Wrapped->handleAlreadyRegistered(fromWrapped);
}
#if OS_WIN
virtual void handleRegistrationResult(const gloox::JID& from, gloox::RegistrationResult regResult, const gloox::Error* UNUSED(error))
#else
virtual void handleRegistrationResult(const gloox::JID& from, gloox::RegistrationResult regResult)
#endif
{
glooxwrapper::JID fromWrapped(from);
m_Wrapped->handleRegistrationResult(fromWrapped, regResult);
@ -691,8 +695,10 @@ bool glooxwrapper::Registration::createAccount(int fields, const glooxwrapper::R
COPY(phone);
COPY(url);
COPY(date);
#if !OS_WIN
COPY(misc);
COPY(text);
#endif
#undef COPY
return m_Wrapped->createAccount(fields, valuesUnwrapped);
}

4
source/lobby/glooxwrapper/glooxwrapper.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2023 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -320,8 +320,10 @@ namespace glooxwrapper
string phone;
string url;
string date;
#if !OS_WIN
string misc;
string text;
#endif
};
struct MUCRoomParticipant