A small change to keep Cumulus compatibe with Poco 1.3.6p1 even if I …

…advise to use a Poco version more greater (or equal) than 1.4.0.
OpenRTMFP · Jan 8, 2013 · a98e470 · a98e470
1 parent 07c3c86
commit a98e470
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/CumulusLib/include/Util.h b/CumulusLib/include/Util.h
@@ -18,6 +18,7 @@
 #include "Cumulus.h"
 #include "Poco/NullStream.h"
 #include "Poco/Net/SocketAddress.h"
+#include "string.h"
 #include <vector>
 #include <map>
 
@@ -49,4 +50,9 @@ inline Poco::UInt8 Util::Get7BitValueSize(Poco::UInt32 value) {
 	return Get7BitValueSize((Poco::UInt64)value);
 }
 
+inline bool Util::SameAddress(const Poco::Net::SocketAddress& address1,const Poco::Net::SocketAddress& address2) {
+	return std::memcmp(address1.addr(),address2.addr(),address1.length())==0 && address1.port() == address2.port();
+}
+
+
 } // namespace Cumulus
diff --git a/CumulusLib/sources/FlowWriter.cpp b/CumulusLib/sources/FlowWriter.cpp
@@ -297,7 +297,7 @@ void FlowWriter::acknowledgment(PacketReader& reader) {
 }
 
 void FlowWriter::manage(Invoker& invoker) {
-	if(!consumed() & !_band.failed()) {
+	if(!consumed() && !_band.failed()) {
 		try {
 			if(_trigger.raise())
 				raiseMessage();

diff --git a/CumulusLib/sources/Util.cpp b/CumulusLib/sources/Util.cpp
@@ -40,11 +40,6 @@ Util::Util() {
 Util::~Util() {
 }
 
-bool Util::SameAddress(const SocketAddress& address1,const SocketAddress& address2) {
-	return memcmp(address1.addr(),address2.addr(),address1.length())==0 && address1.port() == address2.port();
-}
-
-
 string Util::FormatHex(const UInt8* data,UInt32 size) {
 	ostringstream oss;
 	HexBinaryEncoder(oss).write((char*)data,size);

diff --git a/CumulusServer/sources/UDPSocket.cpp b/CumulusServer/sources/UDPSocket.cpp
@@ -16,6 +16,7 @@
 */
 
 #include "UDPSocket.h"
+#include "Util.h"
 #include "Logs.h"
 #include "Poco/Buffer.h"
 #include "Poco/Format.h"
@@ -94,7 +95,7 @@ void UDPSocket::close() {
 bool UDPSocket::bind(const Poco::Net::SocketAddress & address) {
 	_error.clear();
 	if(_bound) {
-		if(_pSocket->address()==address)
+		if(Util::SameAddress(_pSocket->address(),address))
 			return true;
 		_error = format("UDPSocket already bound on %s, close the socket before",_pSocket->address().toString());
 		return false;