daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unix dgram socket address resolution on Linux.

v0.7.4-release
Matt Ranney 2010-07-15 14:36:21 -07:00 committed by Ryan Dahl
parent 02729d4af7
commit 98341daee2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node_net.cc
View File

@ -348,6 +348,9 @@ static Handle<Value> Connect(const Arguments& args) {
return Undefined(); return Undefined();
} }
#if defined(__APPLE__)
#define SUN_LEN(ptr) (ptr->sun_len-2)
#endif
#define ADDRESS_TO_JS(info, address_storage) \ #define ADDRESS_TO_JS(info, address_storage) \
do { \ do { \
@ -374,10 +377,14 @@ do { \
case AF_UNIX: \ case AF_UNIX: \
au = (struct sockaddr_un*)&(address_storage); \ au = (struct sockaddr_un*)&(address_storage); \
char un_path[105]; \ char un_path[105]; \
strncpy(un_path, au->sun_path, au->sun_len-2); \ size_t len; \
un_path[au->sun_len-2] = 0; \ len = SUN_LEN(au); \
strncpy(un_path, au->sun_path, len); \
un_path[len] = 0; \
(info)->Set(address_symbol, String::New(un_path)); \ (info)->Set(address_symbol, String::New(un_path)); \
break; \ break; \
default: \
(info)->Set(address_symbol, String::New("")); \
} \ } \
} while (0) } while (0)