evirc: src/irc_net.c@2780a73c71f3 (annotated)

25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	1	#include "irc_net.h"
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	2	#include "log.h"
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	3
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	4	#include <stdlib.h>
26 aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	5	#include <string.h>
25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	6
72 43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	7	const char* irc_net_name (struct irc_net *net)
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	8	{
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	9	return net->info.network;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	10	}
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	11
46 0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	12	/**
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	13	* Something happaned which caused our irc_conn to fail. Destroy it, and recover. XXX: somehow
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	14	*/
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	15	static void irc_net_error (struct irc_net net, struct error_info err)
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	16	{
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	17	struct irc_chan *chan = NULL;
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	18
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	19	// log an error
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	20	log_err_info(err, "irc_conn failed");
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	21
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	22	// destroy connection and set NULL
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	23	irc_conn_destroy(net->conn);
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	24	net->conn = NULL;
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	25
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	26	// update channel state
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	27	TAILQ_FOREACH(chan, &net->channels, node) {
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	28	// XXX: notify channel somehow
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	29	}
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	30
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	31	// XXX: reconnect?
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	32	}
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	33
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	34	/**
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	35	* Our irc_conn has registered. Join our channels
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	36	*/
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	37	static void irc_net_conn_registered (struct irc_conn conn, void arg)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	38	{
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	39	struct irc_net *net = arg;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	40	struct irc_chan *chan = NULL;
46 0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	41	struct error_info err;
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	42
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	43	(void) conn;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	44
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	45	// join our channels
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	46	TAILQ_FOREACH(chan, &net->channels, node) {
46 0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	47	if ((ERROR_CODE(&err) = irc_chan_join(chan)))
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	48	// XXX: this should be some kind of irc_chan_error instead
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	49	irc_net_error(net, &err);
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	50	}
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	51	}
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	52
46 0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	53	/**
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	54	* Our irc_conn has spontaneously failed, destroy it
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	55	*/
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: 44 diff changeset	56	static void irc_net_conn_error (struct irc_conn conn, struct error_info err, void *arg)
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: 44 diff changeset	57	{
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: 44 diff changeset	58	struct irc_net *net = arg;
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: 44 diff changeset	59
46 0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	60	(void) conn;
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	61
0c13bca53ae1 add irc_net_error, and improve test_irc_net to cover it as well Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	62	irc_net_error(net, err);
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: 44 diff changeset	63	}
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: 44 diff changeset	64
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	65	/**
48 4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	66	* Our irc_conn has quit succesfully
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	67	*/
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	68	static void irc_net_conn_quit (struct irc_conn conn, void arg)
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	69	{
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	70	struct irc_net *net = arg;
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	71
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	72	// clean up the conn
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	73	irc_conn_destroy(conn);
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	74	net->conn = NULL;
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	75
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	76	// XXX: notify user
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	77	}
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	78
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	79	/**
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	80	* Our irc_conn_callbacks list
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	81	*/
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	82	struct irc_conn_callbacks _conn_callbacks = {
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	83	.on_registered = &irc_net_conn_registered,
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: 44 diff changeset	84	.on_error = &irc_net_conn_error,
48 4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	85	.on_quit = &irc_net_conn_quit,
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	86	};
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	87
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: 28 diff changeset	88	/**
38 0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	89	* Propagate the command to the appropriate irc_chan based on the given name
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	90	*/
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	91	static void irc_net_propagate_chan (struct irc_net net, const struct irc_line line, const char *channel)
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: 28 diff changeset	92	{
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: 28 diff changeset	93	struct irc_chan *chan;
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: 28 diff changeset	94
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: 28 diff changeset	95	// look up channel
38 0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	96	if ((chan = irc_net_get_chan(net, channel)) == NULL) {
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	97	log_warn("unknown channel: %s", channel);
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: 28 diff changeset	98	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: 28 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: 28 diff changeset	100
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: 28 diff changeset	101	// propagate
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: 28 diff changeset	102	irc_cmd_invoke(&chan->handlers, line);
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: 28 diff changeset	103	}
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: 28 diff changeset	104
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: 28 diff changeset	105	/**
38 0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	106	* Propagate line to irc_chan based on args[0]
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	107	*/
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	108	static void irc_net_on_chan0 (const struct irc_line line, void arg)
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	109	{
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	110	struct irc_net *net = arg;
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	111
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	112	irc_net_propagate_chan(net, line, line->args[0]);
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	113	}
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	114
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	115	/**
72 43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	116	* Propagate line to irc_chan based on args[1]
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	117	*/
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	118	static void irc_net_on_chan1 (const struct irc_line line, void arg)
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	119	{
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	120	struct irc_net *net = arg;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	121
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	122	irc_net_propagate_chan(net, line, line->args[1]);
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	123	}
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	124
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	125	/**
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	126	* Propagate line to irc_chan based on args[2]
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	127	*/
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	128	static void irc_net_on_chan2 (const struct irc_line line, void arg)
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	129	{
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	130	struct irc_net *net = arg;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	131
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	132	irc_net_propagate_chan(net, line, line->args[2]);
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	133	}
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	134
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	135	/**
68 591a574f390e add FindEvsql/FindLibPQ cmake modules and irc_log.sql definition, and implement logging of JOIN, PART, MODE, TOPIC, KICK, PRIVMSG, NOTICE and OPEN messages Tero Marttila <terom@fixme.fi> parents: 63 diff changeset	136	* :nm (PRIVMSG\|NOTICE) <target> <message>
38 0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	137	*
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	138	* Either propagate to channel if found, otherwise handle as a privmsg
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	139	*/
68 591a574f390e add FindEvsql/FindLibPQ cmake modules and irc_log.sql definition, and implement logging of JOIN, PART, MODE, TOPIC, KICK, PRIVMSG, NOTICE and OPEN messages Tero Marttila <terom@fixme.fi> parents: 63 diff changeset	140	static void irc_net_on_msg (const struct irc_line line, void arg)
38 0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	141	{
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	142	struct irc_net *net = arg;
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	143
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	144	// XXX: does two lookups
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	145	if (irc_net_get_chan(net, line->args[0])) {
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	146	// short-circuit to on_chan0
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	147	irc_net_on_chan0(line, arg);
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	148
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	149	} else {
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	150	// XXX: callbacks for privmsgs
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	151
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	152	}
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	153	}
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	154
0c2e0cb46c3a implement irc_chan_callbacks, and add on_msg Tero Marttila <terom@fixme.fi> parents: 37 diff changeset	155	/**
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: 28 diff changeset	156	* Our irc_cmd handler list
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: 28 diff changeset	157	*/
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: 28 diff changeset	158	static struct irc_cmd_handler _cmd_handlers[] = {
72 43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	159	{ "JOIN", &irc_net_on_chan0 },
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	160	{ "PART", &irc_net_on_chan0 },
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	161	{ "MODE", &irc_net_on_chan0 },
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	162	{ "TOPIC", &irc_net_on_chan0 },
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	163	{ "KICK", &irc_net_on_chan0 },
68 591a574f390e add FindEvsql/FindLibPQ cmake modules and irc_log.sql definition, and implement logging of JOIN, PART, MODE, TOPIC, KICK, PRIVMSG, NOTICE and OPEN messages Tero Marttila <terom@fixme.fi> parents: 63 diff changeset	164
72 43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	165	{ "PRIVMSG", &irc_net_on_msg },
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	166	{ "NOTICE", &irc_net_on_msg },
68 591a574f390e add FindEvsql/FindLibPQ cmake modules and irc_log.sql definition, and implement logging of JOIN, PART, MODE, TOPIC, KICK, PRIVMSG, NOTICE and OPEN messages Tero Marttila <terom@fixme.fi> parents: 63 diff changeset	167
591a574f390e add FindEvsql/FindLibPQ cmake modules and irc_log.sql definition, and implement logging of JOIN, PART, MODE, TOPIC, KICK, PRIVMSG, NOTICE and OPEN messages Tero Marttila <terom@fixme.fi> parents: 63 diff changeset	168	// XXX: NICK/QUIT
591a574f390e add FindEvsql/FindLibPQ cmake modules and irc_log.sql definition, and implement logging of JOIN, PART, MODE, TOPIC, KICK, PRIVMSG, NOTICE and OPEN messages Tero Marttila <terom@fixme.fi> parents: 63 diff changeset	169
72 43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	170	// numerics
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	171	{ IRC_RPL_NAMREPLY, &irc_net_on_chan2 },
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	172	{ IRC_RPL_ENDOFNAMES, &irc_net_on_chan1 },
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	173
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	174	{ NULL, NULL }
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: 28 diff changeset	175	};
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: 28 diff changeset	176
25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	177	err_t irc_net_create (struct irc_net *net_ptr, const struct irc_net_info info, struct error_info *err)
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	178	{
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	179	struct irc_net *net;
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	180	struct sock_stream *sock = NULL;
25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	181
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	182	// allocate
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	183	if ((net = calloc(1, sizeof(*net))) == NULL)
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	184	return SET_ERROR(err, ERR_CALLOC);
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	185
26 aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	186	// initialize
53 12d806823775 add irc_client module, plus nexus.h header Tero Marttila <terom@fixme.fi> parents: 48 diff changeset	187	net->info = *info;
26 aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	188	TAILQ_INIT(&net->channels);
72 43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	189	LIST_INIT(&net->users);
26 aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	190
44 6bd70113e1ed add irc_net test Tero Marttila <terom@fixme.fi> parents: 38 diff changeset	191	if (info->raw_sock) {
73 2780a73c71f3 add set_log_level function, and add --debug/--quiet options to test Tero Marttila <terom@fixme.fi> parents: 72 diff changeset	192	log_debug("connected using raw socket: %p", info->raw_sock);
44 6bd70113e1ed add irc_net test Tero Marttila <terom@fixme.fi> parents: 38 diff changeset	193
6bd70113e1ed add irc_net test Tero Marttila <terom@fixme.fi> parents: 38 diff changeset	194	sock = info->raw_sock;
6bd70113e1ed add irc_net test Tero Marttila <terom@fixme.fi> parents: 38 diff changeset	195
6bd70113e1ed add irc_net test Tero Marttila <terom@fixme.fi> parents: 38 diff changeset	196	} else if (info->use_ssl) {
73 2780a73c71f3 add set_log_level function, and add --debug/--quiet options to test Tero Marttila <terom@fixme.fi> parents: 72 diff changeset	197	log_debug("connecting to [%s]:%s using SSL", info->hostname, info->service);
25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	198
44 6bd70113e1ed add irc_net test Tero Marttila <terom@fixme.fi> parents: 38 diff changeset	199	// XXX: over-simplified blocking connect
25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	200	if (sock_ssl_connect(&sock, info->hostname, info->service, err))
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	201	goto error;
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	202
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	203	} else {
73 2780a73c71f3 add set_log_level function, and add --debug/--quiet options to test Tero Marttila <terom@fixme.fi> parents: 72 diff changeset	204	log_debug("connecting to [%s]:%s", info->hostname, info->service);
25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	205
44 6bd70113e1ed add irc_net test Tero Marttila <terom@fixme.fi> parents: 38 diff changeset	206	// XXX: over-simplified blocking connect
25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	207	if (sock_tcp_connect(&sock, info->hostname, info->service, err))
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	208	goto error;
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	209
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	210	}
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	211
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	212	// create the irc connection state
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	213	if (irc_conn_create(&net->conn, sock, &_conn_callbacks, net, err))
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	214	goto error;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 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: 28 diff changeset	216	// add our 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: 28 diff changeset	217	if ((ERROR_CODE(err) = irc_conn_add_cmd_handlers (net->conn, _cmd_handlers, net)))
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: 28 diff changeset	218	goto error;
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: 28 diff changeset	219
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	220	// register
73 2780a73c71f3 add set_log_level function, and add --debug/--quiet options to test Tero Marttila <terom@fixme.fi> parents: 72 diff changeset	221	log_debug("connected, registering");
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	222
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	223	if ((ERROR_CODE(err) = irc_conn_register(net->conn, &info->register_info)))
25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	224	goto error;
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	225
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	226	// ok
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	227	*net_ptr = net;
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	228
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	229	return SUCCESS;
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	230
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	231	error:
47 7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	232	if (sock && !net->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	233	// we need to clean up the socket ourself
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	234	sock_stream_release(sock);
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	235
47 7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	236	// cleanup main
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	237	irc_net_destroy(net);
25 56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	238
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	239	return ERROR_CODE(err);
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	240	}
56367df4ce5b add irc_net module, and fix Makefile CFLAGS, add -Wextra Tero Marttila <terom@fixme.fi> parents: diff changeset	241
47 7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	242	void irc_net_destroy (struct irc_net *net)
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	243	{
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	244	struct irc_chan next = TAILQ_FIRST(&net->channels), chan;
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	245
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	246	// our conn
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	247	if (net->conn)
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	248	irc_conn_destroy(net->conn);
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	249
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	250	// our channels
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	251	while (next) {
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	252	chan = next;
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	253	next = TAILQ_NEXT(chan, node);
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	254
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	255	irc_chan_destroy(chan);
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	256	}
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	257
72 43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	258	// XXX: our users
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	259
47 7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	260	// ourselves
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	261	free(net);
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	262	}
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 46 diff changeset	263
63 d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	264	err_t irc_net_add_chan (struct irc_net net, struct irc_chan chan_ptr, const struct irc_chan_info info, struct error_info *err)
26 aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	265	{
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	266	struct irc_chan *chan;
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	267
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	268	// create the new irc_chan struct
63 d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	269	if (irc_chan_create(&chan, net, info, err))
d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	270	return ERROR_CODE(err);
26 aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	271
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	272	// add to network list
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	273	TAILQ_INSERT_TAIL(&net->channels, chan, node);
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	274
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	275	// currently connected?
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	276	if (net->conn && net->conn->registered) {
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	277	// then join
63 d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	278	if ((ERROR_CODE(err) = irc_chan_join(chan)))
d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	279	return ERROR_CODE(err);
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 26 diff changeset	280	}
26 aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	281
63 d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	282	// ok
d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	283	if (chan_ptr)
d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	284	*chan_ptr = chan;
d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	285
d399a1d915a3 start reworking option-parsing, but --module/--config is still unimplemented Tero Marttila <terom@fixme.fi> parents: 53 diff changeset	286	return SUCCESS;
26 aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	287	}
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	288
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	289	struct irc_chan* irc_net_get_chan (struct irc_net net, const char channel)
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	290	{
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	291	struct irc_chan *chan = NULL;
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	292
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	293	// look for it...
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	294	TAILQ_FOREACH(chan, &net->channels, node) {
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	295	if (strcasecmp(chan->info.channel, channel) == 0)
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	296	// found it
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	297	return chan;
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	298	}
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	299
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	300	// no such channel
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	301	return NULL;
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	302	}
aec062af155d add irc_chan module Tero Marttila <terom@fixme.fi> parents: 25 diff changeset	303
72 43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	304	err_t irc_net_get_user (struct irc_net net, struct irc_user user_ptr, const char nickname)
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	305	{
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	306	struct irc_user *user = NULL;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	307	err_t err;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	308
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	309	// look for it...
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	310	LIST_FOREACH(user, &net->users, net_users) {
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	311	if (irc_cmp_nick(nickname, user->nickname) == 0) {
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	312	// found existing
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	313	*user_ptr = user;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	314
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	315	return SUCCESS;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	316	}
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	317	}
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	318
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	319	// create a new user struct
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	320	if ((err = irc_user_create(&user, net, nickname)))
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	321	return err;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	322
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	323	// add to our list
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	324	LIST_INSERT_HEAD(&net->users, user, net_users);
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	325
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	326	// ok
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	327	*user_ptr = user;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	328
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	329	return SUCCESS;
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	330	}
43084f103c2a add irc_user module for irc_chan to track users on a channel Tero Marttila <terom@fixme.fi> parents: 68 diff changeset	331
48 4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	332	err_t irc_net_quit (struct irc_net net, const char message)
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	333	{
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	334	if (!net->conn)
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	335	return ERR_IRC_NET_QUIT_STATE;
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	336
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	337	// send the QUIT message, and then we can wait for the reply
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	338	return irc_conn_QUIT(net->conn, message);
4841f4398fd2 add irc_net_quit and signal handling Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	339	}

author	Tero Marttila <terom@fixme.fi>
	Thu, 26 Mar 2009 22:03:20 +0200
changeset 73	2780a73c71f3
parent 72	43084f103c2a
child 74	11ec458d1cbf
permissions	-rw-r--r--