evirc: comparison src/irc

equal deleted inserted replaced

-:791d7a5532e2
+:4fe4a3c4496e
 #include "irc_conn.h"
 #include "irc_cmd.h"
+#include "irc_nm.h"
 #include "log.h"
 #include <stdlib.h>
 #include <string.h>
-/*
+/**
-* "Welcome to the Internet Relay Network <nick>!<user>@<host>"
+* @group Forward-declerations
-*/
+* @{
-static void on_RPL_WELCOME (struct irc_conn *conn, const struct irc_line *line, void *arg)
+*/
-{
-(void) line;
+/**
-(void) arg;
+* Handle an event-based error on this IRC connection.
+*/
+static void irc_conn_handle_error (struct irc_conn *conn, struct error_info *err);
+/**
+* Update irc_conn.nickname
+*/
+static err_t irc_conn_set_nickname (struct irc_conn *conn, const char *nickname)
+{
+struct error_info err;
+// strdup
+if ((conn->nickname = strdup(nickname)) == NULL) {
+SET_ERROR(&err, ERR_STRDUP);
+// notify
+irc_conn_handle_error(conn, &err);
+return ERROR_CODE(&err);
+}
+// ok
+return SUCCESS;
+}
+// @}
+/**
+* 001 <nick> :Welcome to the Internet Relay Network <nick>!<user>@<host>
+*/
+static void on_RPL_WELCOME (const struct irc_line *line, void *arg)
+{
+struct irc_conn *conn = arg;
 // update state
 conn->registering = false;
 conn->registered = true;
+// set our real nickname from the message target
+if (irc_conn_set_nickname(conn, line->args[0]))
+return;
 // trigger callback
 if (conn->callbacks.on_registered)
 conn->callbacks.on_registered(conn, conn->cb_arg);
 }
-/*
+/**
 * PING <server1> [ <server2> ]
 *
 * Send a 'PONG <server1>` reply right away.
 */
-static void on_PING (struct irc_conn *conn, const struct irc_line *line, void *arg)
+static void on_PING (const struct irc_line *line, void *arg)
 {
-(void) arg;
+struct irc_conn *conn = arg;
 // just reply
 irc_conn_PONG(conn, line->args[0]);
 }
-/*
+/**
+* NICK <nickname>
+*
+* If the prefix is us, then update our nickname
+*/
+static void on_NICK (const struct irc_line *line, void *arg)
+{
+struct irc_conn *conn = arg;
+char nickname[IRC_NICK_MAX];
+// parse nickname, ignoring errors
+if (irc_prefix_parse_nick(line->prefix, nickname)) {
+log_warn("invalid prefix: %s", line->prefix);
+return;
+}
+// ignore if it's not us
+if (irc_cmp_nick(nickname, conn->nickname))
+return;
+// update our nickname
+irc_conn_set_nickname(conn, nickname);
+}
+/**
 * Our command handlers
 */
-struct irc_cmd_handler _cmd_handlers[] = {
+static struct irc_cmd_handler _cmd_handlers[] = {
-{ IRC_RPL_WELCOME,  on_RPL_WELCOME      },
+{   IRC_RPL_WELCOME,    &on_RPL_WELCOME     },
-{ "PING",           on_PING             },
+{   "PING",             &on_PING            },
-{ NULL,             NULL,               },
+{   "NICK",             &on_NICK            },
+{   NULL,               NULL,               },
 };
 /**
 * Incoming line handler
 */
 void irc_conn_on_line (char *line_buf, void *arg)
 {
 struct irc_conn *conn = arg;
 struct irc_line line;
-struct irc_cmd_chain *chain;
-struct irc_cmd_handler *handler;
 int err;
 // log
 log_debug("%s", line_buf);
 // parse
 if ((err = irc_line_parse(&line, line_buf))) {
 log_warn("invalid line: %s: %s\n", line_buf, error_name(err));
 return;
 }
-// run each handler chain
+// invoke command handlers
-STAILQ_FOREACH(chain, &conn->handlers, node) {
+irc_cmd_invoke(&conn->handlers, &line);
-// look up appropriate handler
-for (handler = chain->handlers; handler->command; handler++) {
-// the command is alpha-only, so normal case-insensitive cmp is fine
-if (strcasecmp(handler->command, line.command) == 0) {
-// invoke the func
-handler->func(conn, &line, chain->arg);
-// ...only one per chain
-break;
-}
-}
-}
 }
 /**
 * Transport failed
 */
 {
 struct irc_conn *conn = arg;
 // log
 log_err_info(err, "line_proto error");
-// XXX: notify user
+// 'handle'
+irc_conn_handle_error(conn, err);
 }
 static struct line_proto_callbacks _lp_callbacks = {
 .on_line        = &irc_conn_on_line,
 .on_error       = &irc_conn_on_error,
 };
+static void irc_conn_handle_error (struct irc_conn *conn, struct error_info *err)
+{
+// XXX: notify user callback
+}
 err_t irc_conn_create (struct irc_conn **conn_ptr, struct sock_stream *sock, const struct irc_conn_callbacks *callbacks,
 void *cb_arg, struct error_info *err)
 {
 struct irc_conn *conn;
 // init state
 conn->callbacks = *callbacks;
 conn->cb_arg = cb_arg;
 // initialize command handlers
-STAILQ_INIT(&conn->handlers);
+irc_cmd_init(&conn->handlers);
 // add the core handlers
-if ((ERROR_CODE(err) = irc_conn_register_handler_chain(conn, _cmd_handlers, NULL)))
+if ((ERROR_CODE(err) = irc_conn_add_cmd_handlers(conn, _cmd_handlers, conn)))
 goto error;
 // create the line_proto, with our on_line handler
 if (line_proto_create(&conn->lp, sock, IRC_LINE_MAX * 1.5, &_lp_callbacks, conn, err))
 goto error;
 return ERROR_CODE(err);
 }
 void irc_conn_destroy (struct irc_conn *conn)
 {
-struct irc_cmd_chain *next = STAILQ_FIRST(&conn->handlers);
 // release the line_proto
 if (conn->lp)
 line_proto_release(conn->lp);
-// clean up any handler chains
+// free the command handlers
-while (next) {
+irc_cmd_free(&conn->handlers);
-struct irc_cmd_chain *node = next;
-// update next
-next = STAILQ_NEXT(node, node);
-// free
-free(node);
-}
 // free the irc_conn itself
 free(conn);
 }
-err_t irc_conn_register_handler_chain (struct irc_conn *conn, struct irc_cmd_handler *handlers, void *arg)
+err_t irc_conn_add_cmd_handlers (struct irc_conn *conn, struct irc_cmd_handler *handlers, void *arg)
 {
-struct irc_cmd_chain *item;
+// use the irc_cmd stuff
+return irc_cmd_add(&conn->handlers, handlers, arg);
-// allocate the chain item
-if ((item = calloc(1, sizeof(*item))) == NULL)
-return ERR_CALLOC;
-// store
-item->handlers = handlers;
-item->arg = arg;
-// append
-STAILQ_INSERT_TAIL(&conn->handlers, item, node);
-// ok
-return SUCCESS;
 }
 err_t irc_conn_register (struct irc_conn *conn, const struct irc_conn_register_info *info)
 {
 err_t err;

changeset 37	4fe4a3c4496e
parent 33	e5139b339b18
child 39	a4891d71aca9