evirc: src/irc_conn.c@71e65564afd2 (annotated)

18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	1	#include "irc_conn.h"
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	2	#include "irc_cmd.h"
39 a4891d71aca9 rename irc_nm to irc_proto, and move numerics from irc_cmd.h Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	3	#include "irc_proto.h"
22 c339c020fd33 add missing irc_cmd.h, and modify line_proto/irc_conn to use log Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	4	#include "log.h"
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	5
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	6	#include <stdlib.h>
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	7	#include <string.h>
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	8
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	9	/**
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	10	* Handle an async error on this IRC connection that we could not recover from any other way, the protocol is now dead,
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	11	* and should be considered as destroyed after this returns.
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	12	*
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	13	* For conveniance, this returns the ERROR_CODE
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	14	*/
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	15	static err_t irc_conn_set_error (struct irc_conn conn, struct error_info err)
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	16	{
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	17	// notify user callback
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	18	conn->callbacks.on_error(conn, err, conn->cb_arg);
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	19
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	20	return ERROR_CODE(err);
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	21	}
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	22
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	23
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	24	/**
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	25	* Update irc_conn.nickname
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	26	*/
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	27	static err_t irc_conn_set_nickname (struct irc_conn conn, const char nickname)
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	28	{
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	29	struct error_info err;
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	30
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	31	// strdup
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	32	if ((conn->nickname = strdup(nickname)) == NULL) {
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	33	SET_ERROR(&err, ERR_STRDUP);
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	34
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	35	// notify
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	36	return irc_conn_set_error(conn, &err);
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	37	}
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	38
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	39	// ok
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	40	return SUCCESS;
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	41	}
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	42
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	43	/**
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	44	* 001 <nick> :Welcome to the Internet Relay Network <nick>!<user>@<host>
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	45	*/
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	46	static void on_RPL_WELCOME (const struct irc_line line, void arg)
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	47	{
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	48	struct irc_conn *conn = arg;
24 08a26d0b9afd fix ret/err bug in irc_conn_send, supress unused-argument warnings Tero Marttila <terom@fixme.fi> parents: 23 diff changeset	49
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	50	// update state
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	51	conn->registering = false;
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	52	conn->registered = true;
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	53
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	54	// set our real nickname from the message target
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	55	if (irc_conn_set_nickname(conn, line->args[0]))
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	56	return;
22 c339c020fd33 add missing irc_cmd.h, and modify line_proto/irc_conn to use log Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	57
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	58	// trigger callback
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	59	if (conn->callbacks.on_registered)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	60	conn->callbacks.on_registered(conn, conn->cb_arg);
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	61	}
0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	62
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	63	/**
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	64	* PING <server1> [ <server2> ]
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	65	*
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	66	* Send a 'PONG <server1>` reply right away.
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	67	*/
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	68	static void on_PING (const struct irc_line line, void arg)
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	69	{
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	70	struct irc_conn *conn = arg;
24 08a26d0b9afd fix ret/err bug in irc_conn_send, supress unused-argument warnings Tero Marttila <terom@fixme.fi> parents: 23 diff changeset	71
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	72	// just reply
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	73	irc_conn_PONG(conn, line->args[0]);
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	74	}
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	75
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	76	/**
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	77	* NICK <nickname>
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	78	*
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	79	* If the prefix is us, then update our nickname
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	80	*/
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	81	static void on_NICK (const struct irc_line line, void arg)
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	82	{
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	83	struct irc_conn *conn = arg;
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	84	char nickname[IRC_NICK_MAX];
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	85
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	86	// parse nickname, ignoring errors
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	87	if (irc_prefix_parse_nick(line->prefix, nickname)) {
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	88	log_warn("invalid prefix: %s", line->prefix);
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	89	return;
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	90	}
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	91
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	92	// ignore if it's not us
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	93	if (irc_cmp_nick(nickname, conn->nickname))
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	94	return;
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	95
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	96	// update our nickname
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	97	irc_conn_set_nickname(conn, nickname);
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	98	}
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	99
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	100	/**
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	101	* Our command handlers
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	102	*/
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	103	static struct irc_cmd_handler _cmd_handlers[] = {
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	104	{ IRC_RPL_WELCOME, &on_RPL_WELCOME },
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	105	{ "PING", &on_PING },
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	106	{ "NICK", &on_NICK },
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	107	{ NULL, NULL, },
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	108	};
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	109
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	110	/**
23 542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	111	* Incoming line handler
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	112	*/
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	113	void irc_conn_on_line (char line_buf, void arg)
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	114	{
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	115	struct irc_conn *conn = arg;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	116	struct irc_line line;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	117	int err;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	118
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	119	// log
22 c339c020fd33 add missing irc_cmd.h, and modify line_proto/irc_conn to use log Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	120	log_debug("%s", line_buf);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	121
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	122	// parse
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	123	if ((err = irc_line_parse(&line, line_buf))) {
23 542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	124	log_warn("invalid line: %s: %s\n", line_buf, error_name(err));
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	125	return;
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	126	}
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	127
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	128	// invoke command handlers
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	129	irc_cmd_invoke(&conn->handlers, &line);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	130	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	131
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	132	/**
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	133	* Transport failed
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	134	*/
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	135	void irc_conn_on_error (struct error_info err, void arg)
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	136	{
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	137	struct irc_conn *conn = arg;
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	138
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	139	// log
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	140	log_err_info(err, "line_proto error");
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	141
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	142	// trash ourselves
71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 39 diff changeset	143	irc_conn_set_error(conn, err);
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	144	}
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	145
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 29 diff changeset	146	static struct line_proto_callbacks _lp_callbacks = {
ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 29 diff changeset	147	.on_line = &irc_conn_on_line,
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	148	.on_error = &irc_conn_on_error,
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 29 diff changeset	149	};
ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 29 diff changeset	150
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	151	err_t irc_conn_create (struct irc_conn *conn_ptr, struct sock_stream sock, const struct irc_conn_callbacks *callbacks,
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	152	void cb_arg, struct error_info err)
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	153	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	154	struct irc_conn *conn;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	155
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	156	// alloc new state struct
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	157	if ((conn = calloc(1, sizeof(struct irc_conn))) == NULL)
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	158	return SET_ERROR(err, ERR_CALLOC);
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	159
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	160	// init state
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	161	conn->callbacks = *callbacks;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	162	conn->cb_arg = cb_arg;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	163
23 542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	164	// initialize command handlers
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	165	irc_cmd_init(&conn->handlers);
23 542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	166
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	167	// add the core handlers
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	168	if ((ERROR_CODE(err) = irc_conn_add_cmd_handlers(conn, _cmd_handlers, conn)))
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	169	goto error;
23 542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	170
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	171	// create the line_proto, with our on_line handler
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 29 diff changeset	172	if (line_proto_create(&conn->lp, sock, IRC_LINE_MAX * 1.5, &_lp_callbacks, conn, err))
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	173	goto error;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	174
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	175	// ok
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	176	*conn_ptr = conn;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	177
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	178	return SUCCESS;
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	179
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	180	error:
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	181	// release
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	182	irc_conn_destroy(conn);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	183
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	184	return ERROR_CODE(err);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	185	}
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	186
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	187	void irc_conn_destroy (struct irc_conn *conn)
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	188	{
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	189	// release the line_proto
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	190	if (conn->lp)
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	191	line_proto_release(conn->lp);
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	192
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	193	// free the command handlers
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	194	irc_cmd_free(&conn->handlers);
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	195
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	196	// free the irc_conn itself
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	197	free(conn);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	198	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	199
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	200	err_t irc_conn_add_cmd_handlers (struct irc_conn conn, struct irc_cmd_handler handlers, void *arg)
23 542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	201	{
37 4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	202	// use the irc_cmd stuff
4fe4a3c4496e change irc_chan.state into bool fields, move irc_cmd implementation from irc_conn.c into irc_cmd.c, remove irc_conn arg from irc_cmd_handler, add irc_conn.nickname tracking, and handle irc_chan JOINs Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	203	return irc_cmd_add(&conn->handlers, handlers, arg);
23 542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	204	}
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	205
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	206	err_t irc_conn_register (struct irc_conn conn, const struct irc_conn_register_info info)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	207	{
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	208	err_t err;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	209
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	210	// assert state
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	211	if (conn->registering \|\| conn->registered)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	212	// XXX: stupid error code
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	213	return ERR_IRC_CONN_REGISTER_STATE;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	214
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	215	// send the initial messages
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	216	if (
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	217	(err = irc_conn_NICK(conn, info->nickname))
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	218	\|\| (err = irc_conn_USER(conn, info->username, info->realname))
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	219	)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	220	return err;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	221
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	222	// set state
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	223	conn->registering = true;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	224
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	225	// ok
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	226	return SUCCESS;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	227	}
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	228
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	229	err_t irc_conn_send (struct irc_conn conn, const struct irc_line line)
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	230	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	231	char line_buf[IRC_LINE_MAX + 2];
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	232	err_t err;
24 08a26d0b9afd fix ret/err bug in irc_conn_send, supress unused-argument warnings Tero Marttila <terom@fixme.fi> parents: 23 diff changeset	233	int ret;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	234
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	235	// format
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	236	if ((err = irc_line_build(line, line_buf)))
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	237	return err;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	238
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	239	// log
22 c339c020fd33 add missing irc_cmd.h, and modify line_proto/irc_conn to use log Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	240	log_debug("%s", line_buf);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	241
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	242	// add CRLF
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	243	strcat(line_buf, "\r\n");
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	244
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	245	// send using line_proto
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	246	// XXX: ignore output-buffering
24 08a26d0b9afd fix ret/err bug in irc_conn_send, supress unused-argument warnings Tero Marttila <terom@fixme.fi> parents: 23 diff changeset	247	return (ret = line_proto_send(conn->lp, line_buf)) < 0 ? -ret : SUCCESS;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	248	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	249
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	250	err_t irc_conn_NICK (struct irc_conn conn, const char nickname)
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	251	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	252	// NICK <nickname>
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	253	struct irc_line line = {
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	254	NULL, "NICK", { nickname, NULL }
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	255	};
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	256
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	257	return irc_conn_send(conn, &line);
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	258	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	259
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	260	err_t irc_conn_USER (struct irc_conn conn, const char username, const char *realname)
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	261	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	262	// USER <user> <mode> <unused> <realname>
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	263	struct irc_line line = {
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	264	NULL, "USER", { username, "0", "*", realname, NULL }
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	265	};
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	266
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	267	return irc_conn_send(conn, &line);
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	268	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	269
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	270	err_t irc_conn_PONG (struct irc_conn conn, const char target)
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	271	{
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	272	// PONG <server> [ <server2> ]
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	273	// params are actually the wrong way around now, but nobody cares
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	274	struct irc_line line = {
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	275	NULL, "PONG", { target, NULL }
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	276	};
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	277
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	278	return irc_conn_send(conn, &line);
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	279	}
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	280
23 542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	281	err_t irc_conn_JOIN (struct irc_conn conn, const char channel)
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	282	{
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	283	// JOIN ( <channel> ( "," <channel> ) [ <key> ( "," <key> ) ] ) / "0"
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	284	struct irc_line line = {
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	285	NULL, "JOIN", { channel, NULL }
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	286	};
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	287
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	288	return irc_conn_send(conn, &line);
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	289	}
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	290

author	Tero Marttila <terom@fixme.fi>
	Thu, 12 Mar 2009 22:50:08 +0200
changeset 45	71e65564afd2
parent 39	a4891d71aca9
child 47	7d4094eb3117
permissions	-rw-r--r--