diff options
| author | Ondřej Kuzník <ondra@mistotebe.net> | 2013-12-03 23:01:54 +0000 |
|---|---|---|
| committer | Ondřej Kuzník <ondra@mistotebe.net> | 2013-12-03 23:39:13 +0000 |
| commit | a7384c782486c293e9cb8c22916eb9ee842a8c1c (patch) | |
| tree | f7ff2ca23db967481b1d18a68ae9bdacba59e533 /bufferevent_openssl.c | |
| parent | 61ee18b8b1d2ac0025955b3f949531c712fb7527 (diff) | |
| download | libevent-a7384c782486c293e9cb8c22916eb9ee842a8c1c.tar.gz | |
Add an option to trigger bufferevent event callbacks
Diffstat (limited to 'bufferevent_openssl.c')
| -rw-r--r-- | bufferevent_openssl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c index ed9e4a3d..3ce491ef 100644 --- a/bufferevent_openssl.c +++ b/bufferevent_openssl.c @@ -533,7 +533,7 @@ conn_closed(struct bufferevent_openssl *bev_ssl, int when, int errcode, int ret) /* when is BEV_EVENT_{READING|WRITING} */ event = when | event; - bufferevent_run_eventcb_(&bev_ssl->bev.bev, event); + bufferevent_run_eventcb_(&bev_ssl->bev.bev, event, 0); } static void @@ -921,7 +921,7 @@ be_openssl_eventcb(struct bufferevent *bev_base, short what, void *ctx) eat it. */ } if (event) - bufferevent_run_eventcb_(&bev_ssl->bev.bev, event); + bufferevent_run_eventcb_(&bev_ssl->bev.bev, event, 0); } static void @@ -931,7 +931,7 @@ be_openssl_readeventcb(evutil_socket_t fd, short what, void *ptr) bufferevent_incref_and_lock_(&bev_ssl->bev.bev); if (what == EV_TIMEOUT) { bufferevent_run_eventcb_(&bev_ssl->bev.bev, - BEV_EVENT_TIMEOUT|BEV_EVENT_READING); + BEV_EVENT_TIMEOUT|BEV_EVENT_READING, 0); } else { consider_reading(bev_ssl); } @@ -945,7 +945,7 @@ be_openssl_writeeventcb(evutil_socket_t fd, short what, void *ptr) bufferevent_incref_and_lock_(&bev_ssl->bev.bev); if (what == EV_TIMEOUT) { bufferevent_run_eventcb_(&bev_ssl->bev.bev, - BEV_EVENT_TIMEOUT|BEV_EVENT_WRITING); + BEV_EVENT_TIMEOUT|BEV_EVENT_WRITING, 0); } else { consider_writing(bev_ssl); } @@ -1012,7 +1012,7 @@ do_handshake(struct bufferevent_openssl *bev_ssl) /* Call do_read and do_write as needed */ bufferevent_enable(&bev_ssl->bev.bev, bev_ssl->bev.bev.enabled); bufferevent_run_eventcb_(&bev_ssl->bev.bev, - BEV_EVENT_CONNECTED); + BEV_EVENT_CONNECTED, 0); return 1; } else { int err = SSL_get_error(bev_ssl->ssl, r); @@ -1051,7 +1051,7 @@ be_openssl_handshakeeventcb(evutil_socket_t fd, short what, void *ptr) bufferevent_incref_and_lock_(&bev_ssl->bev.bev); if (what & EV_TIMEOUT) { - bufferevent_run_eventcb_(&bev_ssl->bev.bev, BEV_EVENT_TIMEOUT); + bufferevent_run_eventcb_(&bev_ssl->bev.bev, BEV_EVENT_TIMEOUT, 0); } else do_handshake(bev_ssl);/* XXX handle failure */ bufferevent_decref_and_unlock_(&bev_ssl->bev.bev); |