diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:43:26 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:43:26 -0700 |
commit | 8f4e4e9a92f6af89820a358ab99b990697117502 (patch) | |
tree | cb312b5367c71dfe89543a5463be9555177c6445 /src/common/socket.c | |
parent | f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (diff) | |
parent | 2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a (diff) | |
download | tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.gz tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.bz2 tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.tar.xz tmwa-8f4e4e9a92f6af89820a358ab99b990697117502.zip |
Merge commit '2c863c0d99aa3df9ef2eb4ceb112c4d946520f0a'
Diffstat (limited to 'src/common/socket.c')
-rw-r--r-- | src/common/socket.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/common/socket.c b/src/common/socket.c index 7c86b1a..67a5102 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -23,8 +23,8 @@ fd_set readfds; int fd_max; int currentuse; -const uint32_t rfifo_size = 65536; -const uint32_t wfifo_size = 65536; +const uint32_t RFIFO_SIZE = 65536; +const uint32_t WFIFO_SIZE = 65536; struct socket_data *session[FD_SETSIZE]; @@ -126,11 +126,11 @@ static void connect_client (int listen_fd) fcntl (fd, F_SETFL, O_NONBLOCK); CREATE (session[fd], struct socket_data, 1); - CREATE (session[fd]->rdata, uint8_t, rfifo_size); - CREATE (session[fd]->wdata, uint8_t, wfifo_size); + CREATE (session[fd]->rdata, uint8_t, RFIFO_SIZE); + CREATE (session[fd]->wdata, uint8_t, WFIFO_SIZE); - session[fd]->max_rdata = rfifo_size; - session[fd]->max_wdata = wfifo_size; + session[fd]->max_rdata = RFIFO_SIZE; + session[fd]->max_wdata = WFIFO_SIZE; session[fd]->func_recv = recv_to_fifo; session[fd]->func_send = send_from_fifo; session[fd]->func_parse = default_func_parse; @@ -231,11 +231,11 @@ int make_connection (uint32_t ip, uint16_t port) FD_SET (fd, &readfds); CREATE (session[fd], struct socket_data, 1); - CREATE (session[fd]->rdata, uint8_t, rfifo_size); - CREATE (session[fd]->wdata, uint8_t, wfifo_size); + CREATE (session[fd]->rdata, uint8_t, RFIFO_SIZE); + CREATE (session[fd]->wdata, uint8_t, WFIFO_SIZE); - session[fd]->max_rdata = rfifo_size; - session[fd]->max_wdata = wfifo_size; + session[fd]->max_rdata = RFIFO_SIZE; + session[fd]->max_wdata = WFIFO_SIZE; session[fd]->func_recv = recv_to_fifo; session[fd]->func_send = send_from_fifo; session[fd]->func_parse = default_func_parse; @@ -399,7 +399,7 @@ FILE *fopen_ (const char *path, const char *mode) return f; } -bool free_fds () +bool free_fds (void) { return currentuse < SOFT_LIMIT; } |