summaryrefslogtreecommitdiff
path: root/src/map/clif.cpp
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2018-12-30 16:06:06 -0500
committergumi <git@gumi.ca>2018-12-30 16:32:51 -0500
commita56b3ea671e9cc74b3f9ea723bc149e83212b998 (patch)
treea595027339f278c83e4ca8c30454900bdff7f70a /src/map/clif.cpp
parenta860cff760e39dc63de529991131fe295e03f543 (diff)
downloadtmwa-a56b3ea671e9cc74b3f9ea723bc149e83212b998.tar.gz
tmwa-a56b3ea671e9cc74b3f9ea723bc149e83212b998.tar.bz2
tmwa-a56b3ea671e9cc74b3f9ea723bc149e83212b998.tar.xz
tmwa-a56b3ea671e9cc74b3f9ea723bc149e83212b998.zip
pre-send the auth details to map servers instead of blindly trusting 0x0072
Diffstat (limited to 'src/map/clif.cpp')
-rw-r--r--src/map/clif.cpp27
1 files changed, 24 insertions, 3 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index f2667ac..a2f3b3a 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -3539,15 +3539,36 @@ RecvResult clif_parse_WantToConnection(Session *s, dumb_ptr<map_session_data> sd
if (rv != RecvResult::Complete)
return rv;
- {
- account_id = fixed.account_id;
- }
+ account_id = fixed.account_id;
// formerly: account id
Packet_Payload<0x8000> special;
special.magic_packet_length = 4;
send_ppacket<0x8000>(s, special);
+ bool is_valid = false;
+ for (AuthFifoEntry& afi : auth_fifo)
+ {
+ if (afi.account_id == fixed.account_id
+ && afi.char_id == fixed.char_id
+ && afi.login_id1 == fixed.login_id1
+ //&& afi.login_id2 == sd->login_id2
+ && afi.ip == s->client_ip
+ && afi.delflag == 0)
+ {
+ is_valid = true;
+ afi.delflag = 1;
+ break;
+ }
+ }
+
+ if (!is_valid)
+ {
+ MAP_LOG_AND_ECHO("Attempt to connect without correct authentication (REJECTED IP: %s)!\n"_fmt, s->client_ip);
+ s->set_eof();
+ return RecvResult::Complete;
+ }
+
// if same account already connected, we disconnect the 2 sessions
dumb_ptr<map_session_data> old_sd = map_id2sd(account_to_block(account_id));
if (old_sd)