generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check BIO_dgram_sctp_wait_for_dry() return value for error

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Kurt Roeckx 2015-06-20 16:28:08 +02:00
parent 13cbe5e711
commit 03a1c85062
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
crypto/bio/bss_dgram.c
View File

@ -1404,18 +1404,24 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
* If we have to send a shutdown alert message and the socket is not dry * If we have to send a shutdown alert message and the socket is not dry
* yet, we have to save it and send it as soon as the socket gets dry. * yet, we have to save it and send it as soon as the socket gets dry.
*/ */
if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) { if (data->save_shutdown) {
char *tmp; ret = BIO_dgram_sctp_wait_for_dry(b);
data->saved_message.bio = b; if (ret < 0) {
if ((tmp = OPENSSL_malloc(inl)) == NULL) {
BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
return -1; return -1;
} }
OPENSSL_free(data->saved_message.data); if (ret == 0) {
data->saved_message.data = tmp; char *tmp;
memcpy(data->saved_message.data, in, inl); data->saved_message.bio = b;
data->saved_message.length = inl; if ((tmp = OPENSSL_malloc(inl)) == NULL) {
return inl; BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
return -1;
}
OPENSSL_free(data->saved_message.data);
data->saved_message.data = tmp;
memcpy(data->saved_message.data, in, inl);
data->saved_message.length = inl;
return inl;
}
} }
iov[0].iov_base = (char *)in; iov[0].iov_base = (char *)in;
@ -1733,6 +1739,19 @@ int BIO_dgram_sctp_notification_cb(BIO *b,
return 0; return 0;
} }
/*
* BIO_dgram_sctp_wait_for_dry - Wait for SCTP SENDER_DRY event
* @b: The BIO to check for the dry event
*
* Wait until the peer confirms all packets have been received, and so that
* our kernel doesn't have anything to send anymore. This is only received by
* the peer's kernel, not the application.
*
* Returns:
* -1 on error
* 0 when not dry yet
* 1 when dry
*/
int BIO_dgram_sctp_wait_for_dry(BIO *b) int BIO_dgram_sctp_wait_for_dry(BIO *b)
{ {
int is_dry = 0; int is_dry = 0;