changes in memory mount and socket subsystem to port thttpd

libraries/nacl-mounts/net/TcpSocket.cc

 // Copyright (c) 2012 The Native Client Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/TcpSocket.h"
 
 #include <assert.h>
 #include <string.h>
 #include "../net/SocketSubSystem.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/module.h"
+#include "ppapi/cpp/private/net_address_private.h"
 #include "../util/DebugPrint.h"
 #include "../util/PthreadHelpers.h"
 
 TCPSocket::TCPSocket(SocketSubSystem* sys, int oflag)
   : ref_(1), oflag_(oflag), factory_(this), socket_(NULL),
     read_buf_(kBufSize), write_sent_(false), sys_(sys) {
 }
 
 TCPSocket::~TCPSocket() {
   assert(!socket_);
@@ skipping 133 matching lines @@
   SimpleAutoLock lock(sys_->mutex());
   assert(!socket_);
   socket_ = new pp::TCPSocketPrivate(sys_->instance());
   *pres = socket_->Connect(host, port,
       factory_.NewCallback(&TCPSocket::OnConnect, pres));
   if (*pres != PP_OK_COMPLETIONPENDING) {
     sys_->cond().broadcast();
   }
 }
 
+int TCPSocket::GetAddress(struct sockaddr* addr) {
+  struct sockaddr_in* iaddr = (struct sockaddr_in*) addr;
+  struct sockaddr_in6* iaddr6 = (struct sockaddr_in6*) addr;
+  PP_NetAddress_Private netaddr;
+  socket_->GetRemoteAddress(&netaddr);
+  PP_NetAddressFamily_Private family =
+    pp::NetAddressPrivate::GetFamily(netaddr);
+  if (family == PP_NETADDRESSFAMILY_IPV4)
+    iaddr->sin_family = AF_INET;
+  else if (family == PP_NETADDRESSFAMILY_IPV6)
+    iaddr->sin_family = AF_INET6;
+  else return -1;

[Evgeniy Stepanov, 2012/06/18 11:23:21]

This is not checked at the caller side.
Just set the field to AF_UNSPEC and be done with it.
Should not really happen.

[vissi, 2012/06/18 11:29:14]

Done.

+  iaddr6->sin6_port = pp::NetAddressPrivate::GetPort(netaddr);
+  if (family == PP_NETADDRESSFAMILY_IPV6) {
+    pp::NetAddressPrivate::GetAddress(
+        netaddr, &iaddr6->sin6_addr, sizeof(in6_addr));
+  } else {
+    pp::NetAddressPrivate::GetAddress(
+        netaddr, &iaddr->sin_addr, sizeof(in_addr));
+  }
+  return 0;
+}
+
 void TCPSocket::OnConnect(int32_t result, int32_t* pres) {
   SimpleAutoLock lock(sys_->mutex());
   if (result == PP_OK) {
     Read(PP_OK, NULL);
   } else {
     delete socket_;
     socket_ = NULL;
   }
   *pres = result;
   sys_->cond().broadcast();
@@ skipping 90 matching lines @@
 bool TCPSocket::Accept(int32_t result, PP_Resource resource, int32_t* pres) {
   SimpleAutoLock lock(sys_->mutex());
   assert(!socket_);
   socket_ = new pp::TCPSocketPrivate(pp::PassRef(), resource);
   Read(PP_OK, NULL);
   *pres = PP_OK;
   sys_->cond().broadcast();
   return true;
 }