diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-09 15:57:22 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-09 15:57:22 +0000 |
| commit | 91d42beda228772338cecadda47c7fd50217c60f (patch) | |
| tree | 1544588bc5d896b581064e0182df75ef02c1f70d /src/common/socket.c | |
| parent | 8c1a525cdb55bd21309396d82d2d507adaebd794 (diff) | |
| download | hercules-91d42beda228772338cecadda47c7fd50217c60f.tar.gz hercules-91d42beda228772338cecadda47c7fd50217c60f.tar.bz2 hercules-91d42beda228772338cecadda47c7fd50217c60f.tar.xz hercules-91d42beda228772338cecadda47c7fd50217c60f.zip | |
- Reversed revision #9415 (messages with server_tick field being sent as soon as possible) since it didn't fix the client synchronization issue.
- clif_parse_TickSend is sent immediately so the client gets accurate "pings"
Note: in Changelog, for my changes, if they're grouped together and in the same day I'm only gonna "sign" the bottom line.
All unsigned lines are assumed to be from the same person of the previous line (below). (easier searches =P)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9443 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/socket.c')
| -rw-r--r-- | src/common/socket.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/common/socket.c b/src/common/socket.c index dcaf2cdf2..fafa229df 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -687,7 +687,7 @@ int realloc_writefifo(int fd, size_t addition) return 0; } -int _WFIFOSET(int fd, int len, char flush) +int WFIFOSET(int fd,int len) { size_t newreserve; struct socket_data *s = session[fd]; @@ -712,9 +712,7 @@ int _WFIFOSET(int fd, int len, char flush) // For inter-server connections, let the reserve be 1/4th of the link size. newreserve = s->wdata_size + (s->max_wdata>=FIFOSIZE_SERVERLINK?FIFOSIZE_SERVERLINK/4:wfifo_size); - if( flush ) - flush_fifo(fd); - else if(s->wdata_size >= frame_size) + if(s->wdata_size >= frame_size) send_from_fifo(fd); // realloc after sending |