diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-23 11:50:21 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-23 21:12:18 -0700 |
commit | 381684059a6481d7a507ae8c690a873aabe6a4cb (patch) | |
tree | 70d9c02b1b33f8d21c02075f5060e01dc6be3c0a /src/net/socket.cpp | |
parent | da6769f929be02a0b3b4d6c52b79922104cdd053 (diff) | |
download | tmwa-381684059a6481d7a507ae8c690a873aabe6a4cb.tar.gz tmwa-381684059a6481d7a507ae8c690a873aabe6a4cb.tar.bz2 tmwa-381684059a6481d7a507ae8c690a873aabe6a4cb.tar.xz tmwa-381684059a6481d7a507ae8c690a873aabe6a4cb.zip |
Remove vomit
Diffstat (limited to 'src/net/socket.cpp')
-rw-r--r-- | src/net/socket.cpp | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/net/socket.cpp b/src/net/socket.cpp index e9e819e..54f9822 100644 --- a/src/net/socket.cpp +++ b/src/net/socket.cpp @@ -1,5 +1,4 @@ #include "socket.hpp" -#include "vomit.hpp" // for remaining FIFO functions // socket.cpp - Network event system. // // Copyright © ????-2004 Athena Dev Teams @@ -121,8 +120,8 @@ IteratorPair<ValueIterator<io::FD, IncrFD>> iter_fds() inline void RFIFOFLUSH(Session *s) { - really_memmove(&s->rdata[0], &s->rdata[s->rdata_pos], RFIFOREST(s)); - s->rdata_size = RFIFOREST(s); + really_memmove(&s->rdata[0], &s->rdata[s->rdata_pos], s->rdata_size - s->rdata_pos); + s->rdata_size -= s->rdata_pos; s->rdata_pos = 0; } @@ -401,19 +400,6 @@ void realloc_fifo(Session *s, size_t rfifo_size, size_t wfifo_size) } } -void WFIFOSET(Session *s, size_t len) -{ - if (s->wdata_size + len + 16384 > s->max_wdata) - { - realloc_fifo(s, s->max_rdata, s->max_wdata << 1); - PRINTF("socket: %d wdata expanded to %zu bytes.\n"_fmt, s, s->max_wdata); - } - if (s->wdata_size + len + 2048 < s->max_wdata) - s->wdata_size += len; - else - FPRINTF(stderr, "socket: %d wdata lost !!\n"_fmt, s), abort(); -} - void do_sendrecv(interval_t next_ms) { bool any = false; @@ -499,14 +485,3 @@ void do_parsepacket(void) RFIFOFLUSH(s); } } - -void RFIFOSKIP(Session *s, size_t len) -{ - s->rdata_pos += len; - - if (s->rdata_size < s->rdata_pos) - { - FPRINTF(stderr, "too many skip\n"_fmt); - abort(); - } -} |