luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use uv_inet_ntop/uv_inet_pton, instead of the c-ares implementations

Browse Source
This commit is contained in:
Bert Belder 2012-08-06 23:55:19 +02:00
parent 32f93e14cb
commit 3a8bb3b2b1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/uv-common.c
View File

@ -28,10 +28,6 @@
#include <stdlib.h> /* malloc */
#include <string.h> /* memset */
/* use inet_pton from c-ares if necessary */
#include "ares_config.h"
#include "ares/inet_net_pton.h"
#include "ares/inet_ntop.h"
#define XX(uc, lc) case UV_##uc: return sizeof(uv_##lc##_t);
@ -182,21 +178,21 @@ struct sockaddr_in6 uv_ip6_addr(const char* ip, int port) {
addr.sin6_family = AF_INET6;
addr.sin6_port = htons(port);
ares_inet_pton(AF_INET6, ip, &addr.sin6_addr);
uv_inet_pton(AF_INET6, ip, &addr.sin6_addr);
return addr;
}
int uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) {
const char* d = ares_inet_ntop(AF_INET, &src->sin_addr, dst, size);
return d != dst;
uv_err_t err = uv_inet_ntop(AF_INET, &src->sin_addr, dst, size);
return err.code != UV_OK;
}
int uv_ip6_name(struct sockaddr_in6* src, char* dst, size_t size) {
const char* d = ares_inet_ntop(AF_INET6, &src->sin6_addr, dst, size);
return d != dst;
uv_err_t err = uv_inet_ntop(AF_INET6, &src->sin6_addr, dst, size);
return err.code != UV_OK;
}