Use a per-process server address for the GLES server

Previously we used a hardcoded address (tcp port, unix pipe path,
etc.) for the OpenGLRender system. Multiple emulators would all try to
listen on the same address, with the system non-deterministically (?)
choosing which one accepted each new connection. This resulted in
frames going to the wrong emulator window, one emulator shutting down
another's OpenGL system, etc.

Now the OpenGLRender server requests an unused tcp port or derives a
path from the pid, and reports the address back to the emulator client
to use for future connections from the guest.

Change-Id: I6af2eac0c7f27670a3b6595772eebc7aa2b24688

7 files changed, 39 insertions, 33 deletions

diff --git a/emulator/opengl/shared/OpenglCodecCommon/SocketStream.h b/emulator/opengl/shared/OpenglCodecCommon/SocketStream.h
index 3a501b4..b0a481b 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/SocketStream.h
+++ b/emulator/opengl/shared/OpenglCodecCommon/SocketStream.h
@@ -22,13 +22,14 @@
 class SocketStream : public IOStream {
 public:
     typedef enum { ERR_INVALID_SOCKET = -1000 } SocketStreamError;
+    static const size_t MAX_ADDRSTR_LEN = 256;
 
     explicit SocketStream(size_t bufsize = 10000);
     virtual ~SocketStream();
 
-    virtual int listen(unsigned short port) = 0;
+    virtual int listen(char addrstr[MAX_ADDRSTR_LEN]) = 0;
     virtual SocketStream *accept() = 0;
-    virtual int connect(unsigned short port) = 0;
+    virtual int connect(const char* addr) = 0;
 
     virtual void *allocBuffer(size_t minSize);
     virtual int commitBuffer(size_t size);
diff --git a/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp b/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp
index 4da2cec..8a6e56e 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp
+++ b/emulator/opengl/shared/OpenglCodecCommon/TcpStream.cpp
@@ -28,6 +28,8 @@
 #include <ws2tcpip.h>
 #endif
 
+#define LISTEN_BACKLOG 4
+
 TcpStream::TcpStream(size_t bufSize) :
     SocketStream(bufSize)
 {
@@ -47,10 +49,22 @@ TcpStream::TcpStream(int sock, size_t bufSize) :
     setsockopt( sock, IPPROTO_TCP, TCP_NODELAY, (const char*)&flag, sizeof(flag) );
 }
 
-int TcpStream::listen(unsigned short port)
+int TcpStream::listen(char addrstr[MAX_ADDRSTR_LEN])
 {
-    m_sock = socket_loopback_server(port, SOCK_STREAM);
-    if (!valid()) return int(ERR_INVALID_SOCKET);
+    m_sock = socket_loopback_server(0, SOCK_STREAM);
+    if (!valid())
+        return int(ERR_INVALID_SOCKET);
+
+    /* get the actual port number assigned by the system */
+    struct sockaddr_in addr;
+    socklen_t addrLen = sizeof(addr);
+    memset(&addr, 0, sizeof(addr));
+    if (getsockname(m_sock, (struct sockaddr*)&addr, &addrLen) < 0) {
+        close(m_sock);
+        return int(ERR_INVALID_SOCKET);
+    }
+    snprintf(addrstr, MAX_ADDRSTR_LEN - 1, "%hu", ntohs(addr.sin_port));
+    addrstr[MAX_ADDRSTR_LEN-1] = '\0';
 
     return 0;
 }
@@ -78,8 +92,9 @@ SocketStream * TcpStream::accept()
     return clientStream;
 }
 
-int TcpStream::connect(unsigned short port)
+int TcpStream::connect(const char* addr)
 {
+    int port = atoi(addr);
     return connect("127.0.0.1",port);
 }
 
diff --git a/emulator/opengl/shared/OpenglCodecCommon/TcpStream.h b/emulator/opengl/shared/OpenglCodecCommon/TcpStream.h
index 811a871..f5b462b 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/TcpStream.h
+++ b/emulator/opengl/shared/OpenglCodecCommon/TcpStream.h
@@ -21,9 +21,9 @@
 class TcpStream : public SocketStream {
 public:
     explicit TcpStream(size_t bufsize = 10000);
-    virtual int listen(unsigned short port);
+    virtual int listen(char addrstr[MAX_ADDRSTR_LEN]);
     virtual SocketStream *accept();
-    virtual int connect(unsigned short port);
+    virtual int connect(const char* addr);
     int connect(const char* hostname, unsigned short port);
 private:
     TcpStream(int sock, size_t bufSize);
diff --git a/emulator/opengl/shared/OpenglCodecCommon/UnixStream.cpp b/emulator/opengl/shared/OpenglCodecCommon/UnixStream.cpp
index 8e463a3..b2eef6d 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/UnixStream.cpp
+++ b/emulator/opengl/shared/OpenglCodecCommon/UnixStream.cpp
@@ -86,15 +86,13 @@ make_unix_path(char *path, size_t  pathlen, int port_number)
 }
 
 
-int UnixStream::listen(unsigned short port)
+int UnixStream::listen(char addrstr[MAX_ADDRSTR_LEN])
 {
-    char  path[PATH_MAX];
-
-    if (make_unix_path(path, sizeof(path), port) < 0) {
+    if (make_unix_path(addrstr, MAX_ADDRSTR_LEN, getpid()) < 0) {
         return -1;
     }
 
-    m_sock = socket_local_server(path, ANDROID_SOCKET_NAMESPACE_FILESYSTEM, SOCK_STREAM);
+    m_sock = socket_local_server(addrstr, ANDROID_SOCKET_NAMESPACE_FILESYSTEM, SOCK_STREAM);
     if (!valid()) return int(ERR_INVALID_SOCKET);
 
     return 0;
@@ -123,14 +121,9 @@ SocketStream * UnixStream::accept()
     return clientStream;
 }
 
-int UnixStream::connect(unsigned short port)
+int UnixStream::connect(const char* addr)
 {
-    char  path[PATH_MAX];
-
-    if (make_unix_path(path, sizeof(path), port) < 0)
-        return -1;
-
-    m_sock = socket_local_client(path, ANDROID_SOCKET_NAMESPACE_FILESYSTEM, SOCK_STREAM);
+    m_sock = socket_local_client(addr, ANDROID_SOCKET_NAMESPACE_FILESYSTEM, SOCK_STREAM);
     if (!valid()) return -1;
 
     return 0;
diff --git a/emulator/opengl/shared/OpenglCodecCommon/UnixStream.h b/emulator/opengl/shared/OpenglCodecCommon/UnixStream.h
index c184b19..95e7431 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/UnixStream.h
+++ b/emulator/opengl/shared/OpenglCodecCommon/UnixStream.h
@@ -21,9 +21,9 @@
 class UnixStream : public SocketStream {
 public:
     explicit UnixStream(size_t bufsize = 10000);
-    virtual int listen(unsigned short port);
+    virtual int listen(char addrstr[MAX_ADDRSTR_LEN]);
     virtual SocketStream *accept();
-    virtual int connect(unsigned short port);
+    virtual int connect(const char* addr);
 private:
     UnixStream(int sock, size_t bufSize);
 };
diff --git a/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp b/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp
index e1a0b9b..76907a0 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp
+++ b/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp
@@ -73,10 +73,10 @@ make_pipe_name(char *path, size_t  pathlen, int port_number)
  * Also, connect() must create a pipe handle with CreateFile() and
  * wait for a server instance with WaitNamedPipe()
  */
-int Win32PipeStream::listen(unsigned short port)
+int Win32PipeStream::listen(char addrstr[MAX_ADDRSTR_LEN])
 {
-    // just save the port number for accept()
-    m_port = port;
+    m_port = GetCurrentProcessId();
+    make_pipe_name(addrstr, MAX_ADDRSTR_LEN, m_port);
     return 0;
 }
 
@@ -120,20 +120,17 @@ SocketStream * Win32PipeStream::accept()
     return clientStream;
 }
 
-int Win32PipeStream::connect(unsigned short port)
+int Win32PipeStream::connect(const char* addr)
 {
-    char   path[NAMED_PIPE_MAX+1];
     HANDLE pipe;
     int    tries = 10;
 
-    make_pipe_name(path, sizeof(path), port);
-
     /* We're going to loop in order to wait for the pipe server to
      * be setup properly.
      */
     for (; tries > 0; tries--) {
         pipe = ::CreateFile(
-                    path,                          // pipe name
+                    addr,                          // pipe name
                     GENERIC_READ | GENERIC_WRITE,  // read & write
                     0,                             // no sharing
                     NULL,                          // default security attrs
@@ -161,7 +158,7 @@ int Win32PipeStream::connect(unsigned short port)
         }
 
         /* Wait for 5 seconds */
-        if ( !WaitNamedPipe(path, 5000) ) {
+        if ( !WaitNamedPipe(addr, 5000) ) {
             ERR("%s: WaitNamedPipe failed: %d\n", __FUNCTION__, (int)GetLastError());
             errno = EINVAL;
             return -1;
diff --git a/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.h b/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.h
index 4114545..0897e55 100644
--- a/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.h
+++ b/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.h
@@ -23,9 +23,9 @@ class Win32PipeStream : public SocketStream {
 public:
     explicit Win32PipeStream(size_t bufsize = 10000);
     virtual ~Win32PipeStream();
-    virtual int listen(unsigned short port);
+    virtual int listen(char addrstr[MAX_ADDRSTR_LEN]);
     virtual SocketStream *accept();
-    virtual int connect(unsigned short port);
+    virtual int connect(const char* addr);
 
     virtual int commitBuffer(size_t size);
     virtual const unsigned char *readFully(void *buf, size_t len);