From 8b1b2d8d9901a07fa9483ef7a30fe743b70b5f91 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 28 Mar 2014 09:11:20 -0700
Subject: [PATCH] send a symmetric ping packet if appropriate when pinging
 nodes

---
 libraries/shared/src/NodeList.cpp | 9 +++++++--
 libraries/shared/src/NodeList.h   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index bcd40a8de4..879377a2fd 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -791,7 +791,7 @@ QByteArray NodeList::constructPingReplyPacket(const QByteArray& pingPacket) {
     return replyPacket;
 }
 
-void NodeList::pingPublicAndLocalSocketsForInactiveNode(const SharedNodePointer& node) {
+void NodeList::pingPunchForInactiveNode(const SharedNodePointer& node) {
     
     // send the ping packet to the local and public sockets for this node
     QByteArray localPingPacket = constructPingPacket(PingType::Local);
@@ -799,6 +799,11 @@ void NodeList::pingPublicAndLocalSocketsForInactiveNode(const SharedNodePointer&
     
     QByteArray publicPingPacket = constructPingPacket(PingType::Public);
     writeDatagram(publicPingPacket, node, node->getPublicSocket());
+    
+    if (!node->getSymmetricSocket().isNull()) {
+        QByteArray symmetricPingPacket = constructPingPacket(PingType::Symmetric);
+        writeDatagram(symmetricPingPacket, node, node->getSymmetricSocket());
+    }
 }
 
 SharedNodePointer NodeList::addOrUpdateNode(const QUuid& uuid, char nodeType,
@@ -869,7 +874,7 @@ void NodeList::pingInactiveNodes() {
     foreach (const SharedNodePointer& node, getNodeHash()) {
         if (!node->getActiveSocket()) {
             // we don't have an active link to this node, ping it to set that up
-            pingPublicAndLocalSocketsForInactiveNode(node);
+            pingPunchForInactiveNode(node);
         }
     }
 }
diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h
index 182c72b670..34078b6a94 100644
--- a/libraries/shared/src/NodeList.h
+++ b/libraries/shared/src/NodeList.h
@@ -102,7 +102,7 @@ public:
 
     QByteArray constructPingPacket(PingType_t pingType = PingType::Agnostic);
     QByteArray constructPingReplyPacket(const QByteArray& pingPacket);
-    void pingPublicAndLocalSocketsForInactiveNode(const SharedNodePointer& node);
+    void pingPunchForInactiveNode(const SharedNodePointer& node);
 
     SharedNodePointer nodeWithUUID(const QUuid& nodeUUID, bool blockingLock = true);
     SharedNodePointer sendingNodeForPacket(const QByteArray& packet);