X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fircd_parse.c;h=950541c10c08749830b7092d0f7626388a6be103;hb=b708125495aacd544ee33d252368814acae5adb9;hp=54cdad20ef102d82455ea184b09d5f81b177a44f;hpb=ffef7816a745964e42bbf7409975b127bb454152;p=NextIRCd.git diff --git a/src/ircd_parse.c b/src/ircd_parse.c index 54cdad2..950541c 100644 --- a/src/ircd_parse.c +++ b/src/ircd_parse.c @@ -16,6 +16,7 @@ */ #include +#include #include "tools.h" #include "IOHandler/IOSockets.h" @@ -62,8 +63,8 @@ struct { } parse_command_list[] = { {{"PING", "P"}, /* Ping Command */ - {NULL, 0, 1, 0}, /* Client */ - {NULL, 0, 1, 0}, /* Unauthed */ + {cmd_ping_cli, 0, 1, 0}, /* Client */ + {cmd_ping_auth, 0, 1, 0}, /* Unauthed */ {NULL, 0, 1, 0} /* Server */ }, {{"PASS", NULL}, /* PASS Command */ @@ -89,9 +90,9 @@ static char *parse_irc_token(char **data) { //find next " " int i; char *token = *data; - for(i = 0; *data[i]; i++) { - if(*data[i] != ' ') { - *data[i] = '\0'; + for(i = 0; (*data)[i]; i++) { + if((*data)[i] == ' ') { + (*data)[i] = '\0'; *data += i+1; break; } @@ -100,10 +101,9 @@ static char *parse_irc_token(char **data) { } static char **parse_irc_params(char *data, int *argc, int maxargs) { - if(maxargs == 0) { - *argc = 0; + *argc = 0; + if(maxargs == 0) return NULL; - } char **argv = calloc(maxargs, sizeof(*argv)); while(*data) { //skip leading spaces @@ -114,7 +114,7 @@ static char **parse_irc_params(char *data, int *argc, int maxargs) { argv[*argc++] = data + 1; break; } - argv[*argc++] = data; + argv[(*argc)++] = data; if (*argc >= maxargs) break; while (*data != ' ' && *data) @@ -131,7 +131,7 @@ void parse_client_data(struct Client *client, char *data) { int found = 0; int i; for(i = 0; (parse_command_list[i].tokens.client || parse_command_list[i].tokens.server); i++) { - if(stricmp(parse_command_list[i].tokens.client, token)) { + if(stricmp(parse_command_list[i].tokens.client, token) == 0) { found = 1; break; } @@ -161,7 +161,7 @@ void parse_unauth_data(struct Auth *auth, char *data) { int found = 0; int i; for(i = 0; (parse_command_list[i].tokens.client || parse_command_list[i].tokens.server); i++) { - if(stricmp(parse_command_list[i].tokens.client, token)) { + if(stricmp(parse_command_list[i].tokens.client, token) == 0) { found = 1; break; }