From 145f221e8f1f12809a54f0ed3168a930255feee3 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 5 Oct 2010 13:06:32 -0400 Subject: [PATCH] Define symbolic constants to use in place of SHUT_RD etc --- http.c | 6 +++--- util-internal.h | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/http.c b/http.c index 504e3e41..af1ff888 100644 --- a/http.c +++ b/http.c @@ -976,7 +976,7 @@ evhttp_connection_free(struct evhttp_connection *evcon) bufferevent_free(evcon->bufev); if (evcon->fd != -1) { - shutdown(evcon->fd, 1); + shutdown(evcon->fd, EVUTIL_SHUT_WR); evutil_closesocket(evcon->fd); } @@ -1043,8 +1043,8 @@ evhttp_connection_reset(struct evhttp_connection *evcon) /* inform interested parties about connection close */ if (evhttp_connected(evcon) && evcon->closecb != NULL) (*evcon->closecb)(evcon, evcon->closecb_arg); - - shutdown(evcon->fd, 1); + + shutdown(evcon->fd, EVUTIL_SHUT_WR); evutil_closesocket(evcon->fd); evcon->fd = -1; } diff --git a/util-internal.h b/util-internal.h index e318ac9a..73cd8f8c 100644 --- a/util-internal.h +++ b/util-internal.h @@ -101,6 +101,23 @@ extern "C" { #define socklen_t _EVENT_socklen_t #endif +/* Arguments for shutdown() */ +#ifdef SHUT_RD +#define EVUTIL_SHUT_RD SHUT_RD +#else +#define EVUTIL_SHUT_RD 0 +#endif +#ifdef SHUT_WR +#define EVUTIL_SHUT_WR SHUT_WR +#else +#define EVUTIL_SHUT_WR 1 +#endif +#ifdef SHUT_BOTH +#define EVUTIL_SHUT_BOTH SHUT_BOTH +#else +#define EVUTIL_SHUT_BOTH 2 +#endif + /* Locale-independent replacements for some ctypes functions. Use these * when you care about ASCII's notion of character types, because you are about * to send those types onto the wire.