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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2014-03-23 12:53:55 +09:00
parent 1ee2e1e8b9
commit 74216ee392
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/transport/tcp.c
View File

@ -692,12 +692,10 @@ static void _socket_callback_read_client(TCPSocket * tcpsocket,
AppMessage * message); AppMessage * message);
static void _socket_callback_read_server(TCPSocket * tcpsocket, static void _socket_callback_read_server(TCPSocket * tcpsocket,
AppMessage * message); AppMessage * message);
static int _socket_callback_recv(TCPSocket * tcpsocket);
static int _tcp_socket_callback_read(int fd, TCPSocket * tcpsocket) static int _tcp_socket_callback_read(int fd, TCPSocket * tcpsocket)
{ {
const size_t inc = INC;
ssize_t ssize;
char * p;
size_t size; size_t size;
Variable * variable; Variable * variable;
Buffer * buffer; Buffer * buffer;
@ -709,33 +707,12 @@ static int _tcp_socket_callback_read(int fd, TCPSocket * tcpsocket)
/* check parameters */ /* check parameters */
if(tcpsocket->fd != fd) if(tcpsocket->fd != fd)
return -1; return -1;
if((p = realloc(tcpsocket->bufin, tcpsocket->bufin_cnt + inc)) == NULL) if(_socket_callback_recv(tcpsocket) != 0)
return -1; return -1;
tcpsocket->bufin = p;
if((ssize = recv(tcpsocket->fd, &tcpsocket->bufin[tcpsocket->bufin_cnt],
inc, 0)) < 0)
{
error_set_code(1, "%s", strerror(errno));
close(tcpsocket->fd);
tcpsocket->fd = -1;
/* FIXME report error */
return -1;
}
else if(ssize == 0)
{
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s() read() => %ld\n", __func__, ssize);
#endif
close(tcpsocket->fd);
tcpsocket->fd = -1;
/* FIXME report transfer clean shutdown */
return -1;
}
else
tcpsocket->bufin_cnt += ssize;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s() read() => %ld\n", __func__, ssize); fprintf(stderr, "DEBUG: %s() read() => %ld\n", __func__, ssize);
#endif #endif
/* FIXME run this code in a loop? */
size = tcpsocket->bufin_cnt; size = tcpsocket->bufin_cnt;
/* deserialize the data as a buffer (containing a message) */ /* deserialize the data as a buffer (containing a message) */
if((variable = variable_new_deserialize_type(VT_BUFFER, &size, if((variable = variable_new_deserialize_type(VT_BUFFER, &size,
@ -790,6 +767,38 @@ static void _socket_callback_read_server(TCPSocket * tcpsocket,
message); message);
} }
static int _socket_callback_recv(TCPSocket * tcpsocket)
{
const size_t inc = INC;
ssize_t ssize;
char * p;
if((p = realloc(tcpsocket->bufin, tcpsocket->bufin_cnt + inc)) == NULL)
return -1;
tcpsocket->bufin = p;
if((ssize = recv(tcpsocket->fd, &tcpsocket->bufin[tcpsocket->bufin_cnt],
inc, 0)) < 0)
{
error_set_code(1, "%s", strerror(errno));
close(tcpsocket->fd);
tcpsocket->fd = -1;
/* FIXME report error */
return -1;
}
else if(ssize == 0)
{
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s() read() => %ld\n", __func__, ssize);
#endif
close(tcpsocket->fd);
tcpsocket->fd = -1;
/* FIXME report transfer clean shutdown */
return -1;
}
tcpsocket->bufin_cnt += ssize;
return 0;
}
/* tcp_socket_callback_write */ /* tcp_socket_callback_write */
static int _tcp_socket_callback_write(int fd, TCPSocket * tcpsocket) static int _tcp_socket_callback_write(int fd, TCPSocket * tcpsocket)