evirc: src/irc_conn.c@96e0f703a58c (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
48 4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	139	// EOF after quit?
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	140	if (ERROR_CODE(err) == ERR_READ_EOF && conn->quitting) {
49 96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT Tero Marttila <terom@fixme.fi> parents: 48 diff changeset	141	// udpate states
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT Tero Marttila <terom@fixme.fi> parents: 48 diff changeset	142	conn->registered = false;
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT Tero Marttila <terom@fixme.fi> parents: 48 diff changeset	143	conn->quitting = false;
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT Tero Marttila <terom@fixme.fi> parents: 48 diff changeset	144	conn->quit = true;
96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT Tero Marttila <terom@fixme.fi> parents: 48 diff changeset	145
48 4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	146	// callback
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	147	if (conn->callbacks.on_quit)
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	148	conn->callbacks.on_quit(conn, conn->cb_arg);
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	149
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	150	} else {
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	151	// log
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	152	log_err_info(err, "line_proto error");
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	153
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	154	// trash ourselves
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	155	irc_conn_set_error(conn, err);
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	156	}
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	157	}
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	158
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 29 diff changeset	159	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	160	.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	161	.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	162	};
ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 29 diff changeset	163
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	164	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	165	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	166	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	167	struct irc_conn *conn;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	168
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	169	// alloc new state struct
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	170	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	171	return SET_ERROR(err, ERR_CALLOC);
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	172
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	173	// init state
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	174	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	175	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	176
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	177	// 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	178	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	179
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	180	// 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	181	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	182	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	183
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	184	// 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	185	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	186	goto error;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	187
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	188	// ok
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	189	*conn_ptr = conn;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	190
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	191	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	192
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	193	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	194	// 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	195	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	196
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	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	198	}
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	199
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	200	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	201	{
47 7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	202	// the line_proto
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	203	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	204	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	205
47 7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	206	// the 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	207	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	208
47 7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	209	// additional data
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	210	free(conn->nickname);
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	211
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	212	// the irc_conn itself
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	213	free(conn);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	214	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	215
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	216	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	217	{
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	218	// 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	219	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	220	}
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	221
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	222	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	223	{
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	224	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	225
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	226	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	227	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	228
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	229	// 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	230	if (
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	231	(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	232	\|\| (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	233	)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	234	return err;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	235
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	236	// set state
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	237	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	238
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	239	// ok
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	240	return SUCCESS;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	241	}
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 24 diff changeset	242
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	243	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	244	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	245	char line_buf[IRC_LINE_MAX + 2];
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	246	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	247	int ret;
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	// format
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	250	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	251	return err;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	252
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	253	// 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	254	log_debug("%s", line_buf);
18 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	// add CRLF
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	257	strcat(line_buf, "\r\n");
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	// send using line_proto
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	260	// 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	261	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	262	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	263
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	264	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	265	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	266	// NICK <nickname>
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	267	struct irc_line line = {
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	268	NULL, "NICK", { nickname, NULL }
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	269	};
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	270
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	271	return irc_conn_send(conn, &line);
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	272	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	273
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	274	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	275	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	276	// USER <user> <mode> <unused> <realname>
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	277	struct irc_line line = {
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	278	NULL, "USER", { username, "0", "*", realname, NULL }
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	279	};
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	280
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	281	return irc_conn_send(conn, &line);
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	282	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: diff changeset	283
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	284	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	285	{
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	286	// 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	287	// 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	288	struct irc_line line = {
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	289	NULL, "PONG", { target, NULL }
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	290	};
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	291
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	292	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	293	}
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	294
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	295	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	296	{
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	297	// 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	298	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	299	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	300	};
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	301
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	302	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	303	}
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	304
48 4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	305	err_t irc_conn_QUIT (struct irc_conn conn, const char message)
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	306	{
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	307	err_t err;
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	308
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	309	struct irc_line line = {
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	310	NULL, "QUIT", { message, NULL }
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	311	};
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	312
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	313	// state check
49 96e0f703a58c update irc_conn status, and add tests for irc_conn_QUIT Tero Marttila <terom@fixme.fi> parents: 48 diff changeset	314	if (conn->quitting \|\| conn->quit)
48 4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	315	return ERR_IRC_CONN_QUIT_STATE;
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	316
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	317	// try and send
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	318	if ((err = irc_conn_send(conn, &line)))
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	319	return err;
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	320
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	321	// mark as quitting
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	322	conn->quitting = true;
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	323
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	324	// ok
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	325	return SUCCESS;
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	326	}
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	327

author	Tero Marttila <terom@fixme.fi>
	Fri, 13 Mar 2009 00:01:12 +0200
changeset 49	96e0f703a58c
parent 48	4841f4398fd2
child 75	ff6272398d2e
permissions	-rw-r--r--