diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-08 16:49:21 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-08 16:49:21 -0700 |
| commit | 4d5a6a25d373b395fa7c7c374c2e0d6da7854e46 (patch) | |
| tree | f3d2ae0ca44d3fbb0f055473ff30c46b2a7c7df8 /node/Network.cpp | |
| parent | 9d9d0ef12ccb60bda417c6bfed576ae87380e7e4 (diff) | |
| download | infinitytier-4d5a6a25d373b395fa7c7c374c2e0d6da7854e46.tar.gz infinitytier-4d5a6a25d373b395fa7c7c374c2e0d6da7854e46.zip | |
Add events for packet decode errors, etc., and re-implement TRACE as an event.
Diffstat (limited to 'node/Network.cpp')
| -rw-r--r-- | node/Network.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/node/Network.cpp b/node/Network.cpp index 1f762a91..26650ca4 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -199,12 +199,12 @@ bool Network::applyConfiguration(const SharedPtr<NetworkConfig> &conf) return true; } else { - LOG("ignored invalid configuration for network %.16llx (configuration contains mismatched network ID or issued-to address)",(unsigned long long)_id); + TRACE("ignored invalid configuration for network %.16llx (configuration contains mismatched network ID or issued-to address)",(unsigned long long)_id); } } catch (std::exception &exc) { - LOG("ignored invalid configuration for network %.16llx (%s)",(unsigned long long)_id,exc.what()); + TRACE("ignored invalid configuration for network %.16llx (%s)",(unsigned long long)_id,exc.what()); } catch ( ... ) { - LOG("ignored invalid configuration for network %.16llx (unknown exception)",(unsigned long long)_id); + TRACE("ignored invalid configuration for network %.16llx (unknown exception)",(unsigned long long)_id); } return false; } @@ -227,7 +227,7 @@ int Network::setConfiguration(const Dictionary &conf,bool saveToDisk) return 2; // OK and configuration has changed } } catch ( ... ) { - LOG("ignored invalid configuration for network %.16llx (dictionary decode failed)",(unsigned long long)_id); + TRACE("ignored invalid configuration for network %.16llx (dictionary decode failed)",(unsigned long long)_id); } return 0; } @@ -288,7 +288,7 @@ void Network::addMembershipCertificate(const CertificateOfMembership &cert,bool // Check signature, log and return if cert is invalid if (!forceAccept) { if (cert.signedBy() != controller()) { - LOG("rejected network membership certificate for %.16llx signed by %s: signer not a controller of this network",(unsigned long long)_id,cert.signedBy().toString().c_str()); + TRACE("rejected network membership certificate for %.16llx signed by %s: signer not a controller of this network",(unsigned long long)_id,cert.signedBy().toString().c_str()); return; } @@ -302,7 +302,7 @@ void Network::addMembershipCertificate(const CertificateOfMembership &cert,bool } if (!cert.verify(signer->identity())) { - LOG("rejected network membership certificate for %.16llx signed by %s: signature check failed",(unsigned long long)_id,cert.signedBy().toString().c_str()); + TRACE("rejected network membership certificate for %.16llx signed by %s: signature check failed",(unsigned long long)_id,cert.signedBy().toString().c_str()); return; } } |