summaryrefslogtreecommitdiffstats
path: root/ssl/record
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2016-01-22 14:54:01 -0500
committerRich Salz <rsalz@openssl.org>2016-01-24 18:25:04 -0500
commitcf2cede4a75f5e269f791bf1dcc029bba8c1f689 (patch)
tree093d88fcb4a288e899114adf1ecd2e208ac94758 /ssl/record
parent68ed0b2480023424f280e98cda7199d913f3d7cc (diff)
Move pqueue into ssl
This is an internal facility, never documented, not for public consumption. Move it into ssl (where it's only used for DTLS). I also made the typedef's for pqueue and pitem follow our style: they name structures, not pointers. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/record')
-rw-r--r--ssl/record/rec_layer_d1.c7
-rw-r--r--ssl/record/record.h4
2 files changed, 4 insertions, 7 deletions
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index ebe486e419..eabbddb61d 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -119,7 +119,6 @@
#include "../ssl_locl.h"
#include <openssl/evp.h>
#include <openssl/buffer.h>
-#include <openssl/pqueue.h>
#include <openssl/rand.h>
#include "record_locl.h"
@@ -165,9 +164,9 @@ void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl)
DTLS_RECORD_LAYER *d;
pitem *item = NULL;
DTLS1_RECORD_DATA *rdata;
- pqueue unprocessed_rcds;
- pqueue processed_rcds;
- pqueue buffered_app_data;
+ pqueue *unprocessed_rcds;
+ pqueue *processed_rcds;
+ pqueue *buffered_app_data;
d = rl->d;
diff --git a/ssl/record/record.h b/ssl/record/record.h
index af10166a88..36ae3a1021 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -109,8 +109,6 @@
*
*/
-#include <openssl/pqueue.h>
-
/*****************************************************************************
* *
* These structures should be considered PRIVATE to the record layer. No *
@@ -186,7 +184,7 @@ typedef struct dtls1_bitmap_st {
typedef struct record_pqueue_st {
unsigned short epoch;
- pqueue q;
+ struct pqueue_st *q;
} record_pqueue;
typedef struct dtls1_record_data_st {