From 21f555ab69e39280fe606943966942e86ee48727 Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Fri, 6 Feb 2015 20:51:50 +0000 Subject: [PATCH] Uses dtls_openssl_bio_method() now. FossilOrigin-Name: d73f0fcdbb69c32fe36cb740b7a9d99a88be227f5c9fcf21398e4fd277e3b094 --- src/capwap/dtls_openssl_accept.c | 36 +++++++++----------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/src/capwap/dtls_openssl_accept.c b/src/capwap/dtls_openssl_accept.c index ce884f27..91eb4757 100644 --- a/src/capwap/dtls_openssl_accept.c +++ b/src/capwap/dtls_openssl_accept.c @@ -16,7 +16,6 @@ */ - #include #include "conn.h" @@ -24,35 +23,21 @@ #include "dtls_openssl.h" #include "cw_log.h" - -static BIO_METHOD bio_methods = { - BIO_TYPE_DGRAM, - "cw packet", - dtls_openssl_bio_write, - dtls_openssl_bio_read, - dtls_openssl_bio_puts, - NULL, // dgram_gets - dtls_openssl_bio_ctrl, - dtls_openssl_bio_new, - dtls_openssl_bio_free, - NULL, -}; - - -int dtls_openssl_accept(struct conn * conn) +int dtls_openssl_accept(struct conn *conn) { if (!conn->dtls_data) - conn->dtls_data = dtls_openssl_data_create(conn,DTLSv1_server_method(),&bio_methods); + conn->dtls_data = + dtls_openssl_data_create(conn, DTLSv1_server_method(), + dtls_openssl_bio_method()); - struct dtls_openssl_data * d = (struct dtls_openssl_data*)conn->dtls_data; + struct dtls_openssl_data *d = (struct dtls_openssl_data *) conn->dtls_data; if (!d) return 0; - int i,rc; - for (i=0; iwait_dtls; i++){ + int i, rc; + for (i = 0; i < conn->wait_dtls; i++) { rc = SSL_accept(d->ssl); - if (rc == 1) - { + if (rc == 1) { conn->read = dtls_openssl_read; conn->write = dtls_openssl_write; return 1; @@ -62,8 +47,7 @@ int dtls_openssl_accept(struct conn * conn) if (rc) return 0; } - cw_log(LOG_ERR,"DTLS Error: Timeout while establishing session with %s.",sock_addr2str(&conn->addr)); + cw_log(LOG_ERR, "DTLS Error: Timeout while establishing session with %s.", + sock_addr2str(&conn->addr)); return 0; } - -