X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fircd_parse.c;h=3a23335d05e4b1fa11403ecaf4c1008e6d759b32;hb=4e79b9632a41b2c7d2fecb4e4514692f9cf7e7f9;hp=392459b852cfab4c594bc06873f5f2836899e026;hpb=c034e019f212727f6e2fbd6c824c7a965770ae28;p=NextIRCd.git
diff --git a/src/ircd_parse.c b/src/ircd_parse.c
index 392459b..3a23335 100644
--- a/src/ircd_parse.c
+++ b/src/ircd_parse.c
@@ -15,8 +15,15 @@
* along with this program. If not, see .
*/
+#include
+#include
+
#include "tools.h"
#include "IOHandler/IOSockets.h"
+#include "ircd_parse.h"
+#include "struct_client.h"
+#include "struct_auth.h"
+#include "struct_servermsg.h"
typedef int cmd_client_t(struct Client *client, char *argv[], int argc);
typedef int cmd_auth_t(struct Auth *auth, char *argv[], int argc);
@@ -27,7 +34,7 @@ static struct ServerMsg parse_static_srvmsg;
#define PARSE_CLIFLAG_OPONLY 0x01
//include all commands
-#include "cmd_ping.h"
+#include "cmd.h"
struct {
@@ -54,12 +61,27 @@ struct {
unsigned int flags : 8;
} server;
-} parse_command_list {
+} parse_command_list[] = {
{{"PING", "P"}, /* Ping Command */
{NULL, 0, 1, 0}, /* Client */
{NULL, 0, 1, 0}, /* Unauthed */
{NULL, 0, 1, 0} /* Server */
},
+ {{"PASS", NULL}, /* PASS Command */
+ {NULL, 0, 1, 0}, /* Client */
+ {NULL, 0, 1, 0}, /* Unauthed */
+ {NULL, 0, 1, 0} /* Server */
+ },
+ {{"NICK", "N"}, /* Nick Command */
+ {cmd_nick_cli, 1, 1, 0}, /* Client */
+ {cmd_nick_auth, 1, 1, 0}, /* Unauthed */
+ {NULL, 0, 1, 0} /* Server */
+ },
+ {{"USER", "U"}, /* User Command */
+ {cmd_user_cli, 4, 4, 0}, /* Client */
+ {cmd_user_auth, 4, 1, 0}, /* Unauthed */
+ {NULL, 0, 1, 0} /* Server */
+ },
{{NULL, NULL},{NULL, 0, 0, 0},{NULL, 0, 0, 0},{NULL, 0, 0, 0}}
};
@@ -86,18 +108,18 @@ static char **parse_irc_params(char *data, int *argc, int maxargs) {
char **argv = calloc(maxargs, sizeof(*argv));
while(*data) {
//skip leading spaces
- while (*line == ' ')
- *line++ = 0;
- if (*line == ':') {
+ while (*data == ' ')
+ *data++ = 0;
+ if (*data == ':') {
//the rest is a single parameter
- argv[*argc++] = line + 1;
+ argv[*argc++] = data + 1;
break;
}
- argv[*argc++] = line;
- if (argc >= maxargs)
+ argv[*argc++] = data;
+ if (*argc >= maxargs)
break;
- while (*line != ' ' && *line)
- line++;
+ while (*data != ' ' && *data)
+ data++;
}
return argv;
}
@@ -222,7 +244,7 @@ void parse_server_data(struct Server *server, struct IOSocketBuffer *buffer) {
srvmsg->destinations = malloc(sizeof(struct ServerMsgDstMap));
srvmsg->destinations->dstcount = 1;
srvmsg->destinations->dst[0].destination.srvnum = ((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]);
- srvmsg->destinations->dst[0].destination.resolved_destination = 0;
+ srvmsg->destinations->dst[0].resolved_destination = 0;
break;
case SERVERMSG_TYPE_MULTICAST:
if(buflen < 5) {
@@ -240,7 +262,7 @@ void parse_server_data(struct Server *server, struct IOSocketBuffer *buffer) {
srvmsg->destinations->dstcount = srvcount;
for(i = 0; i < srvcount; i++) {
srvmsg->destinations->dst[i].destination.srvnum = ((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]);
- srvmsg->destinations->dst[i].destination.resolved_destination = 0;
+ srvmsg->destinations->dst[i].resolved_destination = 0;
buf += 4;
buflen -= 4;
}
@@ -260,7 +282,7 @@ void parse_server_data(struct Server *server, struct IOSocketBuffer *buffer) {
goto parse_server_data_finish;
}
- srvmsg->arglen = srvmsg->msglen - (buf - buffer->buffer);
+ srvmsg->arglen = srvmsg->msglen - (buf - (unsigned char*)buffer->buffer);
srvmsg->args = buf;
int found = 0;
@@ -284,7 +306,7 @@ void parse_server_data(struct Server *server, struct IOSocketBuffer *buffer) {
memmove(buffer->buffer, buffer->buffer + srvmsg->msglen, srvmsg->msglen - buffer->bufpos);
buffer->bufpos -= srvmsg->msglen;
} else
- srvmsg->bufpos = 0;
+ buffer->bufpos = 0;
}
}