Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Solve a bunch of warnings in TCP ove UDP layer

Browse Source 
Remove some deadcode
Improve readability
This commit is contained in:
Gioacchino Mazzurco 2019-05-17 14:58:30 +02:00
parent 427503df0d
commit b52bb4c2dd
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 69 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/libretroshare.pro
View File

@ -108,7 +108,7 @@ SOURCES += tcponudp/udppeer.cc \
tcponudp/tcppacket.cc \ tcponudp/tcppacket.cc \
tcponudp/tcpstream.cc \ tcponudp/tcpstream.cc \
tcponudp/tou.cc \ tcponudp/tou.cc \
tcponudp/bss_tou.c \ tcponudp/bss_tou.cc \
tcponudp/udprelay.cc \ tcponudp/udprelay.cc \
pqi/pqissludp.cc \ pqi/pqissludp.cc \

161
libretroshare/src/tcponudp/bss_tou.c → libretroshare/src/tcponudp/bss_tou.cc
View File

@ -3,8 +3,9 @@
* * * *
* libretroshare: retroshare core library * * libretroshare: retroshare core library *
* * * *
* Copyright 2004-2006 by Robert Fernie <retroshare@lunamutt.com> * * Copyright (C) 1995-1998 Eric Young <eay@cryptsoft.com> *
* Copyright 1995-1998 Eric Young (eay@cryptsoft.com) * * Copyright (C) 2004-2006 Robert Fernie <retroshare@lunamutt.com> *
* Copyright (C) 2018-2019 Gioacchino Mazzurco <gio@eigenlab.org> *
* * * *
* This program is free software: you can redistribute it and/or modify * * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as * * it under the terms of the GNU Lesser General Public License as *
@ -25,19 +26,17 @@
#include "bio_tou.h" #include "bio_tou.h"
// STUFF defined in the header.......
//int BIO_tou_socket_should_retry(int s, int e);
//int BIO_tou_socket_non_fatal_error(int error);
//#define BIO_TYPE_TOU_SOCKET (30|0x0400|0x0100) /* NEW rmfern type */
//BIO_METHOD *BIO_s_tou_socket(void);
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#define USE_SOCKETS
//#include "cryptlib.h"
#include <openssl/bio.h>
#include <string.h> /* for strlen() */ #include <string.h> /* for strlen() */
#define USE_SOCKETS
#include <openssl/bio.h>
#include "tou.h"
#include "util/rsdebug.h"
RS_SET_CONTEXT_DEBUG_LEVEL(0);
static int tou_socket_write(BIO *h, const char *buf, int num); static int tou_socket_write(BIO *h, const char *buf, int num);
static int tou_socket_read(BIO *h, char *buf, int size); static int tou_socket_read(BIO *h, char *buf, int size);
@ -48,13 +47,12 @@ static int tou_socket_free(BIO *data);
static int get_last_tou_socket_error(int s); static int get_last_tou_socket_error(int s);
static int clear_tou_socket_error(int s); static int clear_tou_socket_error(int s);
#include "tou.h"
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
static int BIO_get_init(BIO *a) { return a->init; } static int BIO_get_init(BIO *a) { return a->init; }
#if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) || (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) #if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) \
|| (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L)
static int BIO_get_shutdown(BIO *a) { return a->shutdown; } static int BIO_get_shutdown(BIO *a) { return a->shutdown; }
static void BIO_set_init(BIO *a,int i) { a->init=i; } static void BIO_set_init(BIO *a,int i) { a->init=i; }
@ -62,7 +60,8 @@ static void BIO_set_data(BIO *a,void *p) { a->ptr = p; }
long (*BIO_meth_get_ctrl(const BIO_METHOD* biom)) (BIO*, int, long, void*) long (*BIO_meth_get_ctrl(const BIO_METHOD* biom)) (BIO*, int, long, void*)
{ return biom->ctrl; } { return biom->ctrl; }
#endif #endif /* (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) \
|| (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) */
static BIO_METHOD methods_tou_sockp = static BIO_METHOD methods_tou_sockp =
{ {
@ -71,22 +70,20 @@ static BIO_METHOD methods_tou_sockp =
tou_socket_write, tou_socket_write,
tou_socket_read, tou_socket_read,
tou_socket_puts, tou_socket_puts,
NULL, /* tou_gets, */ nullptr, // bgets
tou_socket_ctrl, tou_socket_ctrl,
tou_socket_new, tou_socket_new,
tou_socket_free, tou_socket_free,
NULL, nullptr, // callback_ctrl
}; };
BIO_METHOD* BIO_s_tou_socket(void) BIO_METHOD* BIO_s_tou_socket(void)
{ {
#ifdef DEBUG_TOU_BIO Dbg2() << __PRETTY_FUNCTION__ << std::endl;
fprintf(stderr, "BIO_s_tou_socket(void)\n");
#endif
return(&methods_tou_sockp); return(&methods_tou_sockp);
} }
#else #else // OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
BIO_METHOD* BIO_s_tou_socket(void) BIO_METHOD* BIO_s_tou_socket(void)
{ {
@ -106,46 +103,28 @@ BIO_METHOD* BIO_s_tou_socket(void)
return methods_tou_sockp_ptr; return methods_tou_sockp_ptr;
} }
#endif #endif // OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
BIO *BIO_new_tou_socket(int fd, int close_flag)
{
BIO *ret;
#ifdef DEBUG_TOU_BIO
fprintf(stderr, "BIO_new_tou_socket(%d)\n", fd);
#endif
ret=BIO_new(BIO_s_tou_socket());
if (ret == NULL) return(NULL);
BIO_set_fd(ret,fd,close_flag);
return(ret);
}
static int tou_socket_new(BIO *bi) static int tou_socket_new(BIO *bi)
{ {
#ifdef DEBUG_TOU_BIO Dbg2() << __PRETTY_FUNCTION__ << std::endl;
fprintf(stderr, "tou_socket_new()\n");
#endif
BIO_set_init(bi,0) ; BIO_set_init(bi,0) ;
BIO_set_data(bi,NULL) ; // sets bi->ptr BIO_set_data(bi, nullptr); // sets bi->ptr
BIO_set_flags(bi,0) ; BIO_set_flags(bi,0) ;
BIO_set_fd(bi,0,0) ; BIO_set_fd(bi,0,0) ;
return(1); return(1);
} }
static int tou_socket_free(BIO *a) static int tou_socket_free(BIO *a)
{ {
#ifdef DEBUG_TOU_BIO Dbg2() << __PRETTY_FUNCTION__ << std::endl;
fprintf(stderr, "tou_socket_free()\n");
#endif if (!a) return(0);
if (a == NULL) return(0);
if(BIO_get_shutdown(a)) if(BIO_get_shutdown(a))
{ {
if(BIO_get_init(a)) if(BIO_get_init(a)) tou_close(static_cast<int>(BIO_get_fd(a, nullptr)));
{
tou_close(BIO_get_fd(a,NULL));
}
BIO_set_init(a,0) ; BIO_set_init(a,0) ;
BIO_set_flags(a,0) ; BIO_set_flags(a,0) ;
} }
@ -153,13 +132,12 @@ static int tou_socket_free(BIO *a)
} }
static int tou_socket_read(BIO *b, char *out, int outl) static int tou_socket_read(BIO *b, char *out, int outl)
{ {
int ret=0; Dbg2() << __PRETTY_FUNCTION__ << std::endl;
#ifdef DEBUG_TOU_BIO
fprintf(stderr, "tou_socket_read(%p,%p,%d)\n",b,out,outl);
#endif
if (out != NULL) int ret=0;
if (!out)
{ {
clear_tou_socket_error(BIO_get_fd(b,NULL)); clear_tou_socket_error(BIO_get_fd(b,NULL));
/* call tou library */ /* call tou library */
@ -312,69 +290,66 @@ int BIO_tou_socket_should_retry(int s, int i)
} }
int BIO_tou_socket_non_fatal_error(int err) int BIO_tou_socket_non_fatal_error(int err)
{ {
switch (err) constexpr int fatalError = 0;
{ constexpr int nonFatalError = 1;
#if defined(OPENSSL_SYS_WINDOWS)
# if defined(WSAEWOULDBLOCK)
case WSAEWOULDBLOCK:
# endif
# if 0 /* This appears to always be an error */ switch (err)
# if defined(WSAENOTCONN) {
case WSAENOTCONN: #if defined(OPENSSL_SYS_WINDOWS)
# endif # if defined(WSAEWOULDBLOCK)
# endif case WSAEWOULDBLOCK:
#endif # endif // defined(WSAEWOULDBLOCK)
#endif // defined(OPENSSL_SYS_WINDOWS)
#ifdef EWOULDBLOCK #ifdef EWOULDBLOCK
# ifdef WSAEWOULDBLOCK # ifdef WSAEWOULDBLOCK
# if WSAEWOULDBLOCK != EWOULDBLOCK # if WSAEWOULDBLOCK != EWOULDBLOCK
case EWOULDBLOCK: case EWOULDBLOCK:
# endif # endif // WSAEWOULDBLOCK != EWOULDBLOCK
# else # else // def WSAEWOULDBLOCK
case EWOULDBLOCK: case EWOULDBLOCK:
# endif # endif // def WSAEWOULDBLOCK
#endif #endif
#if defined(ENOTCONN) #if defined(ENOTCONN)
case ENOTCONN: case ENOTCONN:
#endif #endif // defined(ENOTCONN)
#ifdef EINTR #ifdef EINTR
case EINTR: case EINTR:
#endif #endif // def EINTR
#ifdef EAGAIN #ifdef EAGAIN
#if EWOULDBLOCK != EAGAIN # if EWOULDBLOCK != EAGAIN
case EAGAIN: case EAGAIN:
# endif # endif // EWOULDBLOCK != EAGAIN
#endif #endif // def EAGAIN
#ifdef EPROTO #ifdef EPROTO
case EPROTO: case EPROTO:
#endif #endif // def EPROTO
#ifdef EINPROGRESS #ifdef EINPROGRESS
case EINPROGRESS: case EINPROGRESS:
#endif #endif // def EINPROGRESS
#ifdef EALREADY #ifdef EALREADY
case EALREADY: case EALREADY:
#endif #endif // def EALREADY
Dbg2() << __PRETTY_FUNCTION__ << " err: " << err
<< " return nonFatalError " << nonFatalError << std::endl;
return nonFatalError;
#ifdef DEBUG_TOU_BIO
fprintf(stderr, "BIO_tou_socket_non_fatal_error(%d) = 1\n", err);
#endif
return(1);
/* break; */
default: default:
break; break;
}
#ifdef DEBUG_TOU_BIO
fprintf(stderr, "BIO_tou_socket_non_fatal_error(%d) = 0\n", err);
#endif
return(0);
} }
#endif
Dbg2() << __PRETTY_FUNCTION__ << " err: " << err << " return fatalError "
<< fatalError << std::endl;
return fatalError;
}
#endif // ndef OPENSSL_NO_SOCK