From 8812bcce528883ac963bd848e91ddcf162a24fa0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 10 Nov 2014 20:01:29 +0300 Subject: login: move server version sending into separate file. --- src/Makefile.am | 4 +++- src/login/parse.c | 8 ++------ src/login/send.c | 25 +++++++++++++++++++++++++ src/login/send.h | 9 +++++++++ 4 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/login/send.c create mode 100644 src/login/send.h diff --git a/src/Makefile.am b/src/Makefile.am index 35f94a4..d95ddfc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,9 @@ LOGIN_SRC = login/config.c \ login/config.h \ login/init.c \ login/parse.c \ - login/parse.h + login/parse.h \ + login/send.c \ + login/send.h MAP_SRC = map/dummy.c \ map/dummy.h \ diff --git a/src/login/parse.c b/src/login/parse.c index 7b6bb11..b8f25fe 100644 --- a/src/login/parse.c +++ b/src/login/parse.c @@ -13,6 +13,7 @@ #include "../../../login/login.h" #include "login/parse.h" +#include "login/send.h" int clientVersion = 0; @@ -30,12 +31,7 @@ void login_parse_version(int fd) return; } - WFIFOHEAD(fd, 4 + 8); - WFIFOW(fd, 0) = 0x7531; - WFIFOW(fd, 2) = 4 + 8; - WFIFOL(fd, 4) = 0; // unused - WFIFOL(fd, 8) = 1; // server version - WFIFOSET(fd, WFIFOW(fd,2)); + send_server_version(fd); } int elogin_parse_client_login_pre(int *fd, struct login_session_data* sd, const char *const ip) diff --git a/src/login/send.c b/src/login/send.c new file mode 100644 index 0000000..257376f --- /dev/null +++ b/src/login/send.c @@ -0,0 +1,25 @@ +// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// Copyright (c) 2014 Evol developers + +#include +#include +#include + +#include "../../../common/HPMi.h" +#include "../../../common/malloc.h" +#include "../../../common/mmo.h" +#include "../../../common/socket.h" +#include "../../../common/strlib.h" +#include "../../../login/login.h" + +#include "login/send.h" + +void send_server_version(int fd) +{ + WFIFOHEAD(fd, 4 + 8); + WFIFOW(fd, 0) = 0x7531; + WFIFOW(fd, 2) = 4 + 8; + WFIFOL(fd, 4) = 0; // unused + WFIFOL(fd, 8) = 1; // server version + WFIFOSET(fd, WFIFOW(fd,2)); +} diff --git a/src/login/send.h b/src/login/send.h new file mode 100644 index 0000000..20c184e --- /dev/null +++ b/src/login/send.h @@ -0,0 +1,9 @@ +// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// Copyright (c) 2014 Evol developers + +#ifndef EVOL_LOGIN_SEND +#define EVOL_LOGIN_SEND + +void send_server_version(); + +#endif // EVOL_LOGIN_SEND -- cgit v1.2.3-70-g09d2