diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-08-27 22:47:15 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-08-28 00:14:13 +0200 |
commit | de88255b0fb8c74e27cd5616f54d614b4e46b48d (patch) | |
tree | ac696bab827f3e431377bb0554f4be1a571408e0 /src/pipe_wrap.cc | |
parent | 6cd0e2664b1ce944e5e461457d160be83f70d379 (diff) | |
download | android-node-v8-de88255b0fb8c74e27cd5616f54d614b4e46b48d.tar.gz android-node-v8-de88255b0fb8c74e27cd5616f54d614b4e46b48d.tar.bz2 android-node-v8-de88255b0fb8c74e27cd5616f54d614b4e46b48d.zip |
Revert "lib,src: add unix socket getsockname/getpeername"
This reverts commit 6cd0e2664b1ce944e5e461457d160be83f70d379.
This reverts commit 7a999a13766ac68049812fedbdfd15a0250f0f07.
This reverts commit f337595441641ad36f6ab8ae770e56c1673ef692.
It turns out that on Windows, uv_pipe_getsockname() is a no-op for
client sockets. It slipped through testing because of a CI snafu.
PR-URL: https://github.com/nodejs/node/pull/2584
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Diffstat (limited to 'src/pipe_wrap.cc')
-rw-r--r-- | src/pipe_wrap.cc | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc index c22cac219d..2e1ab5b262 100644 --- a/src/pipe_wrap.cc +++ b/src/pipe_wrap.cc @@ -89,10 +89,6 @@ void PipeWrap::Initialize(Handle<Object> target, env->SetProtoMethod(t, "listen", Listen); env->SetProtoMethod(t, "connect", Connect); env->SetProtoMethod(t, "open", Open); - env->SetProtoMethod(t, "getpeername", - GetSockOrPeerName<uv_pipe_getpeername>); - env->SetProtoMethod(t, "getsockname", - GetSockOrPeerName<uv_pipe_getsockname>); #ifdef _WIN32 env->SetProtoMethod(t, "setPendingInstances", SetPendingInstances); @@ -280,28 +276,6 @@ void PipeWrap::Connect(const FunctionCallbackInfo<Value>& args) { } -template <int (*F)(const uv_pipe_t*, char*, size_t*)> -void PipeWrap::GetSockOrPeerName( - const v8::FunctionCallbackInfo<v8::Value>& args) { - CHECK(args[0]->IsObject()); - char buffer[1024]; - size_t size = sizeof(buffer); - const PipeWrap* wrap = Unwrap<PipeWrap>(args.Holder()); - const int err = F(&wrap->handle_, buffer, &size); - if (err == 0) { - const uint8_t* data = reinterpret_cast<const uint8_t*>(buffer); - const String::NewStringType type = String::kNormalString; - Local<String> path = - String::NewFromOneByte(args.GetIsolate(), data, type, size); - Environment* env = Environment::GetCurrent(args); - Local<Object> out = args[0].As<Object>(); - out->Set(env->address_string(), path); - out->Set(env->family_string(), env->pipe_string()); - } - args.GetReturnValue().Set(err); -} - - } // namespace node NODE_MODULE_CONTEXT_AWARE_BUILTIN(pipe_wrap, node::PipeWrap::Initialize) |