From 221c689ebbac9bda42c005b7f0278ce420766b22 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 6 Jun 2013 04:31:12 +0200
Subject: [PATCH] udp_wrap, tcp_wrap: add out arg to AddressToJS

Prep work for removing process._errno. The handle.getsockname() function
will return a status code in the future and set the address and port
properties on the object that's passed in from JS land.
---
 src/node_internals.h | 10 ++++++++++
 src/tcp_wrap.cc      |  6 ++----
 src/udp_wrap.cc      |  3 ---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/node_internals.h b/src/node_internals.h
index 92c4fbd213..11d780e240 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -25,6 +25,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include "v8.h"
 
 namespace node {
@@ -98,6 +101,13 @@ inline v8::Local<v8::Object> NewInstance(v8::Persistent<v8::Function>& ctor,
                                           int argc = 0,
                                           v8::Handle<v8::Value>* argv = NULL);
 
+// Convert a struct sockaddr to a { address: '1.2.3.4', port: 1234 } JS object.
+// Sets address and port properties on the info object and returns it.
+// If |info| is omitted, a new object is returned.
+v8::Local<v8::Object> AddressToJS(
+    const sockaddr* addr,
+    v8::Handle<v8::Object> info = v8::Handle<v8::Object>());
+
 #ifdef _WIN32
 // emulate snprintf() on windows, _snprintf() doesn't zero-terminate the buffer
 // on overflow...
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
index cf7b027175..7401dd07ea 100644
--- a/src/tcp_wrap.cc
+++ b/src/tcp_wrap.cc
@@ -53,8 +53,6 @@ static Cached<String> onconnection_sym;
 
 typedef class ReqWrap<uv_connect_t> ConnectWrap;
 
-Local<Object> AddressToJS(const sockaddr* addr);
-
 
 Local<Object> TCPWrap::Instantiate() {
   // If this assert fire then process.binding('tcp_wrap') hasn't been
@@ -417,7 +415,7 @@ void TCPWrap::Connect6(const FunctionCallbackInfo<Value>& args) {
 
 
 // also used by udp_wrap.cc
-Local<Object> AddressToJS(const sockaddr* addr) {
+Local<Object> AddressToJS(const sockaddr* addr, Handle<Object> info) {
   static Cached<String> address_sym;
   static Cached<String> family_sym;
   static Cached<String> port_sym;
@@ -438,7 +436,7 @@ Local<Object> AddressToJS(const sockaddr* addr) {
     ipv6_sym = String::New("IPv6");
   }
 
-  Local<Object> info = Object::New();
+  if (info.IsEmpty()) info = Object::New();
 
   switch (addr->sa_family) {
   case AF_INET6:
diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc
index 01ce1c2759..bd6ac68e80 100644
--- a/src/udp_wrap.cc
+++ b/src/udp_wrap.cc
@@ -47,9 +47,6 @@ using v8::Value;
 
 typedef ReqWrap<uv_udp_send_t> SendWrap;
 
-// see tcp_wrap.cc
-Local<Object> AddressToJS(const sockaddr* addr);
-
 static Persistent<Function> constructor;
 static Cached<String> buffer_sym;
 static Cached<String> oncomplete_sym;