Showing with 136 additions and 61 deletions.
  1. +19 −9 src/pipe_wrap.cc
  2. +24 −11 src/stream_wrap.cc
  3. +3 −0 src/stream_wrap.h
  4. +11 −1 src/tcp_wrap.cc
  5. +18 −8 src/tty_wrap.cc
  6. +36 −2 src/udp_wrap.cc
  7. +25 −30 src/udp_wrap.h
28 src/pipe_wrap.cc
View file
@@ -28,20 +28,21 @@

namespace node {

using v8::Object;
using v8::Arguments;
using v8::Boolean;
using v8::Context;
using v8::Function;
using v8::FunctionTemplate;
using v8::Handle;
using v8::HandleScope;
using v8::Integer;
using v8::Local;
using v8::Object;
using v8::Persistent;
using v8::Value;
using v8::HandleScope;
using v8::FunctionTemplate;
using v8::PropertyAttribute;
using v8::String;
using v8::Function;
using v8::TryCatch;
using v8::Context;
using v8::Arguments;
using v8::Integer;
using v8::Boolean;
using v8::Value;

Persistent<Function> pipeConstructor;

@@ -82,6 +83,15 @@ void PipeWrap::Initialize(Handle<Object> target) {

t->InstanceTemplate()->SetInternalFieldCount(1);

enum PropertyAttribute attributes =
static_cast<PropertyAttribute>(v8::ReadOnly | v8::DontDelete);
t->InstanceTemplate()->SetAccessor(String::New("fd"),
StreamWrap::GetFD,
NULL,
Handle<Value>(),
v8::DEFAULT,
attributes);

NODE_SET_PROTOTYPE_METHOD(t, "close", HandleWrap::Close);
NODE_SET_PROTOTYPE_METHOD(t, "unref", HandleWrap::Unref);
NODE_SET_PROTOTYPE_METHOD(t, "ref", HandleWrap::Ref);
35 src/stream_wrap.cc
View file
@@ -38,22 +38,22 @@

namespace node {

using v8::Object;
using v8::AccessorInfo;
using v8::Arguments;
using v8::Context;
using v8::Exception;
using v8::Function;
using v8::FunctionTemplate;
using v8::Handle;
using v8::HandleScope;
using v8::Integer;
using v8::Local;
using v8::Number;
using v8::Object;
using v8::Persistent;
using v8::Value;
using v8::HandleScope;
using v8::FunctionTemplate;
using v8::String;
using v8::Function;
using v8::TryCatch;
using v8::Context;
using v8::Arguments;
using v8::Integer;
using v8::Number;
using v8::Exception;

using v8::Value;

typedef class ReqWrap<uv_shutdown_t> ShutdownWrap;

@@ -117,6 +117,19 @@ StreamWrap::StreamWrap(Handle<Object> object, uv_stream_t* stream)
}


Handle<Value> StreamWrap::GetFD(Local<String>, const AccessorInfo& args) {
#if defined(_WIN32)
return v8::Null(node_isolate);
#else
HandleScope scope;
UNWRAP(StreamWrap)
int fd = -1;
if (wrap != NULL && wrap->stream_ != NULL) fd = wrap->stream_->io_watcher.fd;
return scope.Close(Integer::New(fd, node_isolate));
#endif
}


void StreamWrap::SetHandle(uv_handle_t* h) {
HandleWrap::SetHandle(h);
stream_ = reinterpret_cast<uv_stream_t*>(h);
3 src/stream_wrap.h
View file
@@ -42,6 +42,9 @@ class StreamWrap : public HandleWrap {

static void Initialize(v8::Handle<v8::Object> target);

static v8::Handle<v8::Value> GetFD(v8::Local<v8::String>,
const v8::AccessorInfo&);

// JavaScript functions
static v8::Handle<v8::Value> ReadStart(const v8::Arguments& args);
static v8::Handle<v8::Value> ReadStop(const v8::Arguments& args);
12 src/tcp_wrap.cc
View file
@@ -39,9 +39,10 @@ using v8::Handle;
using v8::HandleScope;
using v8::Integer;
using v8::Local;
using v8::Object;
using v8::Null;
using v8::Object;
using v8::Persistent;
using v8::PropertyAttribute;
using v8::String;
using v8::TryCatch;
using v8::Undefined;
@@ -80,6 +81,15 @@ void TCPWrap::Initialize(Handle<Object> target) {

t->InstanceTemplate()->SetInternalFieldCount(1);

enum PropertyAttribute attributes =
static_cast<PropertyAttribute>(v8::ReadOnly | v8::DontDelete);
t->InstanceTemplate()->SetAccessor(String::New("fd"),
StreamWrap::GetFD,
NULL,
Handle<Value>(),
v8::DEFAULT,
attributes);

NODE_SET_PROTOTYPE_METHOD(t, "close", HandleWrap::Close);

NODE_SET_PROTOTYPE_METHOD(t, "ref", HandleWrap::Ref);
26 src/tty_wrap.cc
View file
@@ -28,20 +28,21 @@

namespace node {

using v8::Object;
using v8::Arguments;
using v8::Context;
using v8::Function;
using v8::FunctionTemplate;
using v8::Handle;
using v8::HandleScope;
using v8::Integer;
using v8::Local;
using v8::Object;
using v8::Persistent;
using v8::Value;
using v8::HandleScope;
using v8::FunctionTemplate;
using v8::PropertyAttribute;
using v8::String;
using v8::Function;
using v8::TryCatch;
using v8::Context;
using v8::Arguments;
using v8::Integer;
using v8::Undefined;
using v8::Value;


void TTYWrap::Initialize(Handle<Object> target) {
@@ -54,6 +55,15 @@ void TTYWrap::Initialize(Handle<Object> target) {

t->InstanceTemplate()->SetInternalFieldCount(1);

enum PropertyAttribute attributes =
static_cast<PropertyAttribute>(v8::ReadOnly | v8::DontDelete);
t->InstanceTemplate()->SetAccessor(String::New("fd"),
StreamWrap::GetFD,
NULL,
Handle<Value>(),
v8::DEFAULT,
attributes);

NODE_SET_PROTOTYPE_METHOD(t, "close", HandleWrap::Close);
NODE_SET_PROTOTYPE_METHOD(t, "unref", HandleWrap::Unref);

38 src/udp_wrap.cc
View file
@@ -31,10 +31,22 @@
#define SLAB_SIZE (1024 * 1024)


using namespace v8;

namespace node {

using v8::AccessorInfo;
using v8::Arguments;
using v8::Function;
using v8::FunctionTemplate;
using v8::Handle;
using v8::HandleScope;
using v8::Integer;
using v8::Local;
using v8::Object;
using v8::Persistent;
using v8::PropertyAttribute;
using v8::String;
using v8::Value;

typedef ReqWrap<uv_udp_send_t> SendWrap;

// see tcp_wrap.cc
@@ -81,6 +93,15 @@ void UDPWrap::Initialize(Handle<Object> target) {
t->InstanceTemplate()->SetInternalFieldCount(1);
t->SetClassName(String::NewSymbol("UDP"));

enum PropertyAttribute attributes =
static_cast<PropertyAttribute>(v8::ReadOnly | v8::DontDelete);
t->InstanceTemplate()->SetAccessor(String::New("fd"),
UDPWrap::GetFD,
NULL,
Handle<Value>(),
v8::DEFAULT,
attributes);

NODE_SET_PROTOTYPE_METHOD(t, "bind", Bind);
NODE_SET_PROTOTYPE_METHOD(t, "send", Send);
NODE_SET_PROTOTYPE_METHOD(t, "bind6", Bind6);
@@ -114,6 +135,19 @@ Handle<Value> UDPWrap::New(const Arguments& args) {
return scope.Close(args.This());
}


Handle<Value> UDPWrap::GetFD(Local<String>, const AccessorInfo& args) {
#if defined(_WIN32)
return v8::Null(node_isolate);
#else
HandleScope scope;
UNWRAP(UDPWrap)
int fd = (wrap == NULL) ? -1 : wrap->handle_.io_watcher.fd;
return scope.Close(Integer::New(fd, node_isolate));
#endif
}


Handle<Value> UDPWrap::DoBind(const Arguments& args, int family) {
HandleScope scope;
int r;
55 src/udp_wrap.h
View file
@@ -7,43 +7,38 @@

namespace node {

using v8::Object;
using v8::Handle;
using v8::Local;
using v8::Value;
using v8::String;
using v8::Arguments;

class UDPWrap: public HandleWrap {
public:
static void Initialize(Handle<Object> target);
static Handle<Value> New(const Arguments& args);
static Handle<Value> Bind(const Arguments& args);
static Handle<Value> Send(const Arguments& args);
static Handle<Value> Bind6(const Arguments& args);
static Handle<Value> Send6(const Arguments& args);
static Handle<Value> RecvStart(const Arguments& args);
static Handle<Value> RecvStop(const Arguments& args);
static Handle<Value> GetSockName(const Arguments& args);
static Handle<Value> AddMembership(const Arguments& args);
static Handle<Value> DropMembership(const Arguments& args);
static Handle<Value> SetMulticastTTL(const Arguments& args);
static Handle<Value> SetMulticastLoopback(const Arguments& args);
static Handle<Value> SetBroadcast(const Arguments& args);
static Handle<Value> SetTTL(const Arguments& args);
static UDPWrap* Unwrap(Local<Object> obj);

static Local<Object> Instantiate();
static void Initialize(v8::Handle<v8::Object> target);
static v8::Handle<v8::Value> GetFD(v8::Local<v8::String>,
const v8::AccessorInfo&);
static v8::Handle<v8::Value> New(const v8::Arguments& args);
static v8::Handle<v8::Value> Bind(const v8::Arguments& args);
static v8::Handle<v8::Value> Send(const v8::Arguments& args);
static v8::Handle<v8::Value> Bind6(const v8::Arguments& args);
static v8::Handle<v8::Value> Send6(const v8::Arguments& args);
static v8::Handle<v8::Value> RecvStart(const v8::Arguments& args);
static v8::Handle<v8::Value> RecvStop(const v8::Arguments& args);
static v8::Handle<v8::Value> GetSockName(const v8::Arguments& args);
static v8::Handle<v8::Value> AddMembership(const v8::Arguments& args);
static v8::Handle<v8::Value> DropMembership(const v8::Arguments& args);
static v8::Handle<v8::Value> SetMulticastTTL(const v8::Arguments& args);
static v8::Handle<v8::Value> SetMulticastLoopback(const v8::Arguments& args);
static v8::Handle<v8::Value> SetBroadcast(const v8::Arguments& args);
static v8::Handle<v8::Value> SetTTL(const v8::Arguments& args);
static UDPWrap* Unwrap(v8::Local<v8::Object> obj);

static v8::Local<v8::Object> Instantiate();
uv_udp_t* UVHandle();

private:
UDPWrap(Handle<Object> object);
UDPWrap(v8::Handle<v8::Object> object);
virtual ~UDPWrap();

static Handle<Value> DoBind(const Arguments& args, int family);
static Handle<Value> DoSend(const Arguments& args, int family);
static Handle<Value> SetMembership(const Arguments& args,
uv_membership membership);
static v8::Handle<v8::Value> DoBind(const v8::Arguments& args, int family);
static v8::Handle<v8::Value> DoSend(const v8::Arguments& args, int family);
static v8::Handle<v8::Value> SetMembership(const v8::Arguments& args,
uv_membership membership);

static uv_buf_t OnAlloc(uv_handle_t* handle, size_t suggested_size);
static void OnSend(uv_udp_send_t* req, int status);