backport initialisation of _seq member and some static checking for ICMP packet

Marian Krivos · Marian Krivos · commit fe0ba56dc47e · 2012-07-31T05:46:08.000Z
diff --git a/Net/include/Poco/Net/ICMPv4PacketImpl.h b/Net/include/Poco/Net/ICMPv4PacketImpl.h
@@ -43,6 +43,7 @@
 #include "Poco/Foundation.h"
 #include "Poco/Net/Socket.h"
 #include "Poco/Net/ICMPPacketImpl.h"
+#include <cstddef>
 
 
 namespace Poco {
@@ -67,6 +68,12 @@ class Net_API ICMPv4PacketImpl : public ICMPPacketImpl
 		Poco::UInt16 seq;
 	};
 
+	// compile-time shield against misalignment
+	poco_static_assert (offsetof(Header, code) == 0x01);
+	poco_static_assert (offsetof(Header, checksum) == 0x02);
+	poco_static_assert (offsetof(Header, id) == 0x04);
+	poco_static_assert (offsetof(Header, seq) == 0x06);
+
 	enum MessageType
 	{
 		ECHO_REPLY,
@@ -175,7 +182,7 @@ class Net_API ICMPv4PacketImpl : public ICMPPacketImpl
 	static const std::string REDIRECT_MESSAGE_CODE[REDIRECT_MESSAGE_LENGTH];
 	static const std::string TIME_EXCEEDED_CODE[TIME_EXCEEDED_LENGTH];
 	static const std::string PARAMETER_PROBLEM_CODE[PARAMETER_PROBLEM_LENGTH];
-  
+
 	Poco::UInt16 _seq;
 };
 
diff --git a/Net/src/ICMPv4PacketImpl.cpp b/Net/src/ICMPv4PacketImpl.cpp
@@ -125,8 +125,9 @@ const std::string ICMPv4PacketImpl::PARAMETER_PROBLEM_CODE[] =
 };
 
 
-ICMPv4PacketImpl::ICMPv4PacketImpl(int dataSize): 
-	ICMPPacketImpl(dataSize)
+ICMPv4PacketImpl::ICMPv4PacketImpl(int dataSize)
+	: ICMPPacketImpl(dataSize),
+	_seq(0)
 {
 	initPacket();
 }

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,9 @@ const std::string ICMPv4PacketImpl::PARAMETER_PROBLEM_CODE[] =`
`125`	`125`	`};`
`126`	`126`
`127`	`127`
`128`		`-ICMPv4PacketImpl::ICMPv4PacketImpl(int dataSize):`
`129`		`- ICMPPacketImpl(dataSize)`
	`128`	`+ICMPv4PacketImpl::ICMPv4PacketImpl(int dataSize)`
	`129`	`+ : ICMPPacketImpl(dataSize),`
	`130`	`+ _seq(0)`
`130`	`131`	`{`
`131`	`132`	`initPacket();`
`132`	`133`	`}`