Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-17 15:25:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into staging

Browse Source
This commit is contained in:
Jeff Becker 2019-03-14 09:27:51 -04:00
commit 2147cc3685
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
5 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -74,7 +74,7 @@ add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fpermissive>)
add_compile_options(-Wno-unused-function -Wno-deprecated-declarations -Wno-unknown-pragmas)
if (USING_CLANG)
add_compile_options(-Wthread-safety -Wthread-safety-negative)
add_compile_options(-Wthread-safety)
endif()
if (WITH_COVERAGE)

18
docker/router.Dockerfile Normal file
View File

@ -0,0 +1,18 @@
FROM ubuntu:latest
RUN apt update && \
apt install -y build-essential cmake git libcap-dev curl ninja-build
WORKDIR /src/
COPY . /src/
# 12p/24l cores takes 8gb
ARG BIG_AND_FAST="false"
RUN if [ "false$BIG_AND_FAST" = "false" ] ; then make ; else make NINJA=ninja ; fi
RUN find . -name lokinet
RUN ./lokinet -g -f
RUN ./lokinet-bootstrap http://206.81.100.174/n-st-1.signed
CMD ["./lokinet"]
EXPOSE 1090/udp

4
llarp/dns/message.cpp
View File

@ -157,7 +157,7 @@ namespace llarp
{
if(questions.size())
{
hdr_fields |= flags_QR | flags_AA;
hdr_fields |= flags_QR | flags_AA | flags_RA;
const auto& question = questions[0];
ResourceRecord rec;
rec.rr_name = question.qname;
@ -175,7 +175,7 @@ namespace llarp
{
if(questions.size())
{
hdr_fields |= flags_QR | flags_AA;
hdr_fields |= flags_QR | flags_AA | flags_RA;
const auto& question = questions[0];
answers.emplace_back();
auto& rec = answers.back();

1
llarp/profiling.cpp
View File

@ -190,7 +190,6 @@ namespace llarp
if(!profile.BDecode(buf))
return false;
RouterID pk = k.base;
absl::WriterMutexLock l(&m_ProfilesMutex);
return m_Profiles.emplace(pk, profile).second;
}

5
llarp/profiling.hpp
View File

@ -69,13 +69,14 @@ namespace llarp
MarkPathSuccess(path::Path* p) LOCKS_EXCLUDED(m_ProfilesMutex);
void
Tick();
Tick() LOCKS_EXCLUDED(m_ProfilesMutex);
bool
BEncode(llarp_buffer_t* buf) const override LOCKS_EXCLUDED(m_ProfilesMutex);
bool
DecodeKey(const llarp_buffer_t& k, llarp_buffer_t* buf) override;
DecodeKey(const llarp_buffer_t& k, llarp_buffer_t* buf) override
SHARED_LOCKS_REQUIRED(m_ProfilesMutex);
bool
Load(const char* fname) LOCKS_EXCLUDED(m_ProfilesMutex);