summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/ZeroTierOne.h23
-rw-r--r--node/Hashtable.hpp18
-rw-r--r--node/MAC.hpp23
-rw-r--r--node/NetworkConfig.cpp2
-rw-r--r--node/NetworkConfig.hpp10
-rw-r--r--node/Node.cpp8
-rw-r--r--node/Node.hpp4
-rw-r--r--node/Peer.cpp2
-rw-r--r--node/Switch.cpp1
-rw-r--r--node/Trace.cpp594
-rw-r--r--node/Trace.hpp37
11 files changed, 474 insertions, 248 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h
index 16668534..04c4b83b 100644
--- a/include/ZeroTierOne.h
+++ b/include/ZeroTierOne.h
@@ -293,7 +293,6 @@ extern "C" {
#define ZT_REMOTE_TRACE_FIELD__PACKET_TRUSTED_PATH_ID "packetTrustedPathId"
#define ZT_REMOTE_TRACE_FIELD__PACKET_TRUSTED_PATH_APPROVED "packetTrustedPathApproved"
#define ZT_REMOTE_TRACE_FIELD__PACKET_HOPS "packetHops"
-#define ZT_REMOTE_TRACE_FIELD__OLD_REMOTE_PHYADDR "oldRemotePhyAddr"
#define ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR "remoteZtAddr"
#define ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR "remotePhyAddr"
#define ZT_REMOTE_TRACE_FIELD__LOCAL_ZTADDR "localZtAddr"
@@ -326,12 +325,11 @@ extern "C" {
// Event types in remote traces
#define ZT_REMOTE_TRACE_EVENT__RESETTING_PATHS_IN_SCOPE 0x1000
-#define ZT_REMOTE_TRACE_EVENT__TX_TIMED_OUT 0x1001
-#define ZT_REMOTE_TRACE_EVENT__PEER_CONFIRMING_UNKNOWN_PATH 0x1002
-#define ZT_REMOTE_TRACE_EVENT__PEER_LEARNED_NEW_PATH 0x1003
-#define ZT_REMOTE_TRACE_EVENT__PEER_REDIRECTED 0x1004
-#define ZT_REMOTE_TRACE_EVENT__PACKET_MAC_FAILURE 0x1005
-#define ZT_REMOTE_TRACE_EVENT__PACKET_INVALID 0x1006
+#define ZT_REMOTE_TRACE_EVENT__PEER_CONFIRMING_UNKNOWN_PATH 0x1001
+#define ZT_REMOTE_TRACE_EVENT__PEER_LEARNED_NEW_PATH 0x1002
+#define ZT_REMOTE_TRACE_EVENT__PEER_REDIRECTED 0x1003
+#define ZT_REMOTE_TRACE_EVENT__PACKET_MAC_FAILURE 0x1004
+#define ZT_REMOTE_TRACE_EVENT__PACKET_INVALID 0x1005
#define ZT_REMOTE_TRACE_EVENT__DROPPED_HELLO 0x1006
#define ZT_REMOTE_TRACE_EVENT__OUTGOING_NETWORK_FRAME_DROPPED 0x2000
#define ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_ACCESS_DENIED 0x2001
@@ -343,12 +341,11 @@ extern "C" {
// Event types in remote traces in hex string form
#define ZT_REMOTE_TRACE_EVENT__RESETTING_PATHS_IN_SCOPE_S "1000"
-#define ZT_REMOTE_TRACE_EVENT__TX_TIMED_OUT_S "1001"
-#define ZT_REMOTE_TRACE_EVENT__PEER_CONFIRMING_UNKNOWN_PATH_S "1002"
-#define ZT_REMOTE_TRACE_EVENT__PEER_LEARNED_NEW_PATH_S "1003"
-#define ZT_REMOTE_TRACE_EVENT__PEER_REDIRECTED_S "1004"
-#define ZT_REMOTE_TRACE_EVENT__PACKET_MAC_FAILURE_S "1005"
-#define ZT_REMOTE_TRACE_EVENT__PACKET_INVALID_S "1006"
+#define ZT_REMOTE_TRACE_EVENT__PEER_CONFIRMING_UNKNOWN_PATH_S "1001"
+#define ZT_REMOTE_TRACE_EVENT__PEER_LEARNED_NEW_PATH_S "1002"
+#define ZT_REMOTE_TRACE_EVENT__PEER_REDIRECTED_S "1003"
+#define ZT_REMOTE_TRACE_EVENT__PACKET_MAC_FAILURE_S "1004"
+#define ZT_REMOTE_TRACE_EVENT__PACKET_INVALID_S "1005"
#define ZT_REMOTE_TRACE_EVENT__DROPPED_HELLO_S "1006"
#define ZT_REMOTE_TRACE_EVENT__OUTGOING_NETWORK_FRAME_DROPPED_S "2000"
#define ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_ACCESS_DENIED_S "2001"
diff --git a/node/Hashtable.hpp b/node/Hashtable.hpp
index e5496592..5aa045b9 100644
--- a/node/Hashtable.hpp
+++ b/node/Hashtable.hpp
@@ -256,6 +256,24 @@ public:
inline const V *get(const K &k) const { return const_cast<Hashtable *>(this)->get(k); }
/**
+ * @param k Key
+ * @param v Value to fill with result
+ * @return True if value was found and set (if false, v is not modified)
+ */
+ inline bool get(const K &k,V &v) const
+ {
+ _Bucket *b = _t[_hc(k) % _bc];
+ while (b) {
+ if (b->k == k) {
+ v = b->v;
+ return true;
+ }
+ b = b->next;
+ }
+ return false;
+ }
+
+ /**
* @param k Key to check
* @return True if key is present
*/
diff --git a/node/MAC.hpp b/node/MAC.hpp
index a179fd4f..18fe2032 100644
--- a/node/MAC.hpp
+++ b/node/MAC.hpp
@@ -200,6 +200,29 @@ public:
inline unsigned long hashCode() const { return (unsigned long)_m; }
+ inline char *toString(char buf[18]) const
+ {
+ buf[0] = Utils::HEXCHARS[(_m >> 44) & 0xf];
+ buf[1] = Utils::HEXCHARS[(_m >> 40) & 0xf];
+ buf[2] = ':';
+ buf[3] = Utils::HEXCHARS[(_m >> 36) & 0xf];
+ buf[4] = Utils::HEXCHARS[(_m >> 32) & 0xf];
+ buf[5] = ':';
+ buf[6] = Utils::HEXCHARS[(_m >> 28) & 0xf];
+ buf[7] = Utils::HEXCHARS[(_m >> 24) & 0xf];
+ buf[8] = ':';
+ buf[9] = Utils::HEXCHARS[(_m >> 20) & 0xf];
+ buf[10] = Utils::HEXCHARS[(_m >> 16) & 0xf];
+ buf[11] = ':';
+ buf[12] = Utils::HEXCHARS[(_m >> 12) & 0xf];
+ buf[13] = Utils::HEXCHARS[(_m >> 8) & 0xf];
+ buf[14] = ':';
+ buf[15] = Utils::HEXCHARS[(_m >> 4) & 0xf];
+ buf[16] = Utils::HEXCHARS[_m & 0xf];
+ buf[17] = (char)0;
+ return buf;
+ }
+
inline MAC &operator=(const MAC &m)
{
_m = m._m;
diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp
index 110a20b0..2e07ac82 100644
--- a/node/NetworkConfig.cpp
+++ b/node/NetworkConfig.cpp
@@ -49,6 +49,7 @@ bool NetworkConfig::toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d,b
if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_REVISION,this->revision)) return false;
if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO,this->issuedTo.toString(tmp2))) return false;
if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_TARGET,this->remoteTraceTarget.toString(tmp2))) return false;
+ if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_LEVEL,(uint64_t)this->remoteTraceLevel)) return false;
if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_FLAGS,this->flags)) return false;
if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT,(uint64_t)this->multicastLimit)) return false;
if (!d.add(ZT_NETWORKCONFIG_DICT_KEY_TYPE,(uint64_t)this->type)) return false;
@@ -220,6 +221,7 @@ bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACI
return false;
}
this->remoteTraceTarget = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_TARGET);
+ this->remoteTraceLevel = (Trace::Level)d.getUI(ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_LEVEL);
this->multicastLimit = (unsigned int)d.getUI(ZT_NETWORKCONFIG_DICT_KEY_MULTICAST_LIMIT,0);
d.get(ZT_NETWORKCONFIG_DICT_KEY_NAME,this->name,sizeof(this->name));
diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp
index 1bd3b9aa..bb48e6aa 100644
--- a/node/NetworkConfig.hpp
+++ b/node/NetworkConfig.hpp
@@ -49,6 +49,7 @@
#include "Dictionary.hpp"
#include "Identity.hpp"
#include "Utils.hpp"
+#include "Trace.hpp"
/**
* Default maximum time delta for COMs, tags, and capabilities
@@ -161,6 +162,8 @@ namespace ZeroTier {
#define ZT_NETWORKCONFIG_DICT_KEY_ISSUED_TO "id"
// remote trace target
#define ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_TARGET "tt"
+// remote trace level
+#define ZT_NETWORKCONFIG_DICT_KEY_REMOTE_TRACE_LEVEL "tl"
// flags(hex)
#define ZT_NETWORKCONFIG_DICT_KEY_FLAGS "f"
// integer(hex)
@@ -189,8 +192,6 @@ namespace ZeroTier {
#define ZT_NETWORKCONFIG_DICT_KEY_TAGS "TAG"
// tags (binary blobs)
#define ZT_NETWORKCONFIG_DICT_KEY_CERTIFICATES_OF_OWNERSHIP "COO"
-// curve25519 signature
-#define ZT_NETWORKCONFIG_DICT_KEY_SIGNATURE "C25519"
// Legacy fields -- these are obsoleted but are included when older clients query
@@ -446,6 +447,11 @@ public:
uint64_t flags;
/**
+ * Remote trace level
+ */
+ Trace::Level remoteTraceLevel;
+
+ /**
* Network MTU
*/
unsigned int mtu;
diff --git a/node/Node.cpp b/node/Node.cpp
index f0fcb4d7..ef8925d5 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -61,7 +61,8 @@ Node::Node(void *uptr,void *tptr,const struct ZT_Node_Callbacks *callbacks,int64
_networks(8),
_now(now),
_lastPingCheck(0),
- _lastHousekeepingRun(0)
+ _lastHousekeepingRun(0),
+ _lastMemoizedTraceSettings(0)
{
if (callbacks->version != 0)
throw ZT_EXCEPTION_INVALID_ARGUMENT;
@@ -299,6 +300,11 @@ ZT_ResultCode Node::processBackgroundTasks(void *tptr,int64_t now,volatile int64
timeUntilNextPingCheck -= (unsigned long)timeSinceLastPingCheck;
}
+ if ((now - _lastMemoizedTraceSettings) >= 10000) {
+ _lastMemoizedTraceSettings = now;
+ RR->t->updateMemoizedSettings();
+ }
+
if ((now - _lastHousekeepingRun) >= ZT_HOUSEKEEPING_PERIOD) {
_lastHousekeepingRun = now;
try {
diff --git a/node/Node.hpp b/node/Node.hpp
index ae7976d4..f8236db8 100644
--- a/node/Node.hpp
+++ b/node/Node.hpp
@@ -258,6 +258,7 @@ public:
virtual void ncSendError(uint64_t nwid,uint64_t requestPacketId,const Address &destination,NetworkController::ErrorCode errorCode);
inline const Address &remoteTraceTarget() const { return _remoteTraceTarget; }
+ inline Trace::Level remoteTraceLevel() const { return _remoteTraceLevel; }
private:
RuntimeEnvironment _RR;
@@ -281,9 +282,12 @@ private:
Mutex _backgroundTasksLock;
Address _remoteTraceTarget;
+ enum Trace::Level _remoteTraceLevel;
+
int64_t _now;
int64_t _lastPingCheck;
int64_t _lastHousekeepingRun;
+ int64_t _lastMemoizedTraceSettings;
volatile int64_t _prngState[2];
bool _online;
};
diff --git a/node/Peer.cpp b/node/Peer.cpp
index 2d562f12..fceef94f 100644
--- a/node/Peer.cpp
+++ b/node/Peer.cpp
@@ -149,7 +149,7 @@ void Peer::received(
if (replacePath != ZT_MAX_PEER_NETWORK_PATHS) {
if (verb == Packet::VERB_OK) {
- RR->t->peerLearnedNewPath(tPtr,networkId,*this,_paths[replacePath].p,path,packetId);
+ RR->t->peerLearnedNewPath(tPtr,networkId,*this,path,packetId);
_paths[replacePath].lr = now;
_paths[replacePath].p = path;
_paths[replacePath].priority = 1;
diff --git a/node/Switch.cpp b/node/Switch.cpp
index a8cf0ce6..1958c43e 100644
--- a/node/Switch.cpp
+++ b/node/Switch.cpp
@@ -579,7 +579,6 @@ unsigned long Switch::doTimerTasks(void *tPtr,int64_t now)
if (_trySend(tPtr,txi->packet,txi->encrypt)) {
_txQueue.erase(txi++);
} else if ((now - txi->creationTime) > ZT_TRANSMIT_QUEUE_TIMEOUT) {
- RR->t->txTimedOut(tPtr,txi->dest);
_txQueue.erase(txi++);
} else {
if (!RR->topology->getPeer(tPtr,txi->dest))
diff --git a/node/Trace.cpp b/node/Trace.cpp
index 6d85942d..7ffe0c8f 100644
--- a/node/Trace.cpp
+++ b/node/Trace.cpp
@@ -24,6 +24,10 @@
* of your own application.
*/
+#define ZT_TRACE
+
+#include <stdio.h>
+
#include "Trace.hpp"
#include "RuntimeEnvironment.hpp"
#include "Switch.hpp"
@@ -38,180 +42,292 @@
namespace ZeroTier {
+#ifdef ZT_TRACE
+static void ZT_LOCAL_TRACE(void *const tPtr,const RuntimeEnvironment *const RR,const char *const fmt,...)
+{
+ char traceMsgBuf[1024];
+ va_list ap;
+ va_start(ap,fmt);
+ vsnprintf(traceMsgBuf,sizeof(traceMsgBuf),fmt,ap);
+ va_end(ap);
+ traceMsgBuf[sizeof(traceMsgBuf) - 1] = (char)0;
+ RR->node->postEvent(tPtr,ZT_EVENT_TRACE,traceMsgBuf);
+}
+#else
+#define ZT_LOCAL_TRACE(...)
+#endif
+
void Trace::resettingPathsInScope(void *const tPtr,const Address &reporter,const InetAddress &reporterPhysicalAddress,const InetAddress &myPhysicalAddress,const InetAddress::IpScope scope)
{
char tmp[128];
+
+ ZT_LOCAL_TRACE(tPtr,RR,"RESET and revalidate paths in scope %d; new phy address %s reported by trusted peer %.10llx",(int)scope,myPhysicalAddress.toIpString(tmp),reporter.toInt());
+
Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__RESETTING_PATHS_IN_SCOPE_S);
d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,reporter);
d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,reporterPhysicalAddress.toString(tmp));
d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_PHYADDR,myPhysicalAddress.toString(tmp));
d.add(ZT_REMOTE_TRACE_FIELD__IP_SCOPE,(uint64_t)scope);
- _send(tPtr,d,0);
-}
-void Trace::txTimedOut(void *const tPtr,const Address &destination)
-{
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__TX_TIMED_OUT_S);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,destination);
- _send(tPtr,d,0);
+ if (_globalTarget)
+ _send(tPtr,d,_globalTarget);
+ _spamToAllNetworks(tPtr,d,Trace::NORMAL);
}
void Trace::peerConfirmingUnknownPath(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &path,const uint64_t packetId,const Packet::Verb verb)
{
char tmp[128];
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PEER_CONFIRMING_UNKNOWN_PATH_S);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB,(uint64_t)verb);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,networkId);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,peer.address());
- if (path) {
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
- d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
+ if (!path) return; // sanity check
+
+ ZT_LOCAL_TRACE(tPtr,RR,"trying unknown path %s to %.10llx (packet %.16llx verb %d local socket %lld network %.16llx)",path->address().toString(tmp),peer.address().toInt(),packetId,(double)verb,path->localSocket(),networkId);
+
+ std::pair<Address,Trace::Level> byn;
+ if (networkId) { Mutex::Lock l(_byNet_m); _byNet.get(networkId,byn); }
+
+ if ((_globalTarget)||(byn.first)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PEER_CONFIRMING_UNKNOWN_PATH_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB,(uint64_t)verb);
+ if (networkId)
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,networkId);
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,peer.address());
+ if (path) {
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
+ d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
+ }
+
+ if (_globalTarget)
+ _send(tPtr,d,_globalTarget);
+ if (byn.first)
+ _send(tPtr,d,byn.first);
}
- _send(tPtr,d,networkId);
}
-void Trace::peerLearnedNewPath(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &oldPath,const SharedPtr<Path> &newPath,const uint64_t packetId)
+void Trace::peerLearnedNewPath(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &newPath,const uint64_t packetId)
{
char tmp[128];
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PEER_LEARNED_NEW_PATH_S);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,networkId);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,peer.address());
- if (oldPath) {
- d.add(ZT_REMOTE_TRACE_FIELD__OLD_REMOTE_PHYADDR,oldPath->address().toString(tmp));
- }
- if (newPath) {
+ if (!newPath) return; // sanity check
+
+ ZT_LOCAL_TRACE(tPtr,RR,"learned new path %s to %.10llx (packet %.16llx local socket %lld network %.16llx)",newPath->address().toString(tmp),peer.address().toInt(),packetId,newPath->localSocket(),networkId);
+
+ std::pair<Address,Trace::Level> byn;
+ if (networkId) { Mutex::Lock l(_byNet_m); _byNet.get(networkId,byn); }
+
+ if ((_globalTarget)||(byn.first)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PEER_LEARNED_NEW_PATH_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
+ if (networkId)
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,networkId);
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,peer.address());
d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,newPath->address().toString(tmp));
d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,newPath->localSocket());
+
+ if (_globalTarget)
+ _send(tPtr,d,_globalTarget);
+ if (byn.first)
+ _send(tPtr,d,byn.first);
}
- _send(tPtr,d,networkId);
}
void Trace::peerRedirected(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &newPath)
{
char tmp[128];
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PEER_REDIRECTED_S);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,networkId);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,peer.address());
- if (newPath) {
+ if (!newPath) return; // sanity check
+
+ ZT_LOCAL_TRACE(tPtr,RR,"explicit redirect from %.10llx to path %s",peer.address().toInt(),newPath->address().toString(tmp));
+
+ std::pair<Address,Trace::Level> byn;
+ if (networkId) { Mutex::Lock l(_byNet_m); _byNet.get(networkId,byn); }
+
+ if ((_globalTarget)||(byn.first)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PEER_REDIRECTED_S);
+ if (networkId)
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,networkId);
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,peer.address());
d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,newPath->address().toString(tmp));
d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,newPath->localSocket());
+
+ if (_globalTarget)
+ _send(tPtr,d,_globalTarget);
+ if (byn.first)
+ _send(tPtr,d,byn.first);
}
- _send(tPtr,d,networkId);
}
void Trace::outgoingNetworkFrameDropped(void *const tPtr,const SharedPtr<Network> &network,const MAC &sourceMac,const MAC &destMac,const unsigned int etherType,const unsigned int vlanId,const unsigned int frameLen,const char *reason)
{
+ char tmp[128],tmp2[128];
if (!network) return; // sanity check
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__OUTGOING_NETWORK_FRAME_DROPPED_S);
- d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_MAC,sourceMac.toInt());
- d.add(ZT_REMOTE_TRACE_FIELD__DEST_MAC,destMac.toInt());
- d.add(ZT_REMOTE_TRACE_FIELD__ETHERTYPE,(uint64_t)etherType);
- d.add(ZT_REMOTE_TRACE_FIELD__VLAN_ID,(uint64_t)vlanId);
- d.add(ZT_REMOTE_TRACE_FIELD__FRAME_LENGTH,(uint64_t)frameLen);
- if (reason) {
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ ZT_LOCAL_TRACE(tPtr,RR,"%.16llx DROP frame %s -> %s etherType %.4x size %u (%s)",network->id(),sourceMac.toString(tmp),destMac.toString(tmp2),etherType,frameLen,(reason) ? reason : "unknown reason");
+
+ std::pair<Address,Trace::Level> byn;
+ { Mutex::Lock l(_byNet_m); _byNet.get(network->id(),byn); }
+
+ if ( ((_globalTarget)&&((int)_globalLevel >= (int)Trace::VERBOSE)) || ((byn.first)&&((int)byn.second >= (int)Trace::VERBOSE)) ) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__OUTGOING_NETWORK_FRAME_DROPPED_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,network->id());
+ d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_MAC,sourceMac.toInt());
+ d.add(ZT_REMOTE_TRACE_FIELD__DEST_MAC,destMac.toInt());
+ d.add(ZT_REMOTE_TRACE_FIELD__ETHERTYPE,(uint64_t)etherType);
+ d.add(ZT_REMOTE_TRACE_FIELD__VLAN_ID,(uint64_t)vlanId);
+ d.add(ZT_REMOTE_TRACE_FIELD__FRAME_LENGTH,(uint64_t)frameLen);
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ if ((_globalTarget)&&((int)_globalLevel >= (int)Trace::VERBOSE))
+ _send(tPtr,d,_globalTarget);
+ if ((byn.first)&&((int)byn.second >= (int)Trace::VERBOSE))
+ _send(tPtr,d,byn.first);
}
- _send(tPtr,d,network);
}
void Trace::incomingNetworkAccessDenied(void *const tPtr,const SharedPtr<Network> &network,const SharedPtr<Path> &path,const uint64_t packetId,const unsigned int packetLength,const Address &source,const Packet::Verb verb,bool credentialsRequested)
{
- if (!network) return; // sanity check
char tmp[128];
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_ACCESS_DENIED_S);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB,(uint64_t)verb);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
- if (path) {
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
- d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
+ if (!network) return; // sanity check
+
+ ZT_LOCAL_TRACE(tPtr,RR,"%.16llx DENIED packet from %.10llx(%s) verb %d size %u%s",network->id(),source.toInt(),(path) ? (path->address().toString(tmp)) : "???",(int)verb,packetLength,credentialsRequested ? " (credentials requested)" : " (credentials not requested)");
+
+ std::pair<Address,Trace::Level> byn;
+ { Mutex::Lock l(_byNet_m); _byNet.get(network->id(),byn); }
+
+ if ( ((_globalTarget)&&((int)_globalLevel >= (int)Trace::VERBOSE)) || ((byn.first)&&((int)byn.second >= (int)Trace::VERBOSE)) ) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_ACCESS_DENIED_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB,(uint64_t)verb);
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
+ if (path) {
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
+ d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
+ }
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,network->id());
+
+ if ((_globalTarget)&&((int)_globalLevel >= (int)Trace::VERBOSE))
+ _send(tPtr,d,_globalTarget);
+ if ((byn.first)&&((int)byn.second >= (int)Trace::VERBOSE))
+ _send(tPtr,d,byn.first);
}
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,network->id());
- _send(tPtr,d,*network);
}
void Trace::incomingNetworkFrameDropped(void *const tPtr,const SharedPtr<Network> &network,const SharedPtr<Path> &path,const uint64_t packetId,const unsigned int packetLength,const Address &source,const Packet::Verb verb,const MAC &sourceMac,const MAC &destMac,const char *reason)
{
- if (!network) return; // sanity check
char tmp[128];
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_FRAME_DROPPED_S);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB,(uint64_t)verb);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
- if (path) {
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
- d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
+ if (!network) return; // sanity check
+
+ ZT_LOCAL_TRACE(tPtr,RR,"%.16llx DROPPED frame from %.10llx(%s) verb %d size %u",network->id(),source.toInt(),(path) ? (path->address().toString(tmp)) : "???",(int)verb,packetLength);
+
+ std::pair<Address,Trace::Level> byn;
+ { Mutex::Lock l(_byNet_m); _byNet.get(network->id(),byn); }
+
+ if ( ((_globalTarget)&&((int)_globalLevel >= (int)Trace::VERBOSE)) || ((byn.first)&&((int)byn.second >= (int)Trace::VERBOSE)) ) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__INCOMING_NETWORK_FRAME_DROPPED_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB,(uint64_t)verb);
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
+ if (path) {
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
+ d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
+ }
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,network->id());
+ d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_MAC,sourceMac.toInt());
+ d.add(ZT_REMOTE_TRACE_FIELD__DEST_MAC,destMac.toInt());
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ if ((_globalTarget)&&((int)_globalLevel >= (int)Trace::VERBOSE))
+ _send(tPtr,d,_globalTarget);
+ if ((byn.first)&&((int)byn.second >= (int)Trace::VERBOSE))
+ _send(tPtr,d,byn.first);
}
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,network->id());
- d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_MAC,sourceMac.toInt());
- d.add(ZT_REMOTE_TRACE_FIELD__DEST_MAC,destMac.toInt());
- if (reason)
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
- _send(tPtr,d,*network);
}
void Trace::incomingPacketMessageAuthenticationFailure(void *const tPtr,const SharedPtr<Path> &path,const uint64_t packetId,const Address &source,const unsigned int hops,const char *reason)
{
char tmp[128];
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PACKET_MAC_FAILURE_S);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_HOPS,(uint64_t)hops);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
- d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
- if (reason)
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
- _send(tPtr,d,0);
+
+ ZT_LOCAL_TRACE(tPtr,RR,"MAC failed for packet %.16llx from %.10llx(%s)",packetId,source.toInt(),(path) ? path->address().toString(tmp) : "???");
+
+ if ((_globalTarget)&&((int)_globalLevel >= Trace::DEBUG)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PACKET_MAC_FAILURE_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_HOPS,(uint64_t)hops);
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
+ if (path) {
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
+ d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
+ }
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ _send(tPtr,d,_globalTarget);
+ }
}
void Trace::incomingPacketInvalid(void *const tPtr,const SharedPtr<Path> &path,const uint64_t packetId,const Address &source,const unsigned int hops,const Packet::Verb verb,const char *reason)
{
char tmp[128];
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PACKET_INVALID_S);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB,(uint64_t)verb);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
- d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_HOPS,(uint64_t)hops);
- if (reason)
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
- _send(tPtr,d,0);
+
+ ZT_LOCAL_TRACE(tPtr,RR,"INVALID packet %.16llx from %.10llx(%s) (%s)",packetId,source.toInt(),(path) ? path->address().toString(tmp) : "???",(reason) ? reason : "unknown reason");
+
+ if ((_globalTarget)&&((int)_globalLevel >= Trace::DEBUG)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PACKET_INVALID_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_VERB,(uint64_t)verb);
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
+ if (path) {
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
+ d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
+ }
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_HOPS,(uint64_t)hops);
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ _send(tPtr,d,_globalTarget);
+ }
}
void Trace::incomingPacketDroppedHELLO(void *const tPtr,const SharedPtr<Path> &path,const uint64_t packetId,const Address &source,const char *reason)
{
char tmp[128];
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PACKET_INVALID_S);
- d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
- d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
- d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
- if (reason)
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
- _send(tPtr,d,0);
+
+ ZT_LOCAL_TRACE(tPtr,RR,"DROPPED HELLO from %.10llx(%s) (%s)",source.toInt(),(path) ? path->address().toString(tmp) : "???",(reason) ? reason : "???");
+
+ if ((_globalTarget)&&((int)_globalLevel >= Trace::DEBUG)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__PACKET_INVALID_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__PACKET_ID,packetId);
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_ZTADDR,source);
+ if (path) {
+ d.add(ZT_REMOTE_TRACE_FIELD__REMOTE_PHYADDR,path->address().toString(tmp));
+ d.add(ZT_REMOTE_TRACE_FIELD__LOCAL_SOCKET,path->localSocket());
+ }
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ _send(tPtr,d,_globalTarget);
+ }
}
void Trace::networkConfigRequestSent(void *const tPtr,const Network &network,const Address &controller)
{
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__NETWORK_CONFIG_REQUEST_SENT_S);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,network.id());
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_CONTROLLER_ID,controller);
- _send(tPtr,d,network);
+ ZT_LOCAL_TRACE(tPtr,RR,"requesting configuration for network %.16llx",network.id());
+ if ((_globalTarget)&&((int)_globalLevel >= Trace::DEBUG)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__NETWORK_CONFIG_REQUEST_SENT_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,network.id());
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_CONTROLLER_ID,controller);
+ _send(tPtr,d,_globalTarget);
+ }
}
void Trace::networkFilter(
@@ -232,153 +348,189 @@ void Trace::networkFilter(
const bool inbound,
const int accept)
{
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__NETWORK_FILTER_TRACE_S);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,network.id());
- d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_ZTADDR,ztSource);
- d.add(ZT_REMOTE_TRACE_FIELD__DEST_ZTADDR,ztDest);
- d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_MAC,macSource.toInt());
- d.add(ZT_REMOTE_TRACE_FIELD__DEST_MAC,macDest.toInt());
- d.add(ZT_REMOTE_TRACE_FIELD__ETHERTYPE,(uint64_t)etherType);
- d.add(ZT_REMOTE_TRACE_FIELD__VLAN_ID,(uint64_t)vlanId);
- d.add(ZT_REMOTE_TRACE_FIELD__FILTER_FLAG_NOTEE,noTee ? "1" : "0");
- d.add(ZT_REMOTE_TRACE_FIELD__FILTER_FLAG_INBOUND,inbound ? "1" : "0");
- d.add(ZT_REMOTE_TRACE_FIELD__FILTER_RESULT,(int64_t)accept);
- d.add(ZT_REMOTE_TRACE_FIELD__FILTER_BASE_RULE_LOG,(const char *)primaryRuleSetLog.data(),(int)primaryRuleSetLog.sizeBytes());
- if (matchingCapabilityRuleSetLog)
- d.add(ZT_REMOTE_TRACE_FIELD__FILTER_CAP_RULE_LOG,(const char *)matchingCapabilityRuleSetLog->data(),(int)matchingCapabilityRuleSetLog->sizeBytes());
- if (matchingCapability)
- d.add(ZT_REMOTE_TRACE_FIELD__FILTER_CAP_ID,(uint64_t)matchingCapability->id());
- d.add(ZT_REMOTE_TRACE_FIELD__FRAME_LENGTH,(uint64_t)frameLen);
- if (frameLen > 0)
- d.add(ZT_REMOTE_TRACE_FIELD__FRAME_DATA,(const char *)frameData,(frameLen > 256) ? (int)256 : (int)frameLen);
- _send(tPtr,d,network);
+ std::pair<Address,Trace::Level> byn;
+ { Mutex::Lock l(_byNet_m); _byNet.get(network.id(),byn); }
+
+ if ( ((_globalTarget)&&((int)_globalLevel >= (int)Trace::RULES)) || ((byn.first)&&((int)byn.second >= (int)Trace::RULES)) ) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__NETWORK_FILTER_TRACE_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,network.id());
+ d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_ZTADDR,ztSource);
+ d.add(ZT_REMOTE_TRACE_FIELD__DEST_ZTADDR,ztDest);
+ d.add(ZT_REMOTE_TRACE_FIELD__SOURCE_MAC,macSource.toInt());
+ d.add(ZT_REMOTE_TRACE_FIELD__DEST_MAC,macDest.toInt());
+ d.add(ZT_REMOTE_TRACE_FIELD__ETHERTYPE,(uint64_t)etherType);
+ d.add(ZT_REMOTE_TRACE_FIELD__VLAN_ID,(uint64_t)vlanId);
+ d.add(ZT_REMOTE_TRACE_FIELD__FILTER_FLAG_NOTEE,noTee ? "1" : "0");
+ d.add(ZT_REMOTE_TRACE_FIELD__FILTER_FLAG_INBOUND,inbound ? "1" : "0");
+ d.add(ZT_REMOTE_TRACE_FIELD__FILTER_RESULT,(int64_t)accept);
+ d.add(ZT_REMOTE_TRACE_FIELD__FILTER_BASE_RULE_LOG,(const char *)primaryRuleSetLog.data(),(int)primaryRuleSetLog.sizeBytes());
+ if (matchingCapabilityRuleSetLog)
+ d.add(ZT_REMOTE_TRACE_FIELD__FILTER_CAP_RULE_LOG,(const char *)matchingCapabilityRuleSetLog->data(),(int)matchingCapabilityRuleSetLog->sizeBytes());
+ if (matchingCapability)
+ d.add(ZT_REMOTE_TRACE_FIELD__FILTER_CAP_ID,(uint64_t)matchingCapability->id());
+ d.add(ZT_REMOTE_TRACE_FIELD__FRAME_LENGTH,(uint64_t)frameLen);
+ if (frameLen > 0)
+ d.add(ZT_REMOTE_TRACE_FIELD__FRAME_DATA,(const char *)frameData,(frameLen > 256) ? (int)256 : (int)frameLen);
+
+ if ((_globalTarget)&&((int)_globalLevel >= (int)Trace::RULES))
+ _send(tPtr,d,_globalTarget);
+ if ((byn.first)&&((int)byn.second >= (int)Trace::RULES))
+ _send(tPtr,d,byn.first);
+ }
}
void Trace::credentialRejected(void *const tPtr,const CertificateOfMembership &c,const char *reason)
{
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP,c.timestamp());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO,c.issuedTo());
- if (reason)
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
- _send(tPtr,d,c.networkId());
+ std::pair<Address,Trace::Level> byn;
+ if (c.networkId()) { Mutex::Lock l(_byNet_m); _byNet.get(c.networkId(),byn); }
+
+ if ((_globalTarget)||(byn.first)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP,c.timestamp());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO,c.issuedTo());
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ if (_globalTarget)
+ _send(tPtr,d,_globalTarget);
+ if (byn.first)
+ _send(tPtr,d,byn.first);
+ }
}
void Trace::credentialRejected(void *const tPtr,const CertificateOfOwnership &c,const char *reason)
{
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP,c.timestamp());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO,c.issuedTo());
- if (reason)
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
- _send(tPtr,d,c.networkId());
+ std::pair<Address,Trace::Level> byn;
+ if (c.networkId()) { Mutex::Lock l(_byNet_m); _byNet.get(c.networkId(),byn); }
+
+ if ((_globalTarget)||(byn.first)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP,c.timestamp());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO,c.issuedTo());
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ if (_globalTarget)
+ _send(tPtr,d,_globalTarget);
+ if (byn.first)
+ _send(tPtr,d,byn.first);
+ }
}
void Trace::credentialRejected(void *const tPtr,const Capability &c,const char *reason)
{
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP,c.timestamp());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO,c.issuedTo());
- if (reason)
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
- _send(tPtr,d,c.networkId());
+ std::pair<Address,Trace::Level> byn;
+ if (c.networkId()) { Mutex::Lock l(_byNet_m); _byNet.get(c.networkId(),byn); }
+
+ if ((_globalTarget)||(byn.first)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP,c.timestamp());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO,c.issuedTo());
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ if (_globalTarget)
+ _send(tPtr,d,_globalTarget);
+ if (byn.first)
+ _send(tPtr,d,byn.first);
+ }
}
void Trace::credentialRejected(void *const tPtr,const Tag &c,const char *reason)
{
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP,c.timestamp());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO,c.issuedTo());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_INFO,(uint64_t)c.value());
- if (reason)
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
- _send(tPtr,d,c.networkId());
+ std::pair<Address,Trace::Level> byn;
+ if (c.networkId()) { Mutex::Lock l(_byNet_m); _byNet.get(c.networkId(),byn); }
+
+ if ((_globalTarget)||(byn.first)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TIMESTAMP,c.timestamp());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ISSUED_TO,c.issuedTo());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_INFO,(uint64_t)c.value());
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ if (_globalTarget)
+ _send(tPtr,d,_globalTarget);
+ if (byn.first)
+ _send(tPtr,d,byn.first);
+ }
}
void Trace::credentialRejected(void *const tPtr,const Revocation &c,const char *reason)
{
- Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
- d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
- d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
- d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_REVOCATION_TARGET,c.target());
- if (reason)
- d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
- _send(tPtr,d,c.networkId());
+ std::pair<Address,Trace::Level> byn;
+ if (c.networkId()) { Mutex::Lock l(_byNet_m); _byNet.get(c.networkId(),byn); }
+
+ if ((_globalTarget)||(byn.first)) {
+ Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> d;
+ d.add(ZT_REMOTE_TRACE_FIELD__EVENT,ZT_REMOTE_TRACE_EVENT__CREDENTIAL_REJECTED_S);
+ d.add(ZT_REMOTE_TRACE_FIELD__NETWORK_ID,c.networkId());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_TYPE,(uint64_t)c.credentialType());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_ID,(uint64_t)c.id());
+ d.add(ZT_REMOTE_TRACE_FIELD__CREDENTIAL_REVOCATION_TARGET,c.target());
+ if (reason)
+ d.add(ZT_REMOTE_TRACE_FIELD__REASON,reason);
+
+ if (_globalTarget)
+ _send(tPtr,d,_globalTarget);
+ if (byn.first)
+ _send(tPtr,d,byn.first);
+ }
}
-void Trace::_send(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d)
+void Trace::updateMemoizedSettings()
{
-#ifdef ZT_TRACE
- unsigned int i = 0;
- while (i < (unsigned int)(sizeof(_traceMsgBuf) - 1)) {
- const char c = d.data()[i];
- if (c == 0) {
- break;
- } else if (c == '\n') {
- _traceMsgBuf[i++] = ' ';
- } else if ((c >= 32)&&(c <= 126)) {
- _traceMsgBuf[i++] = c;
- } else {
- if ((i + 3) < (unsigned int)(sizeof(_traceMsgBuf) - 1)) {
- _traceMsgBuf[i++] = '\\';
- Utils::hex((uint8_t)c,_traceMsgBuf + i);
+ _globalTarget = RR->node->remoteTraceTarget();
+ _globalLevel = RR->node->remoteTraceLevel();
+ const std::vector< SharedPtr<Network> > nws(RR->node->allNetworks());
+ {
+ Mutex::Lock l(_byNet_m);
+ _byNet.clear();
+ for(std::vector< SharedPtr<Network> >::const_iterator n(nws.begin());n!=nws.end();++n) {
+ const Address dest((*n)->config().remoteTraceTarget);
+ if (dest) {
+ std::pair<Address,Trace::Level> &m = _byNet[(*n)->id()];
+ m.first = dest;
+ m.second = (*n)->config().remoteTraceLevel;
}
}
}
- _traceMsgBuf[i] = (char)0;
- RR->node->postEvent(tPtr,ZT_EVENT_TRACE,_traceMsgBuf);
-#endif
-
- const Address rtt(RR->node->remoteTraceTarget());
- if (rtt) {
- Packet outp(rtt,RR->identity.address(),Packet::VERB_REMOTE_TRACE);
- outp.appendCString(d.data());
- outp.compress();
- RR->sw->send(tPtr,outp,true);
- }
}
-void Trace::_send(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d,const uint64_t networkId)
+void Trace::_send(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d,const Address &dest)
{
- _send(tPtr,d);
- if (networkId) {
- const SharedPtr<Network> network(RR->node->network(networkId));
- if ((network)&&(network->config().remoteTraceTarget)) {
- Packet outp(network->config().remoteTraceTarget,RR->identity.address(),Packet::VERB_REMOTE_TRACE);
- outp.appendCString(d.data());
- outp.compress();
- RR->sw->send(tPtr,outp,true);
- }
- }
+ Packet outp(dest,RR->identity.address(),Packet::VERB_REMOTE_TRACE);
+ outp.appendCString(d.data());
+ outp.compress();
+ RR->sw->send(tPtr,outp,true);
}
-void Trace::_send(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d,const Network &network)
+void Trace::_spamToAllNetworks(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d,const Level level)
{
- _send(tPtr,d);
- if (network.config().remoteTraceTarget) {
- Packet outp(network.config().remoteTraceTarget,RR->identity.address(),Packet::VERB_REMOTE_TRACE);
- outp.appendCString(d.data());
- outp.compress();
- RR->sw->send(tPtr,outp,true);
+ Mutex::Lock l(_byNet_m);
+ Hashtable< uint64_t,std::pair< Address,Trace::Level > >::Iterator i(_byNet);
+ uint64_t *k = (uint64_t *)0;
+ std::pair<Address,Trace::Level> *v = (std::pair<Address,Trace::Level> *)0;
+ while (i.next(k,v)) {
+ if ((v)&&(v->first)&&((int)v->second >= (int)level))
+ _send(tPtr,d,v->first);
}
}
diff --git a/node/Trace.hpp b/node/Trace.hpp
index 4192d1c2..08241d37 100644
--- a/node/Trace.hpp
+++ b/node/Trace.hpp
@@ -40,6 +40,8 @@
#include "Credential.hpp"
#include "InetAddress.hpp"
#include "Dictionary.hpp"
+#include "Mutex.hpp"
+#include "Hashtable.hpp"
namespace ZeroTier {
@@ -64,6 +66,18 @@ class Trace
{
public:
/**
+ * Trace verbosity level
+ */
+ enum Level
+ {
+ NORMAL = 0,
+ VERBOSE = 10,
+ RULES = 15,
+ DEBUG = 20,
+ INSANE = 30
+ };
+
+ /**
* Filter rule evaluation result log
*
* Each rule in a rule set gets a four-bit log entry. A log entry
@@ -98,13 +112,16 @@ public:
uint8_t _l[ZT_MAX_NETWORK_RULES / 2];
};
- Trace(const RuntimeEnvironment *renv) : RR(renv) {}
+ Trace(const RuntimeEnvironment *renv) :
+ RR(renv),
+ _byNet(8)
+ {
+ }
void resettingPathsInScope(void *const tPtr,const Address &reporter,const InetAddress &reporterPhysicalAddress,const InetAddress &myPhysicalAddress,const InetAddress::IpScope scope);
- void txTimedOut(void *const tPtr,const Address &destination);
void peerConfirmingUnknownPath(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &path,const uint64_t packetId,const Packet::Verb verb);
- void peerLearnedNewPath(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &oldPath,const SharedPtr<Path> &newPath,const uint64_t packetId);
+ void peerLearnedNewPath(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &newPath,const uint64_t packetId);
void peerRedirected(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &newPath);
void incomingPacketMessageAuthenticationFailure(void *const tPtr,const SharedPtr<Path> &path,const uint64_t packetId,const Address &source,const unsigned int hops,const char *reason);
@@ -140,16 +157,18 @@ public:
void credentialRejected(void *const tPtr,const Tag &c,const char *reason);
void credentialRejected(void *const tPtr,const Revocation &c,const char *reason);
+ void updateMemoizedSettings();
+
private:
const RuntimeEnvironment *const RR;
- void _send(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d);
- void _send(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d,const uint64_t networkId);
- void _send(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d,const Network &network);
+ void _send(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d,const Address &dest);
+ void _spamToAllNetworks(void *const tPtr,const Dictionary<ZT_MAX_REMOTE_TRACE_SIZE> &d,const Level level);
-#ifdef ZT_TRACE
- char _traceMsgBuf[4096];
-#endif
+ Address _globalTarget;
+ Trace::Level _globalLevel;
+ Hashtable< uint64_t,std::pair< Address,Trace::Level > > _byNet;
+ Mutex _byNet_m;
};
} // namespace ZeroTier
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-16 22:03:42 +0000