fix gethostbyname on windows; close() -> EVUTIL_CLOSESOCKET()

svn:r877
This commit is contained in:
Niels Provos 2008-06-25 16:00:15 +00:00
parent 1efa70aba0
commit b7fd2ac302

View File

@ -121,7 +121,8 @@ http_connect(const char *address, u_short port)
if (!(he = gethostbyname(address))) { if (!(he = gethostbyname(address))) {
event_warn("gethostbyname"); event_warn("gethostbyname");
} }
memcpy(&sin.sin_addr, &he->h_addr, sizeof(struct in_addr)); memcpy(&sin.sin_addr, he->h_addr_list[0], he->h_length);
sin.sin_family = AF_INET;
sin.sin_port = htons(port); sin.sin_port = htons(port);
slen = sizeof(struct sockaddr_in); slen = sizeof(struct sockaddr_in);
sa = (struct sockaddr*)&sin; sa = (struct sockaddr*)&sin;
@ -254,7 +255,7 @@ http_basic_test(void)
/* connect to the second port */ /* connect to the second port */
bufferevent_free(bev); bufferevent_free(bev);
close(fd); EVUTIL_CLOSESOCKET(fd);
fd = http_connect("127.0.0.1", port + 1); fd = http_connect("127.0.0.1", port + 1);
@ -273,7 +274,7 @@ http_basic_test(void)
event_dispatch(); event_dispatch();
bufferevent_free(bev); bufferevent_free(bev);
close(fd); EVUTIL_CLOSESOCKET(fd);
evhttp_free(http); evhttp_free(http);
@ -714,7 +715,7 @@ http_failure_test(void)
event_dispatch(); event_dispatch();
bufferevent_free(bev); bufferevent_free(bev);
close(fd); EVUTIL_CLOSESOCKET(fd);
evhttp_free(http); evhttp_free(http);
@ -921,7 +922,7 @@ http_base_test(void)
event_base_dispatch(base); event_base_dispatch(base);
bufferevent_free(bev); bufferevent_free(bev);
close(fd); EVUTIL_CLOSESOCKET(fd);
evhttp_free(http); evhttp_free(http);