add lint target for makefile using clang tidy

run make format
This commit is contained in:
Jeff Becker 2018-09-28 10:29:34 -04:00
parent 8878e5c4d1
commit 8a4b2e97a5
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
11 changed files with 37 additions and 27 deletions

View File

@ -36,6 +36,10 @@ TESTNET_CLIENTS ?= 50
TESTNET_SERVERS ?= 50
TESTNET_DEBUG ?= 0
LINT_FILES = $(wildcard llarp/*.cpp)
LINT_CHECK = $(LINT_FILES:.cpp=.cpp-check)
clean:
rm -f build.ninja rules.ninja cmake_install.cmake CMakeCache.txt
rm -rf CMakeFiles
@ -108,6 +112,11 @@ test: debug
format:
clang-format -i $$(find daemon llarp include | grep -E '\.[h,c](pp)?$$')
lint: $(LINT_CHECK)
%.cpp-check: %.cpp
clang-tidy $^ -- -I$(REPO)/include -I$(REPO)/vendor/cppbackport-master/lib -I$(REPO)/crypto/libntrup/include -I$(REPO)/llarp
install:
rm -f $(PREFIX)/bin/lokinet
cp $(EXE) $(PREFIX)/bin/lokinet

View File

@ -9,7 +9,7 @@
#include <llarp/threading.hpp> // for multithreaded version (multiplatorm)
#include <signal.h> // Linux needs this for SIGINT
#include <signal.h> // Linux needs this for SIGINT
// keep this once jeff reenables concurrency
#ifdef _MSC_VER
extern "C" void

View File

@ -9,7 +9,7 @@
#include <sys/socket.h>
#include <llarp/net.hpp> // for llarp::Addr
#include <llarp/net.hpp> // for llarp::Addr
// dnsc can work over any UDP socket
// however we can't ignore udp->user
@ -21,11 +21,12 @@ struct dns_tracker
// uint c_responses;
uint c_requests;
// request has to be a pointer
std::unordered_map< uint, std::unique_ptr< dnsc_answer_request > > client_request;
std::unordered_map< uint, std::unique_ptr< dnsc_answer_request > >
client_request;
// FIXME: support multiple dns server contexts
dnsd_context *dnsd;
// rn we need 1 tracker per DNSd and each DNSd needs it's own IP
//std::map< llarp::Addr, std::unique_ptr< dnsc_answer_request > > dnsds;
// std::map< llarp::Addr, std::unique_ptr< dnsc_answer_request > > dnsds;
// std::map< uint, dnsd_question_request * > daemon_request;
};

View File

@ -28,9 +28,9 @@ struct dns_iptracker
{
struct privatesInUse interfaces;
struct privatesInUse used_privates;
std::vector< std::unique_ptr <ip_range> > used_ten_ips;
std::vector< std::unique_ptr <ip_range> > used_seven_ips;
std::vector< std::unique_ptr <ip_range> > used_nine_ips;
std::vector< std::unique_ptr< ip_range > > used_ten_ips;
std::vector< std::unique_ptr< ip_range > > used_seven_ips;
std::vector< std::unique_ptr< ip_range > > used_nine_ips;
};
void

View File

@ -3,13 +3,13 @@
#ifdef __linux__
namespace llarp
{
namespace linux
namespace GNULinux
{
/// switch current process to use network namepsace by name
/// returns true if successfully switched otherwise returns false
bool
NetNSSwitch(const char* name);
} // namespace linux
} // namespace GNULinux
} // namespace llarp
#else
#error "Don't include this file"

View File

@ -40,9 +40,9 @@ dns_iptracker_setup(llarp::Addr tunGatewayIp)
std::to_string(ip[1]), '.', std::to_string(ip[2]), "].",
std::to_string(ip[3]));
std::unique_ptr<ip_range> range(new ip_range);
range->octet2 = ip[1]; // 2nd octet
range->octet3 = ip[2]; // 3rd octet
std::unique_ptr< ip_range > range(new ip_range);
range->octet2 = ip[1]; // 2nd octet
range->octet3 = ip[2]; // 3rd octet
// FIXME: look up any static mappings to discount
range->left = 252;
// 4th octet, probably 1, set it
@ -77,7 +77,7 @@ dns_iptracker_setup(llarp::Addr tunGatewayIp)
}
inline struct dns_pointer *
dns_iptracker_allocate_range(std::unique_ptr<ip_range> &range, uint8_t first)
dns_iptracker_allocate_range(std::unique_ptr< ip_range > &range, uint8_t first)
{
// we have an IP
llarp::LogDebug("Range has ", (unsigned int)range->left, " ips left");
@ -95,7 +95,8 @@ dns_iptracker_allocate_range(std::unique_ptr<ip_range> &range, uint8_t first)
}
struct dns_pointer *
dns_iptracker_check_range(std::vector< std::unique_ptr<ip_range> > &ranges, uint8_t first)
dns_iptracker_check_range(std::vector< std::unique_ptr< ip_range > > &ranges,
uint8_t first)
{
// tens not all used up
if(ranges.size())
@ -119,7 +120,7 @@ dns_iptracker_check_range(std::vector< std::unique_ptr<ip_range> > &ranges, uint
else
{
// create one
std::unique_ptr<ip_range> new_range(new ip_range);
std::unique_ptr< ip_range > new_range(new ip_range);
new_range->octet2 = 0;
switch(first)
{

View File

@ -126,7 +126,7 @@ answer_request_alloc(struct dnsc_context *dnsc, void *sock, const char *url,
uint16_t id = ++tracker->c_requests;
if(id == 65535)
id = 0;
tracker->client_request[id] = std::unique_ptr<dnsc_answer_request>(request);
tracker->client_request[id] = std::unique_ptr< dnsc_answer_request >(request);
dns_query *dns_packet = build_dns_packet(
(char *)request->question.name.c_str(), id, request->question.type);
@ -486,8 +486,9 @@ raw_resolve_host(struct dnsc_context *dnsc, const char *url,
llarp::LogInfo("response header says it belongs to id #", hdr->id);
// if we sent this out, then there's an id
struct dns_tracker *tracker = (struct dns_tracker *)dnsc->tracker;
generic_handle_dnsc_recvfrom(tracker->client_request[hdr->id].get(), nullptr, castBuf, size);
struct dns_tracker *tracker = (struct dns_tracker *)dnsc->tracker;
generic_handle_dnsc_recvfrom(tracker->client_request[hdr->id].get(), nullptr,
castBuf, size);
}
/// intermediate udp_io handler
@ -588,9 +589,8 @@ llarp_host_resolved(dnsc_answer_request *request)
dns_tracker *tracker = (dns_tracker *)request->context->tracker;
auto val = std::find_if(
tracker->client_request.begin(), tracker->client_request.end(),
[request](std::pair<const uint, std::unique_ptr < dnsc_answer_request > > &element) {
return element.second.get() == request;
});
[request](std::pair< const uint, std::unique_ptr< dnsc_answer_request > >
&element) { return element.second.get() == request; });
if(val != tracker->client_request.end())
{
tracker->client_request[val->first].reset();
@ -599,7 +599,7 @@ llarp_host_resolved(dnsc_answer_request *request)
{
llarp::LogWarn("Couldn't disable ", request);
}
//delete request;
// delete request;
}
bool

View File

@ -246,7 +246,7 @@ namespace llarp
m_TunSetupResult.set_value(result);
#endif
if(!llarp_dnsd_init(&this->dnsd, EndpointLogic(), EndpointNetLoop(),
tunif.ifname, 53, "8.8.8.8", 53))
tunif.ifname, 1153, "8.8.8.8", 53))
{
llarp::LogError("Couldnt init dns daemon");
}

View File

@ -21,7 +21,7 @@
namespace llarp
{
namespace linux
namespace GNULinux
{
static const char netns_rundir[] = "/var/run/netns";
static const char netns_etcdir[] = "/etc/netns";
@ -315,5 +315,5 @@ namespace llarp
DropCap();
return true;
}
} // namespace linux
} // namespace GNULinux
} // namespace llarp

View File

@ -163,7 +163,7 @@ namespace llarp
bool
IsolateNetwork()
{
return llarp::linux::NetNSSwitch(IsolatedName);
return ::llarp::GNULinux::NetNSSwitch(IsolatedName);
}
};

View File

@ -1 +0,0 @@
#include <llarp/service/tun_endpoint.hpp>