Move s->s3->rrec into s->rlayer

[openssl.git] / ssl / record / rec_layer.h

diff --git a/ssl/record/rec_layer.h b/ssl/record/rec_layer.h
index 71f0847bd69d8ee1868ad2a90fc3a6f89366f8d2..574a2524317e168508aa272f60d748ab66ad2bbc 100644 (file)
--- a/ssl/record/rec_layer.h
+++ b/ssl/record/rec_layer.h
@@ -109,13 +109,21 @@
  *
  */
 
+#include "../ssl_locl.h"
+
 typedef struct record_layer_st {
+    /* The parent SSL structure */
+    SSL *s;
     /*
      * Read as many input bytes as possible (for
      * non-blocking reads)
      */
     int read_ahead;
+    /* read IO goes into here */
+    SSL3_BUFFER rbuf;
 } RECORD_LAYER;
 
+#define RECORD_LAYER_set_ssl(rl, s)             ((rl)->s = (s))
 #define RECORD_LAYER_set_read_ahead(rl, ra)     ((rl)->read_ahead = (ra))
 #define RECORD_LAYER_get_read_ahead(rl)         ((rl)->read_ahead)
+#define RECORD_LAYER_get_rbuf(rl)               (&(rl)->rbuf)