Archives
/
lokinet
mirror of https://github.com/oxen-io/lokinet
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove unused code

Browse Source
pull/7/head
Jeff Becker 6 years ago
parent a9c92213df
commit 53b80e8448
16 changed files with 1 additions and 722 deletions
Show Stats Download Patch File Download Diff File

7
CMakeLists.txt
Unescape Escape View File

@ -222,12 +222,6 @@ set(LIB_SRC
llarp/service.cpp
llarp/transit_hop.cpp
llarp/testnet.c
llarp/api/client.cpp
llarp/api/message.cpp
llarp/api/parser.cpp
llarp/api/messages/ack.cpp
llarp/api/messages/keepalive.cpp
llarp/api/messages/spawn.cpp
llarp/dht/context.cpp
llarp/dht/decode.cpp
llarp/dht/dht_immediate.cpp
@ -267,7 +261,6 @@ set(DNS_SRC
set(TEST_SRC
test/main.cpp
test/api_unittest.cpp
test/base32_unittest.cpp
test/dht_unittest.cpp
test/encrypted_frame_unittest.cpp

15
client/main.cpp
Unescape Escape View File

@ -1,21 +1,8 @@
#include <llarp/logger.h>
#include <llarp/api.hpp>
#include <llarp/logger.hpp>
int
main(int argc, char* argv[])
{
cSetLogLevel(eLogDebug);
std::string url = llarp::api::DefaultURL;
if(argc > 1)
{
url = argv[1];
}
llarp::api::Client cl("hiddenservice");
if(!cl.Start(url))
{
llarp::LogError("failed to start session");
return 1;
}
return cl.Mainloop();
return 1;
}

14
include/llarp/api.hpp
Unescape Escape View File

@ -1,14 +0,0 @@
#ifndef LLARP_API_HPP
#define LLARP_API_HPP
#include <llarp/api/client.hpp>
#include <llarp/api/server.hpp>
namespace llarp
{
namespace api
{
const char DefaultURL[] = "127.0.0.1:34567";
}
} // namespace llarp
#endif

110
include/llarp/api/base.hpp
Unescape Escape View File

@ -1,110 +0,0 @@
#ifndef LLARP_API_BASE_HPP
#define LLARP_API_BASE_HPP
#include <llarp/ev.h>
#include <llarp/logic.h>
#include <llarp/threadpool.h>
#include <llarp/api/messages.hpp>
#include <llarp/api/parser.hpp>
namespace llarp
{
namespace api
{
template < typename Handler >
struct Base
{
Base(llarp_ev_loop* evloop, Handler* handler) : m_Handler(handler)
{
loop = evloop;
worker = llarp_init_same_process_threadpool();
logic = llarp_init_single_process_logic(worker);
}
static void
HandleRecv(llarp_udp_io* u, const sockaddr* from, const void* buf,
ssize_t sz)
{
static_cast< Base< Handler >* >(u->user)->RecvFrom(from, buf, sz);
}
void
RecvFrom(const sockaddr* from, const void* b, ssize_t sz)
{
if(from->sa_family != AF_INET
|| ((sockaddr_in*)from)->sin_addr.s_addr != apiAddr.sin_addr.s_addr
|| ((sockaddr_in*)from)->sin_port != apiAddr.sin_port)
{
// address missmatch
llarp::LogWarn("got packet from bad address");
return;
}
llarp_buffer_t buf;
buf.base = (byte_t*)b;
buf.cur = buf.base;
buf.sz = sz;
IMessage* msg = m_MessageParser.ParseMessage(buf);
if(msg)
{
m_Handler->HandleMessage(msg);
delete msg;
}
else
llarp::LogWarn("Got Invalid Message");
}
bool
BindDefault()
{
return BindAddress(INADDR_LOOPBACK, 0);
}
bool
BindAddress(in_addr_t addr, in_port_t port)
{
ouraddr.sin_family = AF_INET;
ouraddr.sin_addr.s_addr = htonl(addr);
ouraddr.sin_port = htons(port);
udp.user = this;
udp.recvfrom = &HandleRecv;
return llarp_ev_add_udp(loop, &udp, (const sockaddr*)&ouraddr) != -1;
}
bool
SendMessage(const IMessage* msg)
{
llarp_buffer_t buf;
byte_t tmp[1500];
buf.base = tmp;
buf.cur = buf.base;
buf.sz = sizeof(tmp);
if(msg->BEncode(&buf))
{
buf.sz = buf.cur - buf.base;
return llarp_ev_udp_sendto(&udp, (const sockaddr*)&apiAddr, buf.base,
buf.sz)
!= -1;
}
llarp::LogError("Failed to encode message");
return false;
}
int
Mainloop()
{
llarp_ev_loop_run_single_process(loop, worker, logic);
return 0;
}
llarp_threadpool* worker;
llarp_logic* logic;
llarp_ev_loop* loop;
sockaddr_in ouraddr;
sockaddr_in apiAddr;
llarp_udp_io udp;
MessageParser m_MessageParser;
Handler* m_Handler;
};
} // namespace api
} // namespace llarp
#endif

29
include/llarp/api/client.hpp
Unescape Escape View File

@ -1,29 +0,0 @@
#ifndef LLARP_API_CLIENT_HPP
#define LLARP_API_CLIENT_HPP
#include <string>
namespace llarp
{
namespace api
{
struct ClientPImpl;
struct Client
{
Client(const std::string& name);
~Client();
bool
Start(const std::string& apiURL);
int
Mainloop();
private:
ClientPImpl* m_Impl;
};
} // namespace api
} // namespace llarp
#endif

146
include/llarp/api/messages.hpp
Unescape Escape View File

@ -1,146 +0,0 @@
#ifndef LLARP_API_MESSAGES_HPP
#define LLARP_API_MESSAGES_HPP
#include <list>
#include <llarp/aligned.hpp>
#include <llarp/bencode.hpp>
#include <llarp/crypto.hpp>
#include <llarp/service/Info.hpp>
namespace llarp
{
namespace api
{
// forward declare
struct Client;
struct Server;
/// base message
struct IMessage : public IBEncodeMessage
{
uint64_t seqno = 0;
llarp::ShortHash hash;
virtual ~IMessage(){};
// the function name this message belongs to
virtual std::string
FunctionName() const = 0;
bool
BEncode(llarp_buffer_t* buf) const;
virtual bool
DecodeKey(llarp_buffer_t key, llarp_buffer_t* buf);
/// encode the dictionary members after the A value and before the Y value
virtual bool
EncodeParams(llarp_buffer_t* buf) const = 0;
bool
IsWellFormed(llarp_crypto* c, const std::string& password);
void
CalculateHash(llarp_crypto* c, const std::string& password);
};
/// a "yes we got your command" type message
struct AckMessage : public IMessage
{
~AckMessage();
bool
EncodeParams(llarp_buffer_t* buf) const;
std::string
FunctionName() const
{
return "ack";
}
};
// spawn hidden service message
struct SpawnMessage : public IMessage
{
~SpawnMessage();
std::string SessionName;
llarp::service::ServiceInfo Info;
bool
DecodeKey(llarp_buffer_t key, llarp_buffer_t* buf);
bool
EncodeParams(llarp_buffer_t* buf) const;
std::string
FunctionName() const
{
return "spawn";
}
};
/// a keepalive ping
struct KeepAliveMessage : public IMessage
{
~KeepAliveMessage();
bool
EncodeParams(llarp_buffer_t* buf) const;
std::string
FunctionName() const
{
return "keepalive";
}
};
/// end a session with the router
struct DestroySessionMessage : public IMessage
{
};
/// base messgae type for hidden service control and transmission
struct HSMessage : public IMessage
{
llarp::PubKey pubkey;
llarp::Signature sig;
/// validate signature on message (server side)
bool
SignatureIsValid(llarp_crypto* crypto) const;
/// sign message using secret key (client side)
bool
SignMessge(llarp_crypto* crypto, byte_t* seckey);
};
/// create a new hidden service
struct CreateServiceMessgae : public HSMessage
{
};
/// end an already created hidden service we created
struct DestroyServiceMessage : public HSMessage
{
};
/// start lookup of another service's descriptor
struct LookupServiceMessage : public IMessage
{
};
/// publish our hidden service's descriptor
struct PublishServiceMessage : public IMessage
{
};
/// send pre encrypted data down a path we own
struct SendPathDataMessage : public IMessage
{
};
} // namespace api
} // namespace llarp
#endif

26
include/llarp/api/parser.hpp
Unescape Escape View File

@ -1,26 +0,0 @@
#ifndef LLARP_API_PARSER_HPP
#define LLARP_API_PARSER_HPP
#include <llarp/bencode.h>
#include <llarp/api/messages.hpp>
namespace llarp
{
namespace api
{
struct MessageParser
{
MessageParser();
IMessage *
ParseMessage(llarp_buffer_t buf);
private:
static bool
OnKey(dict_reader *r, llarp_buffer_t *key);
IMessage *msg = nullptr;
dict_reader r;
};
} // namespace api
} // namespace llarp
#endif

29
include/llarp/api/server.hpp
Unescape Escape View File

@ -1,29 +0,0 @@
#ifndef LLARP_API_SERVER_HPP
#define LLARP_API_SERVER_HPP
#include <llarp/ev.h>
#include <llarp/router.h>
#include <string>
namespace llarp
{
namespace api
{
struct ServerPImpl;
struct Server
{
Server(llarp_router* r);
~Server();
bool
Bind(const std::string& url, llarp_ev_loop* loop);
private:
ServerPImpl* m_Impl;
};
} // namespace api
} // namespace llarp
#endif

88
llarp/api/client.cpp
Unescape Escape View File

@ -1,88 +0,0 @@
#include <arpa/inet.h>
#include <netdb.h>
#include <sys/socket.h>
#include <unistd.h>
#include <cstring>
#include <llarp/api/base.hpp>
#include <llarp/api/client.hpp>
#include <llarp/api/messages.hpp>
#include <llarp/api/parser.hpp>
namespace llarp
{
namespace api
{
struct ClientPImpl
{
ClientPImpl(const std::string& sessionName, llarp_ev_loop* evloop)
: m_Base(evloop, this), m_SessionName(sessionName)
{
}
~ClientPImpl()
{
llarp_ev_loop_free(&m_Base.loop);
}
bool
StartSession(const std::string& addr, uint16_t port)
{
inet_pton(AF_INET, addr.c_str(), &m_Base.apiAddr.sin_addr.s_addr);
m_Base.apiAddr.sin_family = AF_INET;
m_Base.apiAddr.sin_port = htons(port);
SpawnMessage msg;
msg.seqno = 0;
msg.SessionName = m_SessionName;
return m_Base.SendMessage(&msg);
}
void
HandleMessage(const IMessage* msg)
{
}
Base< ClientPImpl > m_Base;
std::string m_SessionName;
};
Client::Client(const std::string& name)
{
llarp_ev_loop* loop = nullptr;
llarp_ev_loop_alloc(&loop);
m_Impl = new ClientPImpl(name, loop);
}
Client::~Client()
{
delete m_Impl;
}
bool
Client::Start(const std::string& url)
{
if(url.find(":") == std::string::npos)
return false;
if(!m_Impl->m_Base.BindDefault())
return false;
llarp::LogDebug("Bound Socket");
std::string addr = url.substr(0, url.find(":"));
std::string strport = url.substr(url.find(":") + 1);
int port = std::stoi(strport);
if(port == -1)
{
llarp::LogError("bad port: ", strport);
return false;
}
llarp::LogDebug("starting session with ", addr, ":", port);
return m_Impl->StartSession(addr, port);
}
int
Client::Mainloop()
{
return m_Impl->m_Base.Mainloop();
}
} // namespace api
} // namespace llarp

101
llarp/api/message.cpp
Unescape Escape View File

@ -1,101 +0,0 @@
#include <llarp/api/messages.hpp>
namespace llarp
{
namespace api
{
bool
IMessage::BEncode(llarp_buffer_t* buf) const
{
if(!bencode_start_dict(buf))
return false;
if(!BEncodeWriteDictString("A", FunctionName(), buf))
return false;
if(!EncodeParams(buf))
return false;
if(!BEncodeWriteDictInt("Y", seqno, buf))
return false;
if(!BEncodeWriteDictEntry("Z", hash, buf))
return false;
return bencode_end(buf);
}
bool
IMessage::DecodeKey(llarp_buffer_t key, llarp_buffer_t* val)
{
bool read = false;
if(!BEncodeMaybeReadDictInt("Y", seqno, read, key, val))
return false;
if(!BEncodeMaybeReadDictEntry("Z", hash, read, key, val))
return false;
return read;
}
bool
IMessage::IsWellFormed(llarp_crypto* crypto, const std::string& password)
{
// hash password
llarp::ShortHash secret;
llarp_buffer_t passbuf;
passbuf.base = (byte_t*)password.c_str();
passbuf.cur = passbuf.base;
passbuf.sz = password.size();
crypto->shorthash(secret, passbuf);
llarp::ShortHash digest, tmpHash;
// save hash
tmpHash = hash;
// zero hash
hash.Zero();
// bencode
byte_t tmp[1500];
llarp_buffer_t buf;
buf.base = tmp;
buf.cur = buf.base;
buf.sz = sizeof(tmp);
if(!BEncode(&buf))
return false;
// rewind buffer
buf.sz = buf.cur - buf.base;
buf.cur = buf.base;
// calculate message auth
crypto->hmac(digest, buf, secret);
// restore hash
hash = tmpHash;
return tmpHash == digest;
}
void
IMessage::CalculateHash(llarp_crypto* crypto, const std::string& password)
{
// hash password
llarp::ShortHash secret;
llarp_buffer_t passbuf;
passbuf.base = (byte_t*)password.c_str();
passbuf.cur = passbuf.base;
passbuf.sz = password.size();
crypto->shorthash(secret, passbuf);
// llarp::ShortHash digest;
// zero hash
hash.Zero();
// bencode
byte_t tmp[1500];
llarp_buffer_t buf;
buf.base = tmp;
buf.cur = buf.base;
buf.sz = sizeof(tmp);
if(BEncode(&buf))
{
// rewind buffer
buf.sz = buf.cur - buf.base;
buf.cur = buf.base;
// calculate message auth
crypto->hmac(hash, buf, secret);
}
}
} // namespace api
} // namespace llarp

18
llarp/api/messages/ack.cpp
Unescape Escape View File

@ -1,18 +0,0 @@
#include <llarp/api/messages.hpp>
namespace llarp
{
namespace api
{
AckMessage::~AckMessage()
{
}
bool
AckMessage::EncodeParams(llarp_buffer_t *buf) const
{
return true;
}
} // namespace api
} // namespace llarp

18
llarp/api/messages/keepalive.cpp
Unescape Escape View File

@ -1,18 +0,0 @@
#include <llarp/api/messages.hpp>
namespace llarp
{
namespace api
{
KeepAliveMessage::~KeepAliveMessage()
{
}
bool
KeepAliveMessage::EncodeParams(llarp_buffer_t *buf) const
{
return true;
}
} // namespace api
} // namespace llarp

36
llarp/api/messages/spawn.cpp
Unescape Escape View File

@ -1,36 +0,0 @@
#include <llarp/api/messages.hpp>
namespace llarp
{
namespace api
{
SpawnMessage::~SpawnMessage()
{
}
bool
SpawnMessage::EncodeParams(llarp_buffer_t *buf) const
{
return true;
}
bool
SpawnMessage::DecodeKey(llarp_buffer_t key, llarp_buffer_t *val)
{
if(llarp_buffer_eq(key, "N"))
{
llarp_buffer_t strbuf;
if(!bencode_read_string(val, &strbuf))
return false;
SessionName = std::string((char *)strbuf.cur, strbuf.sz);
return true;
}
if(llarp_buffer_eq(key, "S"))
{
return Info.BDecode(val);
}
return IMessage::DecodeKey(key, val);
}
} // namespace api
} // namespace llarp

61
llarp/api/parser.cpp
Unescape Escape View File

@ -1,61 +0,0 @@
#include <functional>
#include <llarp/api/parser.hpp>
#include <map>
namespace llarp
{
namespace api
{
std::map< std::string, std::function< IMessage*() > > funcmap = {
{"ack", []() { return new AckMessage(); }},
{"keepalive", []() { return new KeepAliveMessage(); }},
{"spawn", []() { return new SpawnMessage(); }}};
MessageParser::MessageParser()
{
r.user = this;
r.on_key = &OnKey;
}
bool
MessageParser::OnKey(dict_reader* r, llarp_buffer_t* key)
{
MessageParser* self = static_cast< MessageParser* >(r->user);
if(self->msg == nullptr && key == nullptr) // empty message
return false;
if(self->msg == nullptr && key)
{
// first message, function name
if(!llarp_buffer_eq(*key, "A"))
return false;
llarp_buffer_t strbuf;
if(!bencode_read_string(r->buffer, &strbuf))
return false;
std::string funcname((char*)strbuf.cur, strbuf.sz);
auto itr = funcmap.find(funcname);
if(itr == funcmap.end())
return false;
self->msg = itr->second();
return true;
}
else if(self->msg && key)
{
return self->msg->DecodeKey(*key, r->buffer);
}
else if(self->msg && key == nullptr)
{
return true;
}
return false;
}
IMessage*
MessageParser::ParseMessage(llarp_buffer_t buf)
{
if(bencode_read_dict(&buf, &r))
return msg;
return nullptr;
}
} // namespace api
} // namespace llarp

0
llarp/api/server.cpp
Unescape Escape View File

25
test/api_unittest.cpp
Unescape Escape View File

@ -1,25 +0,0 @@
#include <gtest/gtest.h>
#include <llarp/api/messages.hpp>
class APITest : public ::testing::Test
{
public:
llarp_crypto crypto;
std::string apiPassword = "password";
APITest()
{
llarp_crypto_libsodium_init(&crypto);
}
~APITest()
{
}
};
TEST_F(APITest, TestMessageWellFormed)
{
llarp::api::AckMessage msg;
msg.seqno = 1;
msg.CalculateHash(&crypto, apiPassword);
ASSERT_TRUE(msg.IsWellFormed(&crypto, apiPassword));
};
Write Preview
Loading…
Cancel
Save