diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2011-06-29 15:24:55 +0200 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2011-06-29 15:25:11 +0200 |
commit | 20996dbc2b5474b3b289f2b79f72eeed26f2a0ec (patch) | |
tree | 26c777c9fad7fed2482295b335d435aa7e9816a0 /src | |
parent | d64e070e26cc3545367ef38098a0fe963be0ea8d (diff) | |
download | android-node-v8-20996dbc2b5474b3b289f2b79f72eeed26f2a0ec.tar.gz android-node-v8-20996dbc2b5474b3b289f2b79f72eeed26f2a0ec.tar.bz2 android-node-v8-20996dbc2b5474b3b289f2b79f72eeed26f2a0ec.zip |
Revert "Add support for file descriptor type detection."
This reverts commit 911cbd0cef02c93f821c0c80a3d5dbad2b692c42.
This patch is broken on Linux and I don't want to think about the
functionality during the Windows port. We can reconsider it after v0.6.
Diffstat (limited to 'src')
-rw-r--r-- | src/node_net.cc | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/src/node_net.cc b/src/node_net.cc index d2017d5cad..a0bda02035 100644 --- a/src/node_net.cc +++ b/src/node_net.cc @@ -591,42 +591,6 @@ static Handle<Value> GetSockName(const Arguments& args) { return scope.Close(info); } -static Handle<Value> GetSockFamily(const Arguments& args) { - HandleScope scope; - - FD_ARG(args[0]) - - Local<Value> result; - - struct sockaddr_storage address_storage; - socklen_t len = sizeof(struct sockaddr_storage); - -#ifdef __POSIX__ - if (0 > getsockname(fd, (struct sockaddr *) &address_storage, &len)) { - return ThrowException(ErrnoException(errno, "getsockname")); - } - -#else // __MINGW32__ - if (SOCKET_ERROR == getsockname(_get_osfhandle(fd), - (struct sockaddr *) &address_storage, &len)) { - return ThrowException(ErrnoException(WSAGetLastError(), "getsockname")); - } -#endif // __MINGW32__ - switch ((address_storage).ss_family) { - case AF_INET6: - result = String::New("AF_INET6"); - break; - case AF_INET: - result = String::New("AF_INET"); - break; - case AF_UNIX: - result = String::New("AF_UNIX"); - break; - default: - result = Integer::New((address_storage).ss_family); - } - scope.Close(result); -} static Handle<Value> GetPeerName(const Arguments& args) { HandleScope scope; @@ -756,40 +720,6 @@ static Handle<Value> SocketError(const Arguments& args) { return scope.Close(Integer::New(error)); } -static Handle<Value> GetSockType(const Arguments& args) { - HandleScope scope; - - FD_ARG(args[0]) - - int type; - socklen_t len = sizeof(int); - -#ifdef __POSIX__ - int r = getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &len); - - if (r < 0) { - return ThrowException(ErrnoException(errno, "getsockopt")); - } -#else // __MINGW32__ - int r = getsockopt(_get_osfhandle(fd), SOL_SOCKET, SO_TYPE, (char*)&type, &len); - - if (r < 0) { - return ThrowException(ErrnoException(WSAGetLastError(), "getsockopt")); - } -#endif - Local<Value> result; - switch (type) { - case SOCK_STREAM: - result = String::New("SOCK_STREAM"); - break; - case SOCK_DGRAM: - result = String::New("SOCK_DGRAM"); - break; - default: - result = Integer::New(type); - } - return scope.Close(result); -} // var bytesRead = t.read(fd, buffer, offset, length); // returns null on EAGAIN or EINTR, raises an exception on all other errors @@ -1830,8 +1760,6 @@ void InitNet(Handle<Object> target) { NODE_SET_METHOD(target, "getaddrinfo", GetAddrInfo); NODE_SET_METHOD(target, "isIP", IsIP); NODE_SET_METHOD(target, "errnoException", CreateErrnoException); - NODE_SET_METHOD(target, "getsocktype", GetSockType); - NODE_SET_METHOD(target, "getsockfamily", GetSockFamily); errno_symbol = NODE_PSYMBOL("errno"); syscall_symbol = NODE_PSYMBOL("syscall"); |