Merge branch 'master' into chat

whitequark · Jan 29, 2010 · f6b1355 · f6b1355
2 parents cd13106 + fe55f2c
commit f6b1355
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/libsparkle/LinkLayer.cpp b/libsparkle/LinkLayer.cpp
@@ -471,11 +471,13 @@ void LinkLayer::handleProtocolVersionReply(QByteArray &payload, SparkleNode* nod
 	if(!checkPacketExpection(node, "ProtocolVersionReply", JoinVersionRequest))
 		return;
 
-	const protocol_version_reply_t *ver = (const protocol_version_reply_t *) payload.data();
-	Log::debug("link: remote protocol version: %1") << ver->version;
+	const protocol_version_reply_t *reply = (const protocol_version_reply_t *) payload.data();
+	quint32 version = ntohl(reply->version);
 
-	if(ntohl(ver->version) != ProtocolVersion) {
-		Log::error("link: protocol version mismatch: got %1, expected %2") << ver->version << ProtocolVersion;
+	Log::debug("link: remote protocol version: %1") << version;
+
+	if(version != ProtocolVersion) {
+		Log::error("link: protocol version mismatch: got %1, expected %2") << version << ProtocolVersion;
 
 		cleanup();
 		emit joinFailed();

diff --git a/libsparkle/SparkleNode.cpp b/libsparkle/SparkleNode.cpp
@@ -20,7 +20,7 @@
 #include "SparkleNode.h"
 #include "Log.h"
 
-SparkleNode::SparkleNode(Router &router, QHostAddress realIP, quint16 realPort) : QObject(&router), _router(router), _realIP(realIP), _phantomIP(realIP), _realPort(realPort), _phantomPort(realPort), authKeyPresent(false), keysNegotiated(false) {
+SparkleNode::SparkleNode(Router &router, QHostAddress realIP, quint16 realPort) : QObject(&router), _router(router), _realIP(realIP), _realPort(realPort), _phantomPort(0), authKeyPresent(false), keysNegotiated(false) {
 	_mySessionKey.generate();
 
 	negotiationTimer.setSingleShot(true);
@@ -42,12 +42,12 @@ void SparkleNode::setSparkleMAC(const SparkleAddress& mac) {
 }
 
 void SparkleNode::setRealIP(const QHostAddress& ip) {
-	_realIP = _phantomIP = ip;
+	_realIP = ip;
 	_router.notifyNodeUpdated(this);
 }
 
 void SparkleNode::setRealPort(quint16 port) {
-	_realPort = _phantomPort = port;
+	_realPort = port;
 	_router.notifyNodeUpdated(this);
 }
 
@@ -59,6 +59,18 @@ void SparkleNode::setPhantomPort(quint16 port) {
 	_phantomPort = port;
 }
 
+QHostAddress SparkleNode::phantomIP() const {
+	if(_phantomIP.isNull())
+		return _realIP;
+	return _phantomIP;
+}
+
+quint16 SparkleNode::phantomPort() const {
+	if(_phantomPort == 0)
+		return _realPort;
+	return _phantomPort;
+}
+
 void SparkleNode::setBehindNAT(bool behindNAT) {
 	this->behindNAT = behindNAT;
 	_router.notifyNodeUpdated(this);

diff --git a/libsparkle/headers/SparkleNode.h b/libsparkle/headers/SparkleNode.h
@@ -43,8 +43,8 @@ class SparkleNode : public QObject
 	QHostAddress realIP() const		{ return _realIP; }
 	quint16 realPort() const		{ return _realPort; }
 
-	QHostAddress phantomIP() const	{ return _phantomIP; }
-	quint16 phantomPort() const		{ return _phantomPort; }
+	QHostAddress phantomIP() const;
+	quint16 phantomPort() const;
 
 	SparkleAddress sparkleMAC() const	{ return _sparkleMAC; }