aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/depends/toolchain.cmake.in10
-rw-r--r--contrib/epee/demo/iface/transport_defs.h2
-rw-r--r--contrib/epee/include/console_handler.h10
-rw-r--r--contrib/epee/include/hex.h29
-rw-r--r--contrib/epee/include/net/abstract_tcp_server2.inl21
-rw-r--r--contrib/epee/include/net/http_protocol_handler.h2
-rw-r--r--contrib/epee/include/net/levin_protocol_handler_async.h7
-rw-r--r--contrib/epee/include/net/munin_connection_handler.h2
-rw-r--r--contrib/epee/include/net/net_utils_base.h8
-rw-r--r--contrib/epee/include/serialization/keyvalue_serialization.h2
-rw-r--r--contrib/epee/include/storages/parserse_base_utils.h2
-rw-r--r--contrib/epee/include/storages/portable_storage_base.h7
-rw-r--r--contrib/epee/include/string_tools.h43
-rw-r--r--contrib/epee/src/hex.cpp41
-rw-r--r--contrib/epee/src/wipeable_string.cpp7
-rw-r--r--contrib/gitian/README.md6
-rwxr-xr-xcontrib/gitian/gitian-build.py11
17 files changed, 141 insertions, 69 deletions
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index c56f3eb2e..2634423ab 100644
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -136,11 +136,21 @@ endif()
if(ARCHITECTURE STREQUAL "i686")
SET(ARCH_ID "i386")
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ set(BUILD_TAG "linux-x86")
SET(LINUX_32 ON)
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+ set(BUILD_TAG "win-x32")
endif()
endif()
if(ARCHITECTURE STREQUAL "x86_64")
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ set(BUILD_TAG "linux-x64")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ set(BUILD_TAG "freebsd-x64")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+ set(BUILD_TAG "win-x64")
+ endif()
SET(ARCH_ID "x86_64")
endif()
diff --git a/contrib/epee/demo/iface/transport_defs.h b/contrib/epee/demo/iface/transport_defs.h
index 8638b5db9..61968ed71 100644
--- a/contrib/epee/demo/iface/transport_defs.h
+++ b/contrib/epee/demo/iface/transport_defs.h
@@ -218,7 +218,7 @@ namespace demo
s.m_subobj.m_str = "subszzzzzzzz";
s.m_list_of_self.push_back(s);
- s.m_storage_entry_int = epee::serialization::storage_entry(uint64_t(22222));;
+ s.m_storage_entry_int = epee::serialization::storage_entry(uint64_t(22222));
s.m_storage_entry_string = epee::serialization::storage_entry(std::string("sdsvsdvs"));
return s;
}
diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h
index 1b716fca4..a7788aeb8 100644
--- a/contrib/epee/include/console_handler.h
+++ b/contrib/epee/include/console_handler.h
@@ -606,11 +606,15 @@ eof:
async_console_handler m_console_handler;
public:
~console_handlers_binder() {
- stop_handling();
- if (m_console_thread.get() != nullptr)
+ try
{
- m_console_thread->join();
+ stop_handling();
+ if (m_console_thread.get() != nullptr)
+ {
+ m_console_thread->join();
+ }
}
+ catch (const std::exception &e) { /* ignore */ }
}
bool start_handling(std::function<std::string(void)> prompt, const std::string& usage_string = "", std::function<void(void)> exit_handler = NULL)
diff --git a/contrib/epee/include/hex.h b/contrib/epee/include/hex.h
index 6e720f128..8443cb92f 100644
--- a/contrib/epee/include/hex.h
+++ b/contrib/epee/include/hex.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2019, The Monero Project
+// Copyright (c) 2017-2020, The Monero Project
//
// All rights reserved.
//
@@ -51,12 +51,22 @@ namespace epee
template<std::size_t N>
static std::array<char, N * 2> array(const std::array<std::uint8_t, N>& src) noexcept
{
- std::array<char, N * 2> out{{}};
+ std::array<char, N * 2> out;
static_assert(N <= 128, "keep the stack size down");
buffer_unchecked(out.data(), {src.data(), src.size()});
return out;
}
+ //! \return An array containing hex of `src`.
+ template<typename T>
+ static std::array<char, sizeof(T) * 2> array(const T& src) noexcept
+ {
+ std::array<char, sizeof(T) * 2> out;
+ static_assert(sizeof(T) <= 128, "keep the stack size down");
+ buffer_unchecked(out.data(), as_byte_span(src));
+ return out;
+ }
+
//! Append `src` as hex to `out`.
static void buffer(std::ostream& out, const span<const std::uint8_t> src);
@@ -70,9 +80,20 @@ namespace epee
static void buffer_unchecked(char* out, const span<const std::uint8_t> src) noexcept;
};
+ //! Convert hex in UTF8 encoding to binary
struct from_hex
{
- //! \return An std::vector of unsigned integers from the `src`
- static std::vector<uint8_t> vector(boost::string_ref src);
+ static bool to_string(std::string& out, boost::string_ref src);
+
+ static bool to_buffer(span<std::uint8_t> out, boost::string_ref src) noexcept;
+
+ private:
+ static bool to_buffer_unchecked(std::uint8_t* out, boost::string_ref src) noexcept;
+ };
+
+ //! Convert hex in current C locale encoding to binary
+ struct from_hex_locale
+ {
+ static std::vector<uint8_t> to_vector(boost::string_ref src);
};
}
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 128ff10aa..43ede3cc1 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -363,8 +363,8 @@ PRAGMA_WARNING_DISABLE_VS(4355)
}
delay *= 0.5;
- if (delay > 0) {
- long int ms = (long int)(delay * 100);
+ long int ms = (long int)(delay * 100);
+ if (ms > 0) {
reset_timer(boost::posix_time::milliseconds(ms + 1), true);
boost::this_thread::sleep_for(boost::chrono::milliseconds(ms));
}
@@ -721,7 +721,9 @@ PRAGMA_WARNING_DISABLE_VS(4355)
boost::posix_time::milliseconds connection<t_protocol_handler>::get_timeout_from_bytes_read(size_t bytes)
{
boost::posix_time::milliseconds ms = (boost::posix_time::milliseconds)(unsigned)(bytes * TIMEOUT_EXTRA_MS_PER_BYTE);
- ms += m_timer.expires_from_now();
+ const auto cur = m_timer.expires_from_now().total_milliseconds();
+ if (cur > 0)
+ ms += (boost::posix_time::milliseconds)cur;
if (ms > get_default_timeout())
ms = get_default_timeout();
return ms;
@@ -747,7 +749,12 @@ PRAGMA_WARNING_DISABLE_VS(4355)
template<class t_protocol_handler>
void connection<t_protocol_handler>::reset_timer(boost::posix_time::milliseconds ms, bool add)
{
- MTRACE("Setting " << ms << " expiry");
+ if (ms.total_milliseconds() < 0)
+ {
+ MWARNING("Ignoring negative timeout " << ms);
+ return;
+ }
+ MTRACE((add ? "Adding" : "Setting") << " " << ms << " expiry");
auto self = safe_shared_from_this();
if(!self)
{
@@ -760,7 +767,11 @@ PRAGMA_WARNING_DISABLE_VS(4355)
return;
}
if (add)
- ms += m_timer.expires_from_now();
+ {
+ const auto cur = m_timer.expires_from_now().total_milliseconds();
+ if (cur > 0)
+ ms += (boost::posix_time::milliseconds)cur;
+ }
m_timer.expires_from_now(ms);
m_timer.async_wait([=](const boost::system::error_code& ec)
{
diff --git a/contrib/epee/include/net/http_protocol_handler.h b/contrib/epee/include/net/http_protocol_handler.h
index 1780f2393..a29f141e8 100644
--- a/contrib/epee/include/net/http_protocol_handler.h
+++ b/contrib/epee/include/net/http_protocol_handler.h
@@ -202,7 +202,7 @@ namespace net_utils
virtual bool thread_init()
{
- return m_config.m_phandler->init_server_thread();;
+ return m_config.m_phandler->init_server_thread();
}
virtual bool thread_deinit()
diff --git a/contrib/epee/include/net/levin_protocol_handler_async.h b/contrib/epee/include/net/levin_protocol_handler_async.h
index 5774c0ba7..1341a4ae6 100644
--- a/contrib/epee/include/net/levin_protocol_handler_async.h
+++ b/contrib/epee/include/net/levin_protocol_handler_async.h
@@ -949,7 +949,12 @@ bool async_protocol_handler_config<t_connection_context>::close(boost::uuids::uu
{
CRITICAL_REGION_LOCAL(m_connects_lock);
async_protocol_handler<t_connection_context>* aph = find_connection(connection_id);
- return 0 != aph ? aph->close() : false;
+ if (!aph)
+ return false;
+ if (!aph->close())
+ return false;
+ m_connects.erase(connection_id);
+ return true;
}
//------------------------------------------------------------------------------------------
template<class t_connection_context>
diff --git a/contrib/epee/include/net/munin_connection_handler.h b/contrib/epee/include/net/munin_connection_handler.h
index 62856bec5..20dc38507 100644
--- a/contrib/epee/include/net/munin_connection_handler.h
+++ b/contrib/epee/include/net/munin_connection_handler.h
@@ -237,7 +237,7 @@ namespace net_utils
return send_hook("Unknown command. Try list, nodes, config, fetch, version or quit\n");
}
- return send_hook("Unknown command. Try list, nodes, config, fetch, version or quit\n");;
+ return send_hook("Unknown command. Try list, nodes, config, fetch, version or quit\n");
}
bool handle_list_command()
diff --git a/contrib/epee/include/net/net_utils_base.h b/contrib/epee/include/net/net_utils_base.h
index 028e605d7..d86c62c17 100644
--- a/contrib/epee/include/net/net_utils_base.h
+++ b/contrib/epee/include/net/net_utils_base.h
@@ -94,17 +94,13 @@ namespace net_utils
BEGIN_KV_SERIALIZE_MAP()
if (is_store)
{
- KV_SERIALIZE_VAL_POD_AS_BLOB_N(m_ip, "ip")
uint32_t ip = SWAP32LE(this_ref.m_ip);
epee::serialization::selector<is_store>::serialize(ip, stg, hparent_section, "m_ip");
}
else
{
- if (!epee::serialization::selector<is_store>::serialize_t_val_as_blob(this_ref.m_ip, stg, hparent_section, "ip"))
- {
- KV_SERIALIZE(m_ip)
- const_cast<ipv4_network_address&>(this_ref).m_ip = SWAP32LE(this_ref.m_ip);
- }
+ KV_SERIALIZE(m_ip)
+ const_cast<ipv4_network_address&>(this_ref).m_ip = SWAP32LE(this_ref.m_ip);
}
KV_SERIALIZE(m_port)
END_KV_SERIALIZE_MAP()
diff --git a/contrib/epee/include/serialization/keyvalue_serialization.h b/contrib/epee/include/serialization/keyvalue_serialization.h
index 78d294d05..fd343865c 100644
--- a/contrib/epee/include/serialization/keyvalue_serialization.h
+++ b/contrib/epee/include/serialization/keyvalue_serialization.h
@@ -89,6 +89,8 @@ public: \
#define KV_SERIALIZE_OPT_N(variable, val_name, default_value) \
do { \
+ if (is_store && this_ref.variable == default_value) \
+ break; \
if (!epee::serialization::selector<is_store>::serialize(this_ref.variable, stg, hparent_section, val_name)) \
epee::serialize_default(this_ref.variable, default_value); \
} while (0);
diff --git a/contrib/epee/include/storages/parserse_base_utils.h b/contrib/epee/include/storages/parserse_base_utils.h
index 8a498130c..2256f6b83 100644
--- a/contrib/epee/include/storages/parserse_base_utils.h
+++ b/contrib/epee/include/storages/parserse_base_utils.h
@@ -31,6 +31,8 @@
#include <algorithm>
#include <boost/utility/string_ref.hpp>
+#include "misc_log_ex.h"
+
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "serialization"
diff --git a/contrib/epee/include/storages/portable_storage_base.h b/contrib/epee/include/storages/portable_storage_base.h
index 40c7524fb..1676f41fb 100644
--- a/contrib/epee/include/storages/portable_storage_base.h
+++ b/contrib/epee/include/storages/portable_storage_base.h
@@ -84,6 +84,13 @@ namespace epee
array_entry_t():m_it(m_array.end()){}
array_entry_t(const array_entry_t& other):m_array(other.m_array), m_it(m_array.end()){}
+ array_entry_t& operator=(const array_entry_t& other)
+ {
+ m_array = other.m_array;
+ m_it = m_array.end();
+ return *this;
+ }
+
const t_entry_type* get_first_val() const
{
m_it = m_array.begin();
diff --git a/contrib/epee/include/string_tools.h b/contrib/epee/include/string_tools.h
index 319c0121b..2d9317d60 100644
--- a/contrib/epee/include/string_tools.h
+++ b/contrib/epee/include/string_tools.h
@@ -42,6 +42,7 @@
#include <type_traits>
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string/predicate.hpp>
+#include <boost/utility/string_ref.hpp>
#include "misc_log_ex.h"
#include "storages/parserse_base_utils.h"
#include "hex.h"
@@ -69,34 +70,9 @@ namespace string_tools
return to_hex::string(to_byte_span(to_span(src)));
}
//----------------------------------------------------------------------------
- inline bool parse_hexstr_to_binbuff(const epee::span<const char> s, epee::span<char>& res)
+ inline bool parse_hexstr_to_binbuff(const boost::string_ref s, std::string& res)
{
- if (s.size() != res.size() * 2)
- return false;
-
- unsigned char *dst = (unsigned char *)&res[0];
- const unsigned char *src = (const unsigned char *)s.data();
- for(size_t i = 0; i < s.size(); i += 2)
- {
- int tmp = *src++;
- tmp = epee::misc_utils::parse::isx[tmp];
- if (tmp == 0xff) return false;
- int t2 = *src++;
- t2 = epee::misc_utils::parse::isx[t2];
- if (t2 == 0xff) return false;
- *dst++ = (tmp << 4) | t2;
- }
-
- return true;
- }
- //----------------------------------------------------------------------------
- inline bool parse_hexstr_to_binbuff(const std::string& s, std::string& res)
- {
- if (s.size() & 1)
- return false;
- res.resize(s.size() / 2);
- epee::span<char> rspan((char*)&res[0], res.size());
- return parse_hexstr_to_binbuff(epee::to_span(s), rspan);
+ return from_hex::to_string(res, s);
}
//----------------------------------------------------------------------------
PUSH_WARNINGS
@@ -303,23 +279,20 @@ POP_WARNINGS
}
//----------------------------------------------------------------------------
template<class t_pod_type>
- bool hex_to_pod(const std::string& hex_str, t_pod_type& s)
+ bool hex_to_pod(const boost::string_ref hex_str, t_pod_type& s)
{
- static_assert(std::is_pod<t_pod_type>::value, "expected pod type");
- if(sizeof(s)*2 != hex_str.size())
- return false;
- epee::span<char> rspan((char*)&s, sizeof(s));
- return parse_hexstr_to_binbuff(epee::to_span(hex_str), rspan);
+ static_assert(std::is_standard_layout<t_pod_type>(), "expected standard layout type");
+ return from_hex::to_buffer(as_mut_byte_span(s), hex_str);
}
//----------------------------------------------------------------------------
template<class t_pod_type>
- bool hex_to_pod(const std::string& hex_str, tools::scrubbed<t_pod_type>& s)
+ bool hex_to_pod(const boost::string_ref hex_str, tools::scrubbed<t_pod_type>& s)
{
return hex_to_pod(hex_str, unwrap(s));
}
//----------------------------------------------------------------------------
template<class t_pod_type>
- bool hex_to_pod(const std::string& hex_str, epee::mlocked<t_pod_type>& s)
+ bool hex_to_pod(const boost::string_ref hex_str, epee::mlocked<t_pod_type>& s)
{
return hex_to_pod(hex_str, unwrap(s));
}
diff --git a/contrib/epee/src/hex.cpp b/contrib/epee/src/hex.cpp
index 558983f7e..b25ce5421 100644
--- a/contrib/epee/src/hex.cpp
+++ b/contrib/epee/src/hex.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2019, The Monero Project
+// Copyright (c) 2017-2020, The Monero Project
//
// All rights reserved.
//
@@ -33,6 +33,8 @@
#include <ostream>
#include <stdexcept>
+#include "storages/parserse_base_utils.h"
+
namespace epee
{
namespace
@@ -84,7 +86,42 @@ namespace epee
return write_hex(out, src);
}
- std::vector<uint8_t> from_hex::vector(boost::string_ref src)
+
+ bool from_hex::to_string(std::string& out, const boost::string_ref src)
+ {
+ out.resize(src.size() / 2);
+ return to_buffer_unchecked(reinterpret_cast<std::uint8_t*>(&out[0]), src);
+ }
+
+ bool from_hex::to_buffer(span<std::uint8_t> out, const boost::string_ref src) noexcept
+ {
+ if (src.size() / 2 != out.size())
+ return false;
+ return to_buffer_unchecked(out.data(), src);
+ }
+
+ bool from_hex::to_buffer_unchecked(std::uint8_t* dst, const boost::string_ref s) noexcept
+ {
+ if (s.size() % 2 != 0)
+ return false;
+
+ const unsigned char *src = (const unsigned char *)s.data();
+ for(size_t i = 0; i < s.size(); i += 2)
+ {
+ int tmp = *src++;
+ tmp = epee::misc_utils::parse::isx[tmp];
+ if (tmp == 0xff) return false;
+ int t2 = *src++;
+ t2 = epee::misc_utils::parse::isx[t2];
+ if (t2 == 0xff) return false;
+ *dst++ = (tmp << 4) | t2;
+ }
+
+ return true;
+ }
+
+
+ std::vector<uint8_t> from_hex_locale::to_vector(const boost::string_ref src)
{
// should we include a specific character
auto include = [](char input) {
diff --git a/contrib/epee/src/wipeable_string.cpp b/contrib/epee/src/wipeable_string.cpp
index 4209b71bf..4928db172 100644
--- a/contrib/epee/src/wipeable_string.cpp
+++ b/contrib/epee/src/wipeable_string.cpp
@@ -188,13 +188,14 @@ void wipeable_string::split(std::vector<wipeable_string> &fields) const
while (len--)
{
const char c = *ptr++;
- if (c != ' ')
+ const bool space_prev = space;
+ space = std::isspace(c);
+ if (!space)
{
- if (space)
+ if (space_prev)
fields.push_back({});
fields.back().push_back(c);
}
- space = c == ' ';
}
}
diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md
index 7e3502bcf..c09786c36 100644
--- a/contrib/gitian/README.md
+++ b/contrib/gitian/README.md
@@ -62,7 +62,7 @@ echo "%sudo ALL=NOPASSWD: /usr/bin/lxc-execute" >> /etc/sudoers.d/gitian-lxc
# make /etc/rc.local script that sets up bridge between guest and host
echo '#!/bin/sh -e' > /etc/rc.local
echo 'brctl addbr br0' >> /etc/rc.local
-echo 'ip addr add 10.0.3.1/24 broadcast 10.0.3.255 dev br0' >> /etc/rc.local
+echo 'ip addr add 10.0.2.2/24 broadcast 10.0.2.255 dev br0' >> /etc/rc.local
echo 'ip link set br0 up' >> /etc/rc.local
echo 'firewall-cmd --zone=trusted --add-interface=br0' >> /etc/rc.local
echo 'exit 0' >> /etc/rc.local
@@ -70,8 +70,8 @@ chmod +x /etc/rc.local
# make sure that USE_LXC is always set when logging in as gitianuser,
# and configure LXC IP addresses
echo 'export USE_LXC=1' >> /home/gitianuser/.profile
-echo 'export GITIAN_HOST_IP=10.0.3.1' >> /home/gitianuser/.profile
-echo 'export LXC_GUEST_IP=10.0.3.5' >> /home/gitianuser/.profile
+echo 'export GITIAN_HOST_IP=10.0.2.2' >> /home/gitianuser/.profile
+echo 'export LXC_GUEST_IP=10.0.2.5' >> /home/gitianuser/.profile
reboot
```
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py
index 0b36fb4a1..a8140a8a6 100755
--- a/contrib/gitian/gitian-build.py
+++ b/contrib/gitian/gitian-build.py
@@ -36,8 +36,11 @@ def setup():
os.chdir('..')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
- if not subprocess.call(['docker', '--help'], shell=False, stdout=subprocess.DEVNULL):
- print("Please install docker first manually")
+ try:
+ subprocess.check_output(['docker', '--help'])
+ except:
+ print("ERROR: Could not find 'docker' command. Ensure this is in your PATH.")
+ sys.exit(1)
make_image_prog += ['--docker']
elif not args.kvm:
make_image_prog += ['--lxc']
@@ -157,9 +160,9 @@ def main():
elif not args.kvm:
os.environ['USE_LXC'] = '1'
if not 'GITIAN_HOST_IP' in os.environ.keys():
- os.environ['GITIAN_HOST_IP'] = '10.0.3.1'
+ os.environ['GITIAN_HOST_IP'] = '10.0.2.2'
if not 'LXC_GUEST_IP' in os.environ.keys():
- os.environ['LXC_GUEST_IP'] = '10.0.3.5'
+ os.environ['LXC_GUEST_IP'] = '10.0.2.5'
# Disable MacOS build if no SDK found
args.nomac = False
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 04:58:22 +0000