Skip to content

Fix compilation with boost >= 1.86 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chocobo1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compilation with boost >= 1.86 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a928a42
Fix compilation with boost >= 1.86
Chocobo1 Dec 30, 2024
ec453c1
Remove non-existent header
Chocobo1 Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/city.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,6 @@ uint128 CityHash128(const char *s, size_t len) {
}

#ifdef __SSE4_2__
#include <citycrc.h>
#include <nmmintrin.h>

// Requires len >= 240.
Expand Down
25 changes: 24 additions & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <cinttypes> // for PRId64
#include <array>

#if BOOST_VERSION < 106600
#include <boost/uuid/sha1.hpp>
#else
#include <boost/uuid/detail/sha1.hpp>
#endif
#include <boost/crc.hpp>
#include <boost/system/error_code.hpp>
#include <boost/circular_buffer.hpp>
Expand Down Expand Up @@ -324,13 +328,21 @@ void generate_id_sha1(address const& ip_, boost::uint32_t r, char* id)
sha1 ctx;
ctx.process_bytes(ip, 4);
ctx.process_byte(rand);
#if BOOST_VERSION >= 108600
boost::uuids::detail::sha1::digest_type d;
ctx.get_digest(d);
id[0] = d[0];
id[1] = d[1];
id[2] = d[2];
id[3] = d[3];
#else
uint32_t d[5];
ctx.get_digest(d);

id[0] = (d[0] >> 24) & 0xff;
id[1] = (d[0] >> 16) & 0xff;
id[2] = (d[0] >> 8) & 0xff;
id[3] = d[0] & 0xff;
#endif

for (int i = 4; i < 19; ++i) id[i] = std::rand();
id[19] = r;
Expand Down Expand Up @@ -407,6 +419,16 @@ std::array<char, 4> compute_tid(uint8_t const* secret, char const* remote_ip
sha1 ctx;
ctx.process_bytes(secret, 20);
ctx.process_bytes(remote_ip, ip_len);
#if BOOST_VERSION >= 108600
boost::uuids::detail::sha1::digest_type d;
ctx.get_digest(d);
return {{
char(d[0]),
char(d[1]),
char(d[2]),
char(d[3])
}};
#else
std::uint32_t d[5];
ctx.get_digest(d);
return {{
Expand All @@ -415,6 +437,7 @@ std::array<char, 4> compute_tid(uint8_t const* secret, char const* remote_ip
char((d[0] >> 8) & 0xff),
char(d[0] & 0xff)
}};
#endif
}

bool verify_tid(span<char> tid, uint8_t const* secret1, uint8_t const* secret2
Expand Down