Second Life viewer sources 1.23.0-RC

1 files changed, 107 insertions, 6 deletions

diff --git a/linden/indra/llmessage/net.cpp b/linden/indra/llmessage/net.cpp
index 0f0cddf..f63faa5 100644
--- a/linden/indra/llmessage/net.cpp
+++ b/linden/indra/llmessage/net.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -50,7 +51,6 @@
 #endif
 
 // linden library includes
-#include "network.h"
 #include "llerror.h"
 #include "llhost.h"
 #include "lltimer.h"
@@ -80,6 +80,7 @@ typedef int socklen_t;
 
 #endif
 
+static U32 gsnReceivingIFAddr = INVALID_HOST_IP_ADDRESS; // Address to which datagram was sent
 
 const char* LOOPBACK_ADDRESS_STRING = "127.0.0.1";
 
@@ -109,6 +110,16 @@ U32 get_sender_port()
         return ntohs(stSrcAddr.sin_port);
 }
 
+LLHost get_receiving_interface()
+{
+        return LLHost(gsnReceivingIFAddr, INVALID_PORT);
+}
+
+U32 get_receiving_interface_ip(void)
+{
+        return gsnReceivingIFAddr;
+}
+
 const char* u32_to_ip_string(U32 ip)
 {
         static char buffer[MAXADDRSTR];  /* Flawfinder: ignore */ 
@@ -383,11 +394,30 @@ S32 start_net(S32& socket_out, int& nPort)
                 return 1;
         }
 
-        // Don't bind() if we want the operating system to assign our ports for 
-        // us.
         if (NET_USE_OS_ASSIGNED_PORT == nPort)
         {
-                // Do nothing; the operating system will do it for us.
+                // Although bind is not required it will tell us which port we were
+                // assigned to.
+                stLclAddr.sin_family      = AF_INET;
+                stLclAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+                stLclAddr.sin_port        = htons(0);
+                llinfos << "attempting to connect on OS assigned port" << llendl;
+                nRet = bind(hSocket, (struct sockaddr*) &stLclAddr, sizeof(stLclAddr));
+                if (nRet < 0)
+                {
+                        llwarns << "Failed to bind on an OS assigned port error: "
+                                        << nRet << llendl;
+                }
+                else
+                {
+                        sockaddr_in socket_info;
+                        socklen_t len = sizeof(sockaddr_in);
+                        int err = getsockname(hSocket, (sockaddr*)&socket_info, &len);
+                        llinfos << "Get socket returned: " << err << " length " << len << llendl;
+                        nPort = ntohs(socket_info.sin_port);
+                        llinfos << "Assigned port: " << nPort << llendl;
+                        
+                }
         }
         else
         {
@@ -454,6 +484,21 @@ S32 start_net(S32& socket_out, int& nPort)
         llinfos << "startNet - receive buffer size : " << rec_size << llendl;
         llinfos << "startNet - send buffer size    : " << snd_size << llendl;
 
+#if LL_LINUX
+        // Turn on recipient address tracking
+        {
+                int use_pktinfo = 1;
+                if( setsockopt( hSocket, SOL_IP, IP_PKTINFO, &use_pktinfo, sizeof(use_pktinfo) ) == -1 )
+                {
+                        llwarns << "No IP_PKTINFO available" << llendl;
+                }
+                else
+                {
+                        llinfos << "IP_PKKTINFO enabled" << llendl;
+                }
+        }
+#endif
+
         //  Setup a destination address
         char achMCAddr[MAXADDRSTR] = "127.0.0.1";       /* Flawfinder: ignore */ 
         stDstAddr.sin_family =      AF_INET;
@@ -472,6 +517,52 @@ void end_net(S32& socket_out)
         }
 }
 
+#if LL_LINUX
+static int recvfrom_destip( int socket, void *buf, int len, struct sockaddr *from, socklen_t *fromlen, U32 *dstip )
+{
+        int size;
+        struct iovec iov[1];
+        char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
+        struct cmsghdr *cmsgptr;
+        struct msghdr msg = {0};
+
+        iov[0].iov_base = buf;
+        iov[0].iov_len = len;
+
+        memset( &msg, 0, sizeof msg );
+        msg.msg_name = from;
+        msg.msg_namelen = *fromlen;
+        msg.msg_iov = iov;
+        msg.msg_iovlen = 1;
+        msg.msg_control = &cmsg;
+        msg.msg_controllen = sizeof(cmsg);
+
+        size = recvmsg( socket, &msg, 0 );
+
+        if( size == -1 )
+        {
+                return -1;
+        }
+
+        for( cmsgptr = CMSG_FIRSTHDR(&msg); cmsgptr != NULL; cmsgptr = CMSG_NXTHDR( &msg, cmsgptr ) )
+        {
+                if( cmsgptr->cmsg_level == SOL_IP && cmsgptr->cmsg_type == IP_PKTINFO )
+                {
+                        in_pktinfo *pktinfo = (in_pktinfo *)CMSG_DATA(cmsgptr);
+                        if( pktinfo )
+                        {
+                                // Two choices. routed and specified. ipi_addr is routed, ipi_spec_dst is
+                                // routed. We should stay with specified until we go to multiple
+                                // interfaces
+                                *dstip = pktinfo->ipi_spec_dst.s_addr;
+                        }
+                }
+        }
+
+        return size;
+}
+#endif
+
 int receive_packet(int hSocket, char * receiveBuffer)
 {
         //  Receives data asynchronously from the socket set by initNet().
@@ -481,7 +572,14 @@ int receive_packet(int hSocket, char * receiveBuffer)
         int nRet;
         socklen_t addr_size = sizeof(struct sockaddr_in);
 
-        nRet = recvfrom(hSocket, receiveBuffer, NET_BUFFER_SIZE, 0, (struct sockaddr*)&stSrcAddr, &addr_size);
+        gsnReceivingIFAddr = INVALID_HOST_IP_ADDRESS;
+
+#if LL_LINUX
+        nRet = recvfrom_destip(hSocket, receiveBuffer, NET_BUFFER_SIZE, (struct sockaddr*)&stSrcAddr, &addr_size, &gsnReceivingIFAddr);
+#else   
+        int recv_flags = 0;
+        nRet = recvfrom(hSocket, receiveBuffer, NET_BUFFER_SIZE, recv_flags, (struct sockaddr*)&stSrcAddr, &addr_size);
+#endif
 
         if (nRet == -1)
         {
@@ -489,6 +587,9 @@ int receive_packet(int hSocket, char * receiveBuffer)
                 return 0;
         }
 
+        // Uncomment for testing if/when implementing for Mac or Windows:
+        // llinfos << "Received datagram to in addr " << u32_to_ip_string(get_receiving_interface_ip()) << llendl;
+
         return nRet;
 }