diff options
| author | Azat Khuzhin <a3at.mail@gmail.com> | 2018-10-27 18:29:57 +0300 |
|---|---|---|
| committer | Azat Khuzhin <a3at.mail@gmail.com> | 2018-10-27 18:29:57 +0300 |
| commit | 474d72aeac818198737aa7cb009578c464db11ca (patch) | |
| tree | 66daabba97562aa50743675d00b4861097306ed2 /bufferevent_openssl.c | |
| parent | 26ef859aa707fda72ce530bf761d1c41a76f67b7 (diff) | |
| download | libevent-474d72aeac818198737aa7cb009578c464db11ca.tar.gz | |
be_openssl: drop close_flag parameter of the BIO_new_bufferevent()
Diffstat (limited to 'bufferevent_openssl.c')
| -rw-r--r-- | bufferevent_openssl.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c index 6915f36a..c7f736d6 100644 --- a/bufferevent_openssl.c +++ b/bufferevent_openssl.c @@ -250,7 +250,7 @@ BIO_s_bufferevent(void) /* Create a new BIO to wrap communication around a bufferevent. If close_flag * is true, the bufferevent will be freed when the BIO is closed. */ static BIO * -BIO_new_bufferevent(struct bufferevent *bufferevent, int close_flag) +BIO_new_bufferevent(struct bufferevent *bufferevent) { BIO *result; if (!bufferevent) @@ -259,7 +259,9 @@ BIO_new_bufferevent(struct bufferevent *bufferevent, int close_flag) return NULL; BIO_set_init(result, 1); BIO_set_data(result, bufferevent); - BIO_set_shutdown(result, close_flag ? 1 : 0); + /* We don't tell the BIO to close the bufferevent; we do it ourselves on + * be_openssl_destruct() */ + BIO_set_shutdown(result, 0); return result; } @@ -1303,7 +1305,7 @@ be_openssl_ctrl(struct bufferevent *bev, SSL_set_bio(bev_ssl->ssl, bio, bio); } else { BIO *bio; - if (!(bio = BIO_new_bufferevent(bev_ssl->underlying, 0))) + if (!(bio = BIO_new_bufferevent(bev_ssl->underlying))) return -1; SSL_set_bio(bev_ssl->ssl, bio, bio); } @@ -1407,13 +1409,10 @@ bufferevent_openssl_filter_new(struct event_base *base, enum bufferevent_ssl_state state, int options) { - /* We don't tell the BIO to close the bufferevent; we do it ourselves - * on be_openssl_destruct */ - int close_flag = 0; /* options & BEV_OPT_CLOSE_ON_FREE; */ BIO *bio; if (!underlying) return NULL; - if (!(bio = BIO_new_bufferevent(underlying, close_flag))) + if (!(bio = BIO_new_bufferevent(underlying))) return NULL; SSL_set_bio(ssl, bio, bio); |