Index: bufferevent_async.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/bufferevent_async.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 bufferevent_async.c --- bufferevent_async.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ bufferevent_async.c 14 Apr 2010 08:52:36 -0000 @@ -285,7 +285,7 @@ be_async_destruct(struct bufferevent *be /* delete this in case non-blocking connect was used */ event_del(&bev->ev_write); if (bev_p->options & BEV_OPT_CLOSE_ON_FREE) - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); _bufferevent_del_generic_timeout_cbs(bev); } Index: bufferevent_sock.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/bufferevent_sock.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 bufferevent_sock.c --- bufferevent_sock.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ bufferevent_sock.c 14 Apr 2010 08:52:36 -0000 @@ -419,7 +419,7 @@ bufferevent_socket_connect(struct buffer freesock: _bufferevent_run_eventcb(bev, BEV_EVENT_ERROR); if (ownfd) - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); /* do something about the error? */ done: _bufferevent_decref_and_unlock(bev); @@ -560,7 +560,7 @@ be_socket_destruct(struct bufferevent *b event_del(&bufev->ev_write); if (bufev_p->options & BEV_OPT_CLOSE_ON_FREE) - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); } static int Index: evdns.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/evdns.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 evdns.c --- evdns.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ evdns.c 14 Apr 2010 08:52:36 -0000 @@ -401,8 +401,6 @@ static int strtoint(const char *const st EVLOCK_ASSERT_LOCKED((base)->lock) #endif -#define CLOSE_SOCKET(s) EVUTIL_CLOSESOCKET(s) - static const char * debug_ntoa(u32 address) { @@ -1983,7 +1981,7 @@ server_port_free(struct evdns_server_por EVUTIL_ASSERT(!port->refcnt); EVUTIL_ASSERT(!port->pending_replies); if (port->socket > 0) { - CLOSE_SOCKET(port->socket); + evutil_closesocket(port->socket); port->socket = -1; } (void) event_del(&port->event); @@ -2237,7 +2235,7 @@ evdns_base_clear_nameservers_and_suspend if (evtimer_initialized(&server->timeout_event)) (void) evtimer_del(&server->timeout_event); if (server->socket >= 0) - CLOSE_SOCKET(server->socket); + evutil_closesocket(server->socket); mm_free(server); if (next == started_at) break; @@ -2374,7 +2372,7 @@ _evdns_nameserver_add_impl(struct evdns_ return 0; out2: - CLOSE_SOCKET(ns->socket); + evutil_closesocket(ns->socket); out1: event_debug_unassign(&ns->event); mm_free(ns); @@ -3695,7 +3693,7 @@ static void evdns_nameserver_free(struct nameserver *server) { if (server->socket >= 0) - CLOSE_SOCKET(server->socket); + evutil_closesocket(server->socket); (void) event_del(&server->event); event_debug_unassign(&server->event); if (server->state == 0) Index: event.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/event.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 event.c --- event.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ event.c 14 Apr 2010 08:52:36 -0000 @@ -624,8 +624,8 @@ event_base_free(struct event_base *base) /* threading fds if we have them */ if (base->th_notify_fd[0] != -1) { event_del(&base->th_notify); - EVUTIL_CLOSESOCKET(base->th_notify_fd[0]); - EVUTIL_CLOSESOCKET(base->th_notify_fd[1]); + evutil_closesocket(base->th_notify_fd[0]); + evutil_closesocket(base->th_notify_fd[1]); base->th_notify_fd[0] = -1; base->th_notify_fd[1] = -1; event_debug_unassign(&base->th_notify); Index: evutil.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/evutil.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 evutil.c --- evutil.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ evutil.c 14 Apr 2010 08:52:36 -0000 @@ -206,7 +206,7 @@ evutil_socketpair(int family, int type, goto tidy_up_and_fail; if (size != sizeof(listen_addr)) goto abort_tidy_up_and_fail; - EVUTIL_CLOSESOCKET(listener); + evutil_closesocket(listener); /* Now check we are talking to ourself by matching port and host on the two sockets. */ if (getsockname(connector, (struct sockaddr *) &connect_addr, &size) == -1) @@ -227,11 +227,11 @@ evutil_socketpair(int family, int type, if (saved_errno < 0) saved_errno = WSAGetLastError(); if (listener != -1) - EVUTIL_CLOSESOCKET(listener); + evutil_closesocket(listener); if (connector != -1) - EVUTIL_CLOSESOCKET(connector); + evutil_closesocket(connector); if (acceptor != -1) - EVUTIL_CLOSESOCKET(acceptor); + evutil_closesocket(acceptor); EVUTIL_SET_SOCKET_ERROR(saved_errno); return -1; @@ -294,6 +294,16 @@ evutil_make_socket_closeonexec(evutil_so return 0; } +int +evutil_closesocket(evutil_socket_t sock) +{ +#ifndef WIN32 + return close(sock); +#else + return closesocket(sock); +#endif +} + ev_int64_t evutil_strtoll(const char *s, char **endptr, int base) { @@ -384,7 +394,7 @@ evutil_socket_connect(evutil_socket_t *f err: if (made_fd) { - EVUTIL_CLOSESOCKET(*fd_ptr); + evutil_closesocket(*fd_ptr); *fd_ptr = -1; } return -1; @@ -487,7 +497,7 @@ evutil_check_interfaces(int force_rechec } } if (fd >= 0) - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); if ((fd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP)) >= 0 && connect(fd, (struct sockaddr*)&sin6, sizeof(sin6)) == 0 && @@ -511,7 +521,7 @@ evutil_check_interfaces(int force_rechec } if (fd >= 0) - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); return 0; } Index: http.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/http.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 http.c --- http.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ http.c 14 Apr 2010 08:52:36 -0000 @@ -976,7 +976,7 @@ evhttp_connection_free(struct evhttp_con bufferevent_free(evcon->bufev); if (evcon->fd != -1) - EVUTIL_CLOSESOCKET(evcon->fd); + evutil_closesocket(evcon->fd); if (evcon->bind_address != NULL) mm_free(evcon->bind_address); @@ -1042,7 +1042,7 @@ evhttp_connection_reset(struct evhttp_co if (evhttp_connected(evcon) && evcon->closecb != NULL) (*evcon->closecb)(evcon, evcon->closecb_arg); - EVUTIL_CLOSESOCKET(evcon->fd); + evutil_closesocket(evcon->fd); evcon->fd = -1; } @@ -2517,7 +2517,7 @@ evhttp_bind_socket_with_handle(struct ev if (listen(fd, 128) == -1) { event_sock_warn(fd, "%s: listen", __func__); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); return (NULL); } @@ -3007,7 +3007,7 @@ evhttp_get_request(struct evhttp *http, evcon = evhttp_get_request_connection(http, fd, sa, salen); if (evcon == NULL) { event_sock_warn(fd, "%s: cannot get connection on %d", __func__, fd); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); return; } @@ -3103,7 +3103,7 @@ bind_socket_ai(struct evutil_addrinfo *a out: serrno = EVUTIL_SOCKET_ERROR(); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); EVUTIL_SET_SOCKET_ERROR(serrno); return (-1); } Index: listener.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/listener.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 listener.c --- listener.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ listener.c 14 Apr 2010 08:52:36 -0000 @@ -168,13 +168,13 @@ evconnlistener_new_bind(struct event_bas return NULL; if (evutil_make_socket_nonblocking(fd) < 0) { - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); return NULL; } if (flags & LEV_OPT_CLOSE_ON_EXEC) { if (evutil_make_socket_closeonexec(fd) < 0) { - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); return NULL; } } @@ -186,14 +186,14 @@ evconnlistener_new_bind(struct event_bas if (sa) { if (bind(fd, sa, socklen)<0) { - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); return NULL; } } listener = evconnlistener_new(base, cb, ptr, flags, backlog, fd); if (!listener) { - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); return NULL; } @@ -215,7 +215,7 @@ event_listener_destroy(struct evconnlist event_del(&lev_e->listener); if (lev->flags & LEV_OPT_CLOSE_ON_FREE) - EVUTIL_CLOSESOCKET(event_get_fd(&lev_e->listener)); + evutil_closesocket(event_get_fd(&lev_e->listener)); event_debug_unassign(&lev_e->listener); } Index: signal.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/signal.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 signal.c --- signal.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ signal.c 14 Apr 2010 08:52:36 -0000 @@ -327,11 +327,11 @@ evsig_dealloc(struct event_base *base) } if (base->sig.ev_signal_pair[0] != -1) { - EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[0]); + evutil_closesocket(base->sig.ev_signal_pair[0]); base->sig.ev_signal_pair[0] = -1; } if (base->sig.ev_signal_pair[1] != -1) { - EVUTIL_CLOSESOCKET(base->sig.ev_signal_pair[1]); + evutil_closesocket(base->sig.ev_signal_pair[1]); base->sig.ev_signal_pair[1] = -1; } base->sig.sh_old_max = 0; Index: include/event2/util.h =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/include/event2/util.h,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 util.h --- include/event2/util.h 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ include/event2/util.h 14 Apr 2010 08:52:36 -0000 @@ -238,15 +238,14 @@ int evutil_make_listen_socket_reuseable( */ int evutil_make_socket_closeonexec(evutil_socket_t sock); -#ifdef WIN32 -/** Do the platform-specific call needed to close a socket returned from - socket() or accept(). */ -#define EVUTIL_CLOSESOCKET(s) closesocket(s) -#else /** Do the platform-specific call needed to close a socket returned from - socket() or accept(). */ -#define EVUTIL_CLOSESOCKET(s) close(s) -#endif + socket() or accept(). + + @param sock The socket to be closed + @return 0 on success, -1 on failure + */ +int evutil_closesocket(evutil_socket_t sock); +#define EVUTIL_CLOSESOCKET(s) evutil_closesocket(s) /* Winsock handles socket errors differently from the rest of the world. * Elsewhere, a socket error is like any other error and is stored in errno. Index: test/regress.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 regress.c --- test/regress.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/regress.c 14 Apr 2010 08:52:36 -0000 @@ -2050,7 +2050,7 @@ end: if (ev[i]) event_free(ev[i]); if (sock[i] >= 0) - EVUTIL_CLOSESOCKET(sock[i]); + evutil_closesocket(sock[i]); } #undef MANY } Index: test/regress_buffer.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_buffer.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 regress_buffer.c --- test/regress_buffer.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/regress_buffer.c 14 Apr 2010 08:52:36 -0000 @@ -395,8 +395,8 @@ test_evbuffer_add_file(void *ptr) tt_abort_msg("Data from add_file differs."); end: - EVUTIL_CLOSESOCKET(pair[0]); - EVUTIL_CLOSESOCKET(pair[1]); + evutil_closesocket(pair[0]); + evutil_closesocket(pair[1]); evbuffer_free(src); } #endif Index: test/regress_bufferevent.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_bufferevent.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 regress_bufferevent.c --- test/regress_bufferevent.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/regress_bufferevent.c 14 Apr 2010 08:52:36 -0000 @@ -541,7 +541,7 @@ close_socket_cb(evutil_socket_t fd, shor { evutil_socket_t *fdp = arg; if (*fdp >= 0) { - EVUTIL_CLOSESOCKET(*fdp); + evutil_closesocket(*fdp); *fdp = -1; } } @@ -603,7 +603,7 @@ test_bufferevent_connect_fail(void *arg) end: if (fake_listener >= 0) - EVUTIL_CLOSESOCKET(fake_listener); + evutil_closesocket(fake_listener); if (bev) bufferevent_free(bev); Index: test/regress_dns.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_dns.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 regress_dns.c --- test/regress_dns.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/regress_dns.c 14 Apr 2010 08:52:36 -0000 @@ -425,7 +425,7 @@ end: if (port) evdns_close_server_port(port); if (sock >= 0) - EVUTIL_CLOSESOCKET(sock); + evutil_closesocket(sock); if (base) evdns_base_free(base, 0); } @@ -1015,7 +1015,7 @@ end: if (listener) evconnlistener_free(listener); if (server_fd>=0) - EVUTIL_CLOSESOCKET(server_fd); + evutil_closesocket(server_fd); if (port) evdns_close_server_port(port); if (dns) Index: test/regress_et.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_et.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 regress_et.c --- test/regress_et.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/regress_et.c 14 Apr 2010 08:52:36 -0000 @@ -145,8 +145,8 @@ test_edgetriggered(void *et) } if (base) event_base_free(base); - EVUTIL_CLOSESOCKET(pair[0]); - EVUTIL_CLOSESOCKET(pair[1]); + evutil_closesocket(pair[0]); + evutil_closesocket(pair[1]); } struct testcase_t edgetriggered_testcases[] = { Index: test/regress_http.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_http.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 regress_http.c --- test/regress_http.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/regress_http.c 14 Apr 2010 08:52:36 -0000 @@ -364,7 +364,7 @@ http_basic_test(void) /* connect to the second port */ bufferevent_free(bev); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); fd = http_connect("127.0.0.1", port + 1); @@ -383,7 +383,7 @@ http_basic_test(void) event_dispatch(); bufferevent_free(bev); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); evhttp_free(http); @@ -529,7 +529,7 @@ http_bad_request_test(void) event_dispatch(); bufferevent_free(bev); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); if (test_ok != 0) { fprintf(stdout, "FAILED\n"); @@ -634,7 +634,7 @@ http_delete_test(void) event_dispatch(); bufferevent_free(bev); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); evhttp_free(http); @@ -1461,7 +1461,7 @@ http_failure_test(void) event_dispatch(); bufferevent_free(bev); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); evhttp_free(http); @@ -1691,7 +1691,7 @@ http_base_test(void) event_base_dispatch(base); bufferevent_free(bev); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); evhttp_free(http); @@ -1774,7 +1774,7 @@ _http_incomplete_test(int use_timeout) bufferevent_free(bev); if (use_timeout) { - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); } evhttp_free(http); @@ -2385,7 +2385,7 @@ http_multi_line_header_test(void) if (bev) bufferevent_free(bev); if (fd >= 0) - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); if (http) evhttp_free(http); } @@ -2581,7 +2581,7 @@ terminate_chunked_client(int fd, short e { struct terminate_state *state = arg; bufferevent_free(state->bev); - EVUTIL_CLOSESOCKET(state->fd); + evutil_closesocket(state->fd); } static void @@ -2636,7 +2636,7 @@ http_terminate_chunked_test(void) end: if (fd >= 0) - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); if (http) evhttp_free(http); } Index: test/regress_listener.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_listener.c,v retrieving revision 1.1.1.2 diff -u -p -r1.1.1.2 regress_listener.c --- test/regress_listener.c 8 Mar 2010 10:20:13 -0000 1.1.1.2 +++ test/regress_listener.c 14 Apr 2010 08:52:36 -0000 @@ -55,7 +55,7 @@ acceptcb(struct evconnlistener *listener int *ptr = arg; --*ptr; TT_BLATHER(("Got one for %p", ptr)); - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); if (! *ptr) evconnlistener_disable(listener); @@ -122,11 +122,11 @@ regress_pick_a_port(void *arg) end: if (fd1>=0) - EVUTIL_CLOSESOCKET(fd1); + evutil_closesocket(fd1); if (fd2>=0) - EVUTIL_CLOSESOCKET(fd2); + evutil_closesocket(fd2); if (fd3>=0) - EVUTIL_CLOSESOCKET(fd3); + evutil_closesocket(fd3); } Index: test/regress_main.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_main.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 regress_main.c --- test/regress_main.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/regress_main.c 14 Apr 2010 08:52:36 -0000 @@ -221,9 +221,9 @@ basic_test_cleanup(const struct testcase if (testcase->flags & TT_NEED_SOCKETPAIR) { if (data->pair[0] != -1) - EVUTIL_CLOSESOCKET(data->pair[0]); + evutil_closesocket(data->pair[0]); if (data->pair[1] != -1) - EVUTIL_CLOSESOCKET(data->pair[1]); + evutil_closesocket(data->pair[1]); } if (testcase->flags & TT_NEED_DNS) { Index: test/regress_testutils.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_testutils.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 regress_testutils.c --- test/regress_testutils.c 8 Mar 2010 10:20:13 -0000 1.1.1.1 +++ test/regress_testutils.c 14 Apr 2010 08:52:36 -0000 @@ -129,7 +129,7 @@ regress_clean_dnsserver(void) if (dns_port) evdns_close_server_port(dns_port); if (dns_sock >= 0) - EVUTIL_CLOSESOCKET(dns_sock); + evutil_closesocket(dns_sock); } void Index: test/regress_util.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_util.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 regress_util.c --- test/regress_util.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/regress_util.c 14 Apr 2010 08:52:36 -0000 @@ -488,7 +488,7 @@ end: if (logmsg) free(logmsg); if (fd >= 0) - EVUTIL_CLOSESOCKET(fd); + evutil_closesocket(fd); } static void Index: test/regress_zlib.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/regress_zlib.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 regress_zlib.c --- test/regress_zlib.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/regress_zlib.c 14 Apr 2010 08:52:36 -0000 @@ -313,7 +313,7 @@ end: bufferevent_free(bev2); if (pair[0] >= 0) - EVUTIL_CLOSESOCKET(pair[0]); + evutil_closesocket(pair[0]); if (pair[1] >= 0) - EVUTIL_CLOSESOCKET(pair[1]); + evutil_closesocket(pair[1]); } Index: test/test-weof.c =================================================================== RCS file: /usr/local/cvs/linux/libs/libevent/libevent/test/test-weof.c,v retrieving revision 1.1.1.3 diff -u -p -r1.1.1.3 test-weof.c --- test/test-weof.c 8 Mar 2010 10:20:13 -0000 1.1.1.3 +++ test/test-weof.c 14 Apr 2010 08:52:36 -0000 @@ -51,7 +51,7 @@ write_cb(int fd, short event, void *arg) if (len > 0) { if (!called) event_add(arg, NULL); - EVUTIL_CLOSESOCKET(pair[0]); + evutil_closesocket(pair[0]); } else if (called == 1) test_okay = 0;