encapsulate IP endpoint address as byte string

libp2p/Common.cpp

@@ -144,6 +144,31 @@ std::string p2p::reasonOf(DisconnectReason _r)
 	}
 }
 
+void NodeIPEndpoint::streamRLP(RLPStream& _s, RLPAppend _inline) const
+{
+	if (_inline == StreamList)
+		_s.appendList(3);
+	if (address.is_v4())
+		_s << bytesConstRef(&address.to_v4().to_bytes()[0], 4);
+	else if (address.is_v6())
+		_s << bytesConstRef(&address.to_v6().to_bytes()[0], 16);
+	else
+		_s << bytes();
+	_s << udpPort << tcpPort;
+}
+
+void NodeIPEndpoint::interpretRLP(RLP const& _r)
+{
+	if (_r[0].size() == 4)
+		address = bi::address_v4(*(bi::address_v4::bytes_type*)_r[0].toBytes().data());
+	else if (_r[0].size() == 16)
+		address = bi::address_v6(*(bi::address_v6::bytes_type*)_r[0].toBytes().data());
+	else
+		address = bi::address();
+	udpPort = _r[1].toInt<uint16_t>();
+	tcpPort = _r[2].toInt<uint16_t>();
+}
+
 namespace dev {
 	
 std::ostream& operator<<(std::ostream& _out, dev::p2p::NodeIPEndpoint const& _ep)

libp2p/Common.h

@@ -186,8 +186,8 @@ struct NodeIPEndpoint
 	
 	bool isAllowed() const { return NodeIPEndpoint::test_allowLocal ? !address.is_unspecified() : isPublicAddress(address); }
 	
-	void streamRLP(RLPStream& _s, RLPAppend _inline = StreamList) const { if (_inline == StreamList) _s.appendList(3); if (address.is_v4()) _s << address.to_v4().to_bytes(); else if (address.is_v6()) _s << address.to_v6().to_bytes(); else _s << ""; _s << udpPort << tcpPort; }
+	void streamRLP(RLPStream& _s, RLPAppend _inline = StreamList) const;
-	void interpretRLP(RLP const& _r) { if (_r[0].size() == 0) address = bi::address(); else if (_r[0].size() == 4) address = bi::address_v4(_r[0].toArray<byte, 4>()); else address = bi::address_v6(_r[0].toArray<byte, 16>()); udpPort = _r[1].toInt<uint16_t>(); tcpPort = _r[2].toInt<uint16_t>(); }
+	void interpretRLP(RLP const& _r);
 };
 	
 struct Node

libp2p/NodeTable.cpp

@@ -492,7 +492,7 @@ void NodeTable::onReceived(UDPSocketFace*, bi::udp::endpoint const& _from, bytes
 				}
 
 				vector<shared_ptr<NodeEntry>> nearest = nearestNodeEntries(in.target);
-				static unsigned const nlimit = (m_socketPointer->maxDatagramSize - 111) / 87;
+				static unsigned const nlimit = (m_socketPointer->maxDatagramSize - 109) / 90;
 				for (unsigned offset = 0; offset < nearest.size(); offset += nlimit)
 				{
 					Neighbours out(_from, nearest, offset, nlimit);

test/libp2p/net.cpp

@@ -235,8 +235,8 @@ BOOST_AUTO_TEST_CASE(neighboursPacketLength)
 	std::vector<std::pair<KeyPair,unsigned>> testNodes(TestNodeTable::createTestNodes(16));
 	bi::udp::endpoint to(boost::asio::ip::address::from_string("127.0.0.1"), 30000);
 	
-	// hash(32), signature(65), overhead: packet(2), type(1), nodeList(2), ts(9),
+	// hash(32), signature(65), overhead: packetSz(3), type(1), nodeListSz(3), ts(5),
-	static unsigned const nlimit = (1280 - 111) / 87;
+	static unsigned const nlimit = (1280 - 109) / 90; // neighbour: 2 + 65 + 3 + 3 + 17
 	for (unsigned offset = 0; offset < testNodes.size(); offset += nlimit)
 	{
 		Neighbours out(to);

test/libp2p/peer.cpp

@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(saveNodes)
 	for (auto i: r[2])
 	{
 		BOOST_REQUIRE(i.itemCount() == 4 || i.itemCount() == 11);
-		BOOST_REQUIRE(i[0].itemCount() == 4 || i[0].itemCount() == 16);
+		BOOST_REQUIRE(i[0].size() == 4 || i[0].size() == 16);
 	}
 }