changes in memory mount and socket subsystem to port thttpd

libraries/nacl-mounts/net/SocketSubSystem.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 <string.h>
 #ifdef __GLIBC__
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/types.h>
@@ skipping 11 matching lines @@
 #include "ppapi/cpp/file_ref.h"
 #include <signal.h>
 
 SocketSubSystem::SocketSubSystem(pp::Instance* instance)
     : pp_instance_(instance)
     , factory_(this)
     , host_resolver_(NULL) {
   AddHostAddress("localhost", 0x7F000001);
 }
 
+int SocketSubSystem::setsockopt(Socket* stream, int level, int optname,
+           const void* optval, socklen_t optlen) {
+  // this is just a placeholder, chromium does not provide api for this yet
+  return 0;
+}
+
 uint32_t SocketSubSystem::AddHostAddress(const char* name, uint32_t addr) {
   return addr;
 }
 
 struct addrinfo* SocketSubSystem::CreateAddrInfo(
     const PP_NetAddress_Private& netaddr,
     const addrinfo* hints,
     const char* name) {
   struct addrinfo* ai = new addrinfo();
   struct sockaddr_in6* addr = new sockaddr_in6();
@@ skipping 52 matching lines @@
   const char* hostname = params->hostname;
   const char* servname = params->servname;
   const addrinfo* hints = params->hints;
   addrinfo** res = params->res;
 
   if (hints && hints->ai_family != AF_UNSPEC &&
       hints->ai_family != AF_INET &&
       hints->ai_family != AF_INET6) {
     *pres = PP_ERROR_FAILED;
     cond().broadcast();
-    dbgprintf("SSS::Resolve failed: incorrect ai_family\n");
     return;
   }
 
   uint32_t port = 0;
   if (servname != NULL) {
     char* cp;
     port = strtol(servname, &cp, 10);
     if (port > 0 && port <= 65535 && *cp == '\0') {
       port = htons(port);
     } else {
@@ skipping 324 matching lines @@
     if (resource) {
       TCPSocket* socket = new TCPSocket(this, O_RDWR);
       if (socket->acceptFrom(resource)) {
         return socket;
       } else {
         socket->release();
       }
     }
     errno = EINVAL;
     return 0;
-  } else {
-    errno = EBADF;
-    return 0;
   }
+  errno = EBADF;
+  return 0;
 }