Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-12 21:11:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed recursive call to BIO_set_fd()

Browse Source
This commit is contained in:
csoler 2017-02-25 18:21:24 +01:00
parent c313fb5453
commit a531a41c4a
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libretroshare/src/tcponudp/bss_tou.c
View File

@ -91,8 +91,9 @@ static int clear_tou_socket_error(int s);
#include "tou.h" #include "tou.h"
#if OPENSSL_VERSION_NUMBER < 0x10100000L #if OPENSSL_VERSION_NUMBER < 0x10100000L
//static void BIO_set_shutdown(BIO *a,int s) { a->shutdown=s; }
static int BIO_get_shutdown(BIO *a) { return a->shutdown; } static int BIO_get_shutdown(BIO *a) { return a->shutdown; }
static void BIO_set_shutdown(BIO *a,int s) { a->shutdown=s; }
static int BIO_get_init(BIO *a) { return a->init; } static int BIO_get_init(BIO *a) { return a->init; }
static void BIO_set_init(BIO *a,int i) { a->init=i; } static void BIO_set_init(BIO *a,int i) { a->init=i; }
static void BIO_set_data(BIO *a,void *p) { a->ptr = p; } static void BIO_set_data(BIO *a,void *p) { a->ptr = p; }
@ -238,6 +239,8 @@ static long tou_socket_ctrl(BIO *b, int cmd, long num, void *ptr)
fprintf(stderr, "tou_socket_ctrl(%p,%d,%ld)\n", b, cmd, num); fprintf(stderr, "tou_socket_ctrl(%p,%d,%ld)\n", b, cmd, num);
#endif #endif
// We are not allowed to call BIO_set_fd here, because it will trigger a callback, which re-ends here
switch (cmd) switch (cmd)
{ {
case BIO_CTRL_RESET: case BIO_CTRL_RESET:
@ -251,25 +254,17 @@ static long tou_socket_ctrl(BIO *b, int cmd, long num, void *ptr)
break; break;
case BIO_C_SET_FD: case BIO_C_SET_FD:
tou_socket_free(b); tou_socket_free(b);
BIO_set_fd(b,*((int *)ptr),0); ret = BIO_s_fd()->ctrl(b,cmd,num,ptr) ;
BIO_set_shutdown(b,(int)num) ;
BIO_set_init(b,1) ;
break; break;
case BIO_C_GET_FD: case BIO_C_GET_FD:
if (BIO_get_init(b)) ret = BIO_s_fd()->ctrl(b,cmd,num,ptr) ;
{
ip=(int *)ptr;
if (ip != NULL) *ip=BIO_get_fd(b,NULL);
ret=BIO_get_fd(b,NULL);
}
else
ret= -1;
break; break;
case BIO_CTRL_GET_CLOSE: case BIO_CTRL_GET_CLOSE:
ret=BIO_get_shutdown(b); ret = BIO_s_fd()->ctrl(b,cmd,num,ptr) ;
break; break;
case BIO_CTRL_SET_CLOSE: case BIO_CTRL_SET_CLOSE:
BIO_set_shutdown(b,(int)num) ; ret = BIO_s_fd()->ctrl(b,cmd,num,ptr) ;
break; break;
case BIO_CTRL_PENDING: case BIO_CTRL_PENDING:
ret = tou_maxread(BIO_get_fd(b,NULL)); ret = tou_maxread(BIO_get_fd(b,NULL));