diff options
| -rw-r--r-- | node/IncomingPacket.cpp | 5 | ||||
| -rw-r--r-- | node/Packet.hpp | 6 | ||||
| -rw-r--r-- | node/Switch.cpp | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp index 9489b16e..be3d082b 100644 --- a/node/IncomingPacket.cpp +++ b/node/IncomingPacket.cpp @@ -99,7 +99,6 @@ bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,void *tPtr) default: // ignore unknown verbs, but if they pass auth check they are "received" peer->received(tPtr,_path,hops(),packetId(),v,0,Packet::VERB_NOP,false,0); return true; - case Packet::VERB_HELLO: return _doHELLO(RR,tPtr,true); case Packet::VERB_ERROR: return _doERROR(RR,tPtr,peer); case Packet::VERB_OK: return _doOK(RR,tPtr,peer); @@ -122,7 +121,7 @@ bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,void *tPtr) return false; } } catch ( ... ) { - RR->t->incomingPacketInvalid(tPtr,_path,packetId(),sourceAddress,hops(),verb(),"unexpected exception in tryDecode() (outer)"); + RR->t->incomingPacketInvalid(tPtr,_path,packetId(),sourceAddress,hops(),verb(),"unexpected exception in tryDecode()"); return true; } } @@ -332,7 +331,7 @@ bool IncomingPacket::_doHELLO(const RuntimeEnvironment *RR,void *tPtr,const bool } } - // Handle COR if present (older versions don't send this) + // Certificates of representation (if present) if ((ptr + 2) <= size()) { if (at<uint16_t>(ptr) > 0) { CertificateOfRepresentation cor; diff --git a/node/Packet.hpp b/node/Packet.hpp index b8e69fa9..4192b4e3 100644 --- a/node/Packet.hpp +++ b/node/Packet.hpp @@ -1274,12 +1274,6 @@ public: /** * Encrypt/decrypt a separately armored portion of a packet * - * This currently uses Salsa20/12, but any message that uses this should - * incorporate a cipher selector to permit this to be changed later. To - * ensure that key stream is not reused, the key is slightly altered for - * this use case and the same initial 32 keystream bytes that are taken - * for MAC in ordinary armor() are also skipped here. - * * This is currently only used to mask portions of HELLO as an extra * security precation since most of that message is sent in the clear. * diff --git a/node/Switch.cpp b/node/Switch.cpp index eee49775..9c9daac9 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -60,7 +60,7 @@ void Switch::onRemotePacket(void *tPtr,const int64_t localSocket,const InetAddre try { const uint64_t now = RR->node->now(); - SharedPtr<Path> path(RR->topology->getPath(localSocket,fromAddr)); + const SharedPtr<Path> path(RR->topology->getPath(localSocket,fromAddr)); path->received(now); if (len == 13) { |