diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-21 21:29:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-07-05 02:02:27 +0300 |
| commit | e788ed3e4c320439df2ec4856bf0116a14369aba (patch) | |
| tree | 1201884f37bb1d93963830f0714567f36de1f43b /src | |
| parent | 8e6fb2d743ff778eaf38ffbc7a44f0aea788d9b7 (diff) | |
| download | hercules-e788ed3e4c320439df2ec4856bf0116a14369aba.tar.gz hercules-e788ed3e4c320439df2ec4856bf0116a14369aba.tar.bz2 hercules-e788ed3e4c320439df2ec4856bf0116a14369aba.tar.xz hercules-e788ed3e4c320439df2ec4856bf0116a14369aba.zip | |
Add missing checks into login.c
Also add some NONNULL attributes for known non null parameters.
Diffstat (limited to 'src')
| -rw-r--r-- | src/login/login.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/login/login.c b/src/login/login.c index f4cb16d1b..caace34da 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -1230,15 +1230,15 @@ void login_kick(struct login_session_data* sd) void login_auth_ok(struct login_session_data* sd) { - int fd = sd->fd; + int fd = 0; uint32 ip; - uint8 server_num, n; uint32 subnet_char_ip; struct login_auth_node* node; int i; nullpo_retv(sd); + fd = sd->fd; ip = session[fd]->client_addr; if( runflag != LOGINSERVER_ST_RUNNING ) { @@ -1431,11 +1431,13 @@ void login_login_error(int fd, uint8 status) WFIFOSET(fd,23); } +void login_parse_ping(int fd, struct login_session_data* sd) __attribute__((nonnull (2))); void login_parse_ping(int fd, struct login_session_data* sd) { RFIFOSKIP(fd,26); } +void login_parse_client_md5(int fd, struct login_session_data* sd) __attribute__((nonnull (2))); void login_parse_client_md5(int fd, struct login_session_data* sd) { sd->has_client_hash = 1; @@ -1444,6 +1446,7 @@ void login_parse_client_md5(int fd, struct login_session_data* sd) RFIFOSKIP(fd,18); } +bool login_parse_client_login(int fd, struct login_session_data* sd, const char *const ip) __attribute__((nonnull (2))); bool login_parse_client_login(int fd, struct login_session_data* sd, const char *const ip) { uint32 version; @@ -1523,6 +1526,7 @@ bool login_parse_client_login(int fd, struct login_session_data* sd, const char return false; } +void login_send_coding_key(int fd, struct login_session_data* sd) __attribute__((nonnull (2))); void login_send_coding_key(int fd, struct login_session_data* sd) { WFIFOHEAD(fd,4 + sd->md5keylen); @@ -1532,6 +1536,7 @@ void login_send_coding_key(int fd, struct login_session_data* sd) WFIFOSET(fd,WFIFOW(fd,2)); } +void login_parse_request_coding_key(int fd, struct login_session_data* sd) __attribute__((nonnull (2))); void login_parse_request_coding_key(int fd, struct login_session_data* sd) { memset(sd->md5key, '\0', sizeof(sd->md5key)); @@ -1541,6 +1546,7 @@ void login_parse_request_coding_key(int fd, struct login_session_data* sd) login->send_coding_key(fd, sd); } +void login_char_server_connection_status(int fd, struct login_session_data* sd, uint8 status) __attribute__((nonnull (2))); void login_char_server_connection_status(int fd, struct login_session_data* sd, uint8 status) { WFIFOHEAD(fd,3); @@ -1549,6 +1555,7 @@ void login_char_server_connection_status(int fd, struct login_session_data* sd, WFIFOSET(fd,3); } +void login_parse_request_connection(int fd, struct login_session_data* sd, const char *const ip, uint32 ipl) __attribute__((nonnull (2, 3))); void login_parse_request_connection(int fd, struct login_session_data* sd, const char *const ip, uint32 ipl) { char server_name[20]; |