DeforaOS/Transport
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report errors when reading and writing network data

Browse Source
This commit is contained in:
Pierre Pronchery 2014-05-13 20:51:13 +02:00
parent c92c280585
commit c3f08aebb4
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/transport/ssl.c
View File

@ -35,6 +35,7 @@
# include <arpa/inet.h> # include <arpa/inet.h>
# include <netdb.h> # include <netdb.h>
#endif #endif
#include <openssl/err.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <System.h> #include <System.h>
#include <System/App/appmessage.h> #include <System/App/appmessage.h>
@ -824,28 +825,22 @@ static int _socket_callback_recv(SSLSocket * sslsocket)
const size_t inc = INC; const size_t inc = INC;
int ssize; int ssize;
char * p; char * p;
char buf[128];
if((p = realloc(sslsocket->bufin, sslsocket->bufin_cnt + inc)) == NULL) if((p = realloc(sslsocket->bufin, sslsocket->bufin_cnt + inc)) == NULL)
return -1; return -1;
sslsocket->bufin = p; sslsocket->bufin = p;
if((ssize = SSL_read(sslsocket->ssl, if((ssize = SSL_read(sslsocket->ssl,
&sslsocket->bufin[sslsocket->bufin_cnt], &sslsocket->bufin[sslsocket->bufin_cnt],
inc)) < 0) inc)) <= 0)
{ {
error_set_code(1, "%s", strerror(errno)); /* XXX report error (and reconnect clients) */
ERR_error_string(SSL_get_error(sslsocket->ssl, ssize), buf);
error_set_code(1, "%s", buf);
SSL_free(sslsocket->ssl);
sslsocket->ssl = NULL;
close(sslsocket->fd); close(sslsocket->fd);
sslsocket->fd = -1; sslsocket->fd = -1;
/* FIXME report error */
return -1;
}
else if(ssize == 0)
{
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s() SSL_read() => %ld\n", __func__, ssize);
#endif
close(sslsocket->fd);
sslsocket->fd = -1;
/* FIXME report transfer clean shutdown */
return -1; return -1;
} }
sslsocket->bufin_cnt += ssize; sslsocket->bufin_cnt += ssize;
@ -857,6 +852,7 @@ static int _socket_callback_recv(SSLSocket * sslsocket)
static int _ssl_socket_callback_write(int fd, SSLSocket * sslsocket) static int _ssl_socket_callback_write(int fd, SSLSocket * sslsocket)
{ {
int ssize; int ssize;
char buf[128];
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%d)\n", __func__, fd); fprintf(stderr, "DEBUG: %s(%d)\n", __func__, fd);
@ -865,21 +861,17 @@ static int _ssl_socket_callback_write(int fd, SSLSocket * sslsocket)
if(sslsocket->fd != fd) if(sslsocket->fd != fd)
return -1; return -1;
if((ssize = SSL_write(sslsocket->ssl, sslsocket->bufout, if((ssize = SSL_write(sslsocket->ssl, sslsocket->bufout,
sslsocket->bufout_cnt)) < 0) sslsocket->bufout_cnt)) <= 0)
{ {
/* XXX report error (and reconnect) */ /* XXX report error (and reconnect clients) */
error_set_code(1, "%s", strerror(errno)); ERR_error_string(SSL_get_error(sslsocket->ssl, ssize), buf);
error_set_code(1, "%s", buf);
SSL_free(sslsocket->ssl);
sslsocket->ssl = NULL;
close(sslsocket->fd); close(sslsocket->fd);
sslsocket->fd = -1; sslsocket->fd = -1;
return -1; return -1;
} }
else if(ssize == 0)
{
close(sslsocket->fd);
sslsocket->fd = -1;
/* XXX report transfer interruption (and reconnect) */
return -error_set_code(1, "%s", strerror(errno));
}
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s() send() => %ld\n", __func__, ssize); fprintf(stderr, "DEBUG: %s() send() => %ld\n", __func__, ssize);
#endif #endif