diff options
| author |   tb <tb@openbsd.org> | 2021-01-02 18:35:07 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2021-01-02 18:35:07 +0000 |
| commit | 0ef1049e55392947151ceaac91fc88759ed2adf8 (patch) | |
| tree | 89a0ebaac80a36ed6580b131db0e7014bac1033e | |
| parent | Call tls_close() before closing the underlying socket (diff) | |
| download | wireguard-openbsd-0ef1049e55392947151ceaac91fc88759ed2adf8.tar.xz wireguard-openbsd-0ef1049e55392947151ceaac91fc88759ed2adf8.zip | |
Pull tls_close() and tls_free() further up, so tls_free() will already
be in the right spot once tls_close() is handled by libevent.
suggested by jsing
| -rw-r--r-- | usr.sbin/httpd/server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c index b61208d240f..1cd8c15b77e 100644 --- a/usr.sbin/httpd/server.c +++ b/usr.sbin/httpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.123 2021/01/02 18:31:06 tb Exp $ */ +/* $OpenBSD: server.c,v 1.124 2021/01/02 18:35:07 tb Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -1316,6 +1316,11 @@ server_close(struct client *clt, const char *msg) /* free the HTTP descriptors incl. headers */ server_close_http(clt); + /* tls_close must be called before the underlying socket is closed. */ + if (clt->clt_tls_ctx != NULL) + tls_close(clt->clt_tls_ctx); /* XXX - error handling */ + tls_free(clt->clt_tls_ctx); + event_del(&clt->clt_ev); if (clt->clt_bev != NULL) bufferevent_disable(clt->clt_bev, EV_READ|EV_WRITE); @@ -1334,11 +1339,6 @@ server_close(struct client *clt, const char *msg) if (clt->clt_srvbev != NULL) bufferevent_free(clt->clt_srvbev); - /* tls_close must be called before the underlying socket is closed. */ - if (clt->clt_tls_ctx != NULL) - tls_close(clt->clt_tls_ctx); /* XXX - error handling */ - tls_free(clt->clt_tls_ctx); - if (clt->clt_fd != -1) close(clt->clt_fd); if (clt->clt_s != -1) |