commit 01b7851aa27aa144372f5484da916be042d9aa4f
author Matt Caswell <matt@openssl.org> Mon Sep 14 22:36:04 2015 +0100
committer Matt Caswell <matt@openssl.org> Wed Sep 23 13:53:26 2015 +0100
tree 225eeaca746baca374f0163b098b12af9ecdaf1f
parent 1556d21850aabf31c554d3c6de2363979a965a9f

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 <appro@openssl.org>

crypto/bio/bss_dgram.c

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 91474fc..e7371c9 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -169,6 +169,7 @@
     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 @@
 {
     int ret = 0;
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
+    int flags = 0;
 
     struct {
         /*
@@ -392,7 +394,9 @@
         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 @@
     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;

include/openssl/bio.h

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 2da93bd..75d052f 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -178,6 +178,8 @@
 
 # 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