From 01b7851aa27aa144372f5484da916be042d9aa4f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 14 Sep 2015 22:36:04 +0100 Subject: [PATCH] Add BIO_CTRL_DGRAM_SET_PEEK_MODE Add the ability to peek at a message from the DTLS read BIO. This is needed for the DTLSv1_listen rewrite. Reviewed-by: Andy Polyakov --- crypto/bio/bss_dgram.c | 9 ++++++++- include/openssl/bio.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 91474fcb60..e7371c9ef3 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -169,6 +169,7 @@ typedef struct bio_dgram_data_st { unsigned int mtu; struct timeval next_timeout; struct timeval socket_timeout; + unsigned int peekmode; } bio_dgram_data; # ifndef OPENSSL_NO_SCTP @@ -367,6 +368,7 @@ static int dgram_read(BIO *b, char *out, int outl) { int ret = 0; bio_dgram_data *data = (bio_dgram_data *)b->ptr; + int flags = 0; struct { /* @@ -392,7 +394,9 @@ static int dgram_read(BIO *b, char *out, int outl) clear_socket_error(); memset(&sa.peer, 0, sizeof(sa.peer)); dgram_adjust_rcv_timeout(b); - ret = recvfrom(b->num, out, outl, 0, &sa.peer.sa, (void *)&sa.len); + if (data->peekmode) + flags = MSG_PEEK; + ret = recvfrom(b->num, out, outl, flags, &sa.peer.sa, (void *)&sa.len); if (sizeof(sa.len.i) != sizeof(sa.len.s) && sa.len.i == 0) { OPENSSL_assert(sa.len.s <= sizeof(sa.peer)); sa.len.i = (int)sa.len.s; @@ -923,6 +927,9 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_CTRL_DGRAM_GET_MTU_OVERHEAD: ret = dgram_get_mtu_overhead(data); break; + case BIO_CTRL_DGRAM_SET_PEEK_MODE: + data->peekmode = (unsigned int)num; + break; default: ret = 0; break; diff --git a/include/openssl/bio.h b/include/openssl/bio.h index 2da93bdf0a..75d052fdab 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -178,6 +178,8 @@ extern "C" { # define BIO_CTRL_DGRAM_GET_MTU_OVERHEAD 49 +# define BIO_CTRL_DGRAM_SET_PEEK_MODE 50 + # ifndef OPENSSL_NO_SCTP /* SCTP stuff */ # define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE 50 -- 2.25.1