public/libsxmp
public/libsxmp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes with gethostbyname occured after win32 porting ...

Browse Source
This commit is contained in:
Alexander Vdolainen 2015-03-03 19:46:30 +02:00
parent f3073beccd
commit ecc8275674
2 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/connection.c
View File

@ -2166,7 +2166,11 @@ int connection_initiate(conn_t *co, const char *host, int port,
} }
//r=__resolvehost(host, buf, __TMPBUFLEN, &host_); //r=__resolvehost(host, buf, __TMPBUFLEN, &host_);
host_=gethostbyname(host); #ifdef WIN32
host_ = gethostbyname(host);
#else
r=__resolvehost(host, buf, __TMPBUFLEN, &host_);
#endif
if(errno) { if(errno) {
r = ENOENT; r = ENOENT;

47
lib/support.c
View File

@ -47,8 +47,8 @@
#ifdef uuid_t #ifdef uuid_t
#undef uuid_t #undef uuid_t
#endif #endif
#ifdef WIN32 #ifdef WIN32
typedef unsigned char uuid_t[16]; typedef unsigned char uuid_t[16];
void uuid_generate_random(uuid_t out){ void uuid_generate_random(uuid_t out){
@ -107,45 +107,26 @@ char *__generate_uuid(void)
} }
/* networking helpers */ /* networking helpers */
#ifndef WIN32
int __resolvehost(const char *hostname, char *buf, int buf_len, int __resolvehost(const char *hostname, char *buf, int buf_len,
struct hostent **rhp) struct hostent **rhp)
{ {
#ifndef WIN32 struct hostent *hostbuf ;//= malloc(sizeof(struct hostent));
return 0; struct hostent *hp = *rhp = NULL;
#else int herr = 0, hres = 0;
return 0;
#endif
// #ifndef WIN32
// struct hostent *hostbuf ;//= malloc(sizeof(struct hostent));
// // #endif
// struct hostent *hp = *rhp = NULL;
// int herr = 0, hres = 0;
// printf("__resolvehost hn %s buf %s\n", hostname,buf);
// #ifdef WIN32 hostbuf = malloc(sizeof(struct hostent));
// *rhp=gethostbyname(hostname); if(!hostbuf) return NO_ADDRESS;
// printf("__resolvehost hn err %s \n", strerror(errno)); hres = gethostbyname_r(hostname, hostbuf,
// #else buf, buf_len, &hp, &herr);
// hostbuf = malloc(sizeof(struct hostent));
// if(!hostbuf) return NO_ADDRESS;
// hres = gethostbyname_r(hostname, hostbuf,
// buf, buf_len, &hp, &herr);
if(hres) return NO_ADDRESS;
*rhp = hp;
return NETDB_SUCCESS;
// if(hres) return NO_ADDRESS;
// #endif
// *rhp = hp;
// #ifdef WIN32
// if (!*rhp) return NO_ADDRESS;
// else
// return 0;
// #else
// return NETDB_SUCCESS;
// #endif
} }
#endif
/* sexp helpers */ /* sexp helpers */
int sexp_list_car(sexp_t *expr, sexp_t **sx) int sexp_list_car(sexp_t *expr, sexp_t **sx)