handle activation and setting of symmetric socket

libraries/shared/src/Node.cpp

@@ -85,6 +85,15 @@ void Node::setLocalSocket(const HifiSockAddr& localSocket) {
     _localSocket = localSocket;
 }
 
+void Node::setSymmetricSocket(const HifiSockAddr& symmetricSocket) {
+    if (_activeSocket == &_symmetricSocket) {
+        // if the active socket was the symmetric socket then reset it to NULL
+        _activeSocket = NULL;
+    }
+    
+    _symmetricSocket = symmetricSocket;
+}
+
 void Node::activateLocalSocket() {
     qDebug() << "Activating local socket for node" << *this;
     _activeSocket = &_localSocket;
@@ -95,6 +104,11 @@ void Node::activatePublicSocket() {
     _activeSocket = &_publicSocket;
 }
 
+void Node::activateSymmetricSocket() {
+    qDebug() << "Activating symmetric socket for node" << *this;
+    _activeSocket = &_symmetricSocket;
+}
+
 void Node::recordBytesReceived(int bytesReceived) {
     if (!_bytesReceivedMovingAverage) {
         _bytesReceivedMovingAverage = new SimpleMovingAverage(100);

libraries/shared/src/Node.h

@@ -71,12 +71,13 @@ public:
     const HifiSockAddr& getLocalSocket() const { return _localSocket; }
     void setLocalSocket(const HifiSockAddr& localSocket);
     const HifiSockAddr& getSymmetricSocket() const { return _symmetricSocket; }
-    void setSymmetricSocket(const HifiSockAddr& symmetricSocket) { _symmetricSocket = symmetricSocket; }
+    void setSymmetricSocket(const HifiSockAddr& symmetricSocket);
     
     const HifiSockAddr* getActiveSocket() const { return _activeSocket; }
 
     void activatePublicSocket();
     void activateLocalSocket();
+    void activateSymmetricSocket();
     
     const QUuid& getConnectionSecret() const { return _connectionSecret; }
     void setConnectionSecret(const QUuid& connectionSecret) { _connectionSecret = connectionSecret; }

libraries/shared/src/NodeList.cpp

@@ -294,6 +294,15 @@ void NodeList::processNodeData(const HifiSockAddr& senderSockAddr, const QByteAr
                 matchingNode->setLastHeardMicrostamp(usecTimestampNow());
                 QByteArray replyPacket = constructPingReplyPacket(packet);
                 writeDatagram(replyPacket, matchingNode, senderSockAddr);
+                
+                // If we don't have a symmetric socket for this node and this socket doesn't match
+                // what we have for public and local then set it as the symmetric.
+                // This allows a server on a reachable port to communicate with nodes on symmetric NATs
+                if (matchingNode->getSymmetricSocket().isNull()) {
+                    if (senderSockAddr != matchingNode->getLocalSocket() && senderSockAddr != matchingNode->getPublicSocket()) {
+                        matchingNode->setSymmetricSocket(senderSockAddr);
+                    }
+                }
             }
             
             break;
@@ -879,6 +888,9 @@ void NodeList::activateSocketFromNodeCommunication(const QByteArray& packet, con
         sendingNode->activateLocalSocket();
     } else if (pingType == PingType::Public && !sendingNode->getActiveSocket()) {
         sendingNode->activatePublicSocket();
+    } else if (pingType == PingType::Symmetric && !sendingNode->getActiveSocket()) {
+        
+
     }
 }
 

libraries/shared/src/NodeList.h

@@ -58,6 +58,7 @@ namespace PingType {
     const PingType_t Agnostic = 0;
     const PingType_t Local = 1;
     const PingType_t Public = 2;
+    const PingType_t Symmetric = 3;
 }
 
 class NodeList : public QObject {