app framework project change

This commit is contained in:
Joseph Henry
2016-12-08 12:18:07 -08:00
parent b42046ba2a
commit 946fddd04c
22 changed files with 83 additions and 2144 deletions

View File

@@ -44,13 +44,12 @@
#include "Thread.hpp"
#include "Phy.hpp"
#if defined(SDK_LWIP)
#include "lwip.hpp"
#include "netif/etharp.h"
#endif
#include "netif/etharp.h"
#include "defs.h"
#include "rpc.h"
#include "lwip.hpp"
// #include "jip.hpp"
#if defined(SDK_PICOTCP)
#include "picotcp.hpp"
@@ -173,7 +172,7 @@ namespace ZeroTier {
// lwIP
#if defined(SDK_LWIP)
netif interface, interface6;
netif interface, interface6;
lwIP_stack *lwipstack;
#endif
// jip
@@ -368,7 +367,9 @@ namespace ZeroTier {
void closeConnection(PhySocket *sock);
std::vector<Connection*> _Connections;
std::map<uint64_t, std::pair<PhySocket*, void*> > jobmap;
pid_t rpcCounter;
Thread _thread;
std::string _dev; // path to Unix domain socket