tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-11-02 04:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unicode enabled on getaddrinfo (unicode targets are now supported)

Browse Source
This commit is contained in:
Manoj Ampalam 2016-10-17 00:30:44 -07:00
parent 4676c9f97a
commit 0af8ae3965
3 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/win32/win32compat/inc/sys/socket.h
View File

@ -20,3 +20,5 @@
#define send(a,b,c,d) w32_send((a), (b), (c), (d))
#define shutdown(a,b) w32_shutdown((a), (b))
#define socketpair(a,b,c,d) w32_socketpair((a), (b), (c), (d))
#define freeaddrinfo w32_freeaddrinfo
#define getaddrinfo w32_getaddrinfo

3
contrib/win32/win32compat/inc/w32posix.h
View File

@ -71,6 +71,9 @@ int w32_sigprocmask(int how, const sigset_t *set, sigset_t *oldset);
int w32_raise(int sig);
int w32_kill(int pid, int sig);
int w32_gethostname(char *, size_t);
void w32_freeaddrinfo(struct addrinfo *);
int w32_getaddrinfo(const char *, const char *,
const struct addrinfo *, struct addrinfo **);
FILE* w32_fopen_utf8(const char *, const char *);

74
contrib/win32/win32compat/socketio.c
View File

@ -999,4 +999,76 @@ w32_gethostname(char *name_utf8, size_t len) {
memcpy(name_utf8, tmp_name_utf8, strlen(tmp_name_utf8) + 1);
free(tmp_name_utf8);
return 0;
}
}
void
w32_freeaddrinfo(struct addrinfo *ai) {
struct addrinfo *cur;
while (ai) {
cur = ai;
ai = ai->ai_next;
if (cur->ai_addr)
free(cur->ai_addr);
if (cur->ai_canonname)
free(cur->ai_canonname);
free(cur);
}
}
int
w32_getaddrinfo(const char *node_utf8, const char *service_utf8,
const struct addrinfo *hints, struct addrinfo **res) {
int ret = 0;
wchar_t *node_utf16 = NULL, *service_utf16 = NULL;
struct addrinfoW *info_w = NULL;
*res = NULL;
if ((node_utf8 && (node_utf16 = utf8_to_utf16(node_utf8)) == NULL) ||
(service_utf8 && (service_utf16 = utf8_to_utf16(service_utf8)) == NULL)) {
ret = EAI_MEMORY;
goto done;
}
if ((ret = GetAddrInfoW(node_utf16, service_utf16, (ADDRINFOW*)hints, &info_w)) != 0)
goto done;
/* copy info_w to res */
{
struct addrinfoW **cur_w = &info_w;
struct addrinfo **cur = res;
while (*cur_w) {
if ((*cur = malloc(sizeof(struct addrinfo))) == NULL) {
ret = EAI_MEMORY;
goto done;
}
memcpy(*cur, *cur_w, sizeof(struct addrinfo));
(*cur)->ai_next = NULL;
if (((*cur_w)->ai_canonname && ((*cur)->ai_canonname = utf16_to_utf8((*cur_w)->ai_canonname)) == NULL) ||
((*cur_w)->ai_addrlen && ((*cur)->ai_addr = malloc((*cur_w)->ai_addrlen)) == NULL) ) {
ret = EAI_MEMORY;
goto done;
}
if ((*cur_w)->ai_addrlen)
memcpy((*cur)->ai_addr, (*cur_w)->ai_addr, (*cur_w)->ai_addrlen);
cur_w = &(*cur_w)->ai_next;
cur = &(*cur)->ai_next;
}
}
done:
if (node_utf16)
free(node_utf16);
if (service_utf16)
free(service_utf16);
if (info_w)
FreeAddrInfoW(info_w);
if (ret != 0 && *res) {
w32_freeaddrinfo(*res);
*res = NULL;
}
return ret;
}