diff options
| -rw-r--r-- | conf/packet_athena.conf | 7 | ||||
| -rw-r--r-- | src/common/socket.c | 3 | ||||
| -rw-r--r-- | src/common/socket.h | 1 | ||||
| -rw-r--r-- | src/map/clif.c | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/conf/packet_athena.conf b/conf/packet_athena.conf index e1ce86a46..0741ac013 100644 --- a/conf/packet_athena.conf +++ b/conf/packet_athena.conf @@ -8,13 +8,12 @@ debug: no // How long can a socket stall before closing the connection (in seconds) stall_time: 60 -// Maximum allowed size for clients packets in bytes (default: 8192). +// Maximum allowed size for clients packets in bytes (default: 24576). // NOTE: To reduce the size of reported packets, lower the values of defines, which // have been customized, such as MAX_STORAGE, MAX_GUILD_STORAGE or MAX_CART. // NOTE: Do not modify this setting, unless the client has been modified to support -// larger packets. The client will crash, when it receives larger packets, -// or worse, show undefined behavior. -socket_max_client_packet: 8192 +// larger packets. The client will crash, when it receives larger packets. +socket_max_client_packet: 24576 //----- IP Rules Settings ----- diff --git a/src/common/socket.c b/src/common/socket.c index a98a8cbb1..592755d5a 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -219,8 +219,7 @@ int naddr_ = 0; // # of ip addresses // Maximum packet size in bytes, which the client is able to handle. // Larger packets cause a buffer overflow and stack corruption. -// TODO: This value is based on pure observation with newer clients. Replace with the actual buffer size if we ever get our hands on it. -size_t socket_max_client_packet = 8192; +static size_t socket_max_client_packet = 24576; // initial recv buffer size (this will also be the max. size) // biggest known packet: S 0153 <len>.w <emblem data>.?B -> 24x24 256 color .bmp (0153 + len.w + 1618/1654/1756 bytes) diff --git a/src/common/socket.h b/src/common/socket.h index 1328d4b23..a5d519d0e 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -94,7 +94,6 @@ struct socket_data void* session_data; // stores application-specific data related to the session }; -extern size_t socket_max_client_packet; // Data prototype declaration diff --git a/src/map/clif.c b/src/map/clif.c index 5d059180e..3e45e7edb 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4535,7 +4535,7 @@ void clif_skillinfoblock(struct map_session_data *sd) if( (id = sd->status.skill[i].id) != 0 ) { // workaround for bugreport:5348 - if (len + 37 > socket_max_client_packet) + if (len + 37 > 8192) break; WFIFOW(fd,len) = id; |