Skip to content

Commit

Permalink
Improved 'client_hash_check' config. (Hercules e4a1ca2)
Browse files Browse the repository at this point in the history
- Added option to disable hash check by GM group_id (specify 'disabled' as hash for a certain group_id to let them log in with any client, even if 'client_hash_check' is enabled.
- Updated and reworded related documentation for the feature.

Improvements on script command 'axtoi'; added 'strtol'. (Hercules 1cf7c1e)
- Added script command 'strtol' (conforming to the ISO C90 function).
- Modified script command 'axtoi' to internally use 'strtol' instead of an unnecessary separate implementation.

Cleaned up many sections of script documentation, and modernized syntax in examples.
Added documentation for 'rentitem2' and 'makeitem2'. (follow-up 339c0a8)

Added 'true' (1) and 'false' (2) as script constants.

'freeloop' argument is now optional, and will only return the value of freeloop if no argument is given. (tid:92470)
http://rathena.org/board/topic/92470-freeloop-optional-argument/

Added a missing mapflag to custom 'devil_square' script. (bugreport:8611)
http://rathena.org/board/tracker/issue-8611-devil-square-bug/

Signed-off-by: Euphy <[email protected]>
  • Loading branch information
euphyy committed Feb 8, 2014
1 parent 339c0a8 commit de46393
Show file tree
Hide file tree
Showing 8 changed files with 420 additions and 407 deletions.
14 changes: 10 additions & 4 deletions conf/login_athena.conf
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,20 @@ account.engine: auto
// Client MD5 hash check
// If turned on, the login server will check if the client's hash matches
// the value below, and will not connect tampered clients.
// Note: see doc\md5_hashcheck.txt for more details.
// Note: see 'doc/md5_hashcheck.txt' for more details.
client_hash_check: off

// Client MD5 hashes
// A player can login with a client hash at or below the account group_id.
// The client with the specified hash can be used to log in by players with
// a group_id equal to or greater than the given value.
// If you specify 'disabled' as hash, players with a group_id greater than or
// equal to the given value will be able to log in regardless of hash (and even
// if their client does not send a hash at all.)
// Format: group_id, hash
client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5
client_hash: 99, cb1ea78023d337c38e8ba5124e2338ae
// Note: see 'doc/md5_hashcheck.txt' for more details.
//client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5
//client_hash: 10, cb1ea78023d337c38e8ba5124e2338ae
//client_hash: 99, disabled

import: conf/inter_athena.conf
import: conf/import/login_conf.txt
3 changes: 3 additions & 0 deletions db/const.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4559,3 +4559,6 @@ VAR_MAX_GUILD_STORAGE 8
VAR_MAX_BG_MEMBERS 9
VAR_VIP_SCRIPT 10
VAR_MIN_STORAGE 11

false 0
true 1
20 changes: 10 additions & 10 deletions doc/item_group.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@ and 'getgroupitem' script commands. The table below explains which fields are
accessed in each.

+===============+====================+================+
| Field | 'getrandgroupitem' | 'getgroupitem' |
| Field | 'getrandgroupitem' | 'getgroupitem' |
+===============+====================+================+
| GroupID | YES | YES |
| GroupID | YES | YES |
+===============+====================+================+
| ItemID | YES | YES |
| ItemID | YES | YES |
+===============+====================+================+
| Rate | YES | YES |
| Rate | YES | YES |
+===============+====================+================+
| Amount | no | YES |
| Amount | no | YES |
+===============+====================+================+
| Random | no | YES |
| Random | no | YES |
+===============+====================+================+
| isAnnounced | no | YES |
| isAnnounced | no | YES |
+===============+====================+================+
| Duration | no | YES |
| Duration | no | YES |
+===============+====================+================+
| isNamed | no | YES |
| isNamed | no | YES |
+===============+====================+================+
| isBound | no | YES |
| isBound | no | YES |
+===============+====================+================+

---------------------------------------
Expand Down
38 changes: 27 additions & 11 deletions doc/md5_hashcheck.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Dev Team
//===== Last Updated: ========================================
//= 20120921
//= 20140208
//===== Description: =========================================
//= This file outlines the login server's MD5 hash check.
//============================================================
Expand All @@ -14,25 +14,41 @@ the client is the one specific to your server.

The client can only send the correct MD5 hash to the server on certain
server types, so a client diff is required to ensure the hash is sent.
A link containing the required WeeDiffGen plugin can be found at:
Please refer to your client diff tool manual for the appropriate patch,
called "Force Send Client Hash Packet" or a similar name. A link
containing the WeeDiffGen plugin can be found at:
http://rathena.org/board/topic/70841-r16771-client-md5-hash-check/

The settings for the hash check are located in conf\login_athena.conf:
The server-side settings for the hash check are located in
'conf\login_athena.conf':

// Client MD5 hash check
// If turned on, the login server will check if the client's hash matches
// the value below, and will not connect tampered clients.
// Note: see doc\md5_hashcheck.txt for more details.
// Note: see 'doc/md5_hashcheck.txt' for more details.
client_hash_check: off

// Client MD5 hashes
// A player can login with a client hash at or below the account group_id.
// The client with the specified hash can be used to log in by players with
// a group_id equal to or greater than the given value.
// If you specify 'disabled' as hash, players with a group_id greater than or
// equal to the given value will be able to log in regardless of hash (and even
// if their client does not send a hash at all.)
// Format: group_id, hash
// Note: see 'doc/md5_hashcheck.txt' for more details.
client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5
client_hash: 99, cb1ea78023d337c38e8ba5124e2338ae
client_hash: 10, cb1ea78023d337c38e8ba5124e2338ae
client_hash: 99, disabled

To enable MD5 hash checks, set 'client_hash_check' to 'on'.
The 'client_hash' group_id can be any of the groups in conf\groups.conf,
and is particularly useful if you wanted to allow GMs a different client
than normal players; for example, a GM client could be hexed differently
with dual-clienting enabled and chat flood disabled.
To enable MD5 hash checks, set 'client_hash_check' to 'on' and add one
'client_hash' entry for each client you want to use.
The group_id can be any of the groups in 'conf/groups.conf', and it is
useful in case if you want to allow GMs to use a different client
than normal players; for example, a GM client could be hexed
differently, perhaps with dual-clienting enabled and chat flood
disabled.
You will need to replace the example MD5 hashes with the actual hash of
your client. You can use any MD5 hash tools to generate it, e.g.:
- md5sum (command line) on linux
- WinMD5 on Windows
- md5 (command line) on Mac OS X
Loading

0 comments on commit de46393

Please sign in to comment.