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

8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	1
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	2	#include "line_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	3	#include "log.h"
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	4
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	5	#include <string.h>
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	6	#include <stdlib.h>
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	7	#include <assert.h>
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	8
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	9	/*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	10	* Our state
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	11	*/
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	12	struct line_proto {
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	13	/* The sock_stream we read/write with */
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	14	struct sock_stream *sock;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	15
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	16	/* The incoming/outgoing line buffer */
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	17	char in_buf, out_buf;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	18
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	19	/* Buffer size (same for both) */
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	20	size_t buf_len;
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	21
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	22	/* Offset of trailing data in buf */
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	23	size_t tail_offset;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	24
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	25	/* Length of trailing data in buf, if any */
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	26	size_t tail_len;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	27
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	28	/* Amount of data in the out buffer */
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	29	size_t out_offset;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	30
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	31	/* Last error */
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	32	struct error_info err;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	33
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	34	/* Callback info */
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	35	struct line_proto_callbacks callbacks;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	36	void *cb_arg;
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	37	};
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	38
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	39	// function prototypes
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	40	static err_t line_proto_schedule_events (struct line_proto *lp, short what);
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	41
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	42	/**
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: 41 diff changeset	43	* An error occured which we could not recover from; the line_proto should now be considered corrupt.
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	44	*
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: 41 diff changeset	45	* Notify the user callback, which will probably call line_proto_release().
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	46	*/
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: 41 diff changeset	47	static void line_proto_set_error (struct line_proto *lp)
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	48	{
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	49	// trigger callback
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	50	lp->callbacks.on_error(&lp->err, lp->cb_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	51	}
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	52
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	53	/**
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	54	* Our sock_stream on_read handler
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	55	*/
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	56	static void line_proto_on_read (struct sock_stream sock, void arg)
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	57	{
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	58	struct line_proto *lp = arg;
17 5001564ac5fc irc_line implementation Tero Marttila <terom@fixme.fi> parents: 13 diff changeset	59	char *line;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	60
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	61	(void) sock;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	62
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	63	// sanity-check
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	64	assert(lp->tail_offset < lp->buf_len);
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	65
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	66	do {
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	67	// attempt to read a 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	68	if (line_proto_recv(lp, &line)) {
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	69	// faaail
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: 41 diff changeset	70	return line_proto_set_error(lp);
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	71	}
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	72
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	73	// got a line?
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	74	if (line)
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	75	lp->callbacks.on_line(line, lp->cb_arg);
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	76
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	77	} while (line);
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	78
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	79	// reschedule
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	80	if (line_proto_schedule_events(lp, EV_READ))
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: 41 diff changeset	81	line_proto_set_error(lp);
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	82	}
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	83
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	84	/*
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	85	* Signal for write
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	86	*/
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	87	static void line_proto_on_write (struct sock_stream sock, void arg)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	88	{
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	89	struct line_proto *lp = arg;
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	90	int ret;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	91
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	92	(void) sock;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	93
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	94	// just flush
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	95	if ((ret = line_proto_flush(lp)) < 0) {
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	96	// faaaail
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	97	SET_ERROR(&lp->err, -ret);
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	98
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: 41 diff changeset	99	return line_proto_set_error(lp);
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	100	}
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	101	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	102
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	103	/*
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	104	* Schedule our sock_stream callback
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	105	*/
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	106	static err_t line_proto_schedule_events (struct line_proto *lp, short what)
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	107	{
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	108	// just use sock_stream's interface
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	109	if (sock_stream_event_enable(lp->sock, what))
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	110	RETURN_SET_ERROR_INFO(&lp->err, sock_stream_error(lp->sock));
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	111
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	112	return SUCCESS;
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	113	}
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	114
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	115	struct sock_stream_callbacks line_proto_sock_stream_callbacks = {
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	116	.on_read = &line_proto_on_read,
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	117	.on_write = &line_proto_on_write,
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	118	};
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	119
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	120	err_t line_proto_create (struct line_proto *lp_ptr, struct sock_stream sock, size_t buf_size,
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	121	const struct line_proto_callbacks callbacks, void cb_arg, struct error_info *err)
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	122	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	123	struct line_proto *lp;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	124
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	125	// allocate struct and buffers
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	126	if (
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	127	(lp = calloc(1, sizeof(*lp))) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	128	\|\| (lp->in_buf = malloc(buf_size)) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	129	\|\| (lp->out_buf = malloc(buf_size)) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	130	)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	131	JUMP_SET_ERROR(err, ERR_CALLOC);
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	132
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	133	// store
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	134	lp->sock = sock;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	135	lp->buf_len = buf_size;
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	136	lp->callbacks = *callbacks;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	137	lp->cb_arg = cb_arg;
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	138
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	139	// initialize event-based stuff
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	140	if (
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	141	sock_stream_event_init(sock, &line_proto_sock_stream_callbacks, lp)
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	142	\|\| line_proto_schedule_events(lp, EV_READ)
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	143	)
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	144	JUMP_SET_ERROR_INFO(err, &lp->err);
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	145
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	146	// return
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	147	*lp_ptr = lp;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	148
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	149	return SUCCESS;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	150
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	151	error:
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	152	// cleanup the 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	153	if (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	154	line_proto_release(lp);
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	155
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	156	return ERROR_CODE(err);
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	157	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	158
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	159	/*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	160	* This looks for a full '\r\n' terminated line at the beginning of the given buffer. If found, the \r\n will be
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	161	* replaced with a '\0', and the offset to the beginning of the next line returned. If not found, zero is returned
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	162	* (which is never a valid next-line offset).
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	163	*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	164	* The given \a hint is an hint as to the offset at which to start scanning, used for incremental invocations of this
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	165	* on the same buffer.
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	166	*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	167	*/
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	168	int _parse_line (char buf, size_t len, size_t hint) {
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	169	size_t i, next = 0;
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	170
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	171	// empty buffer -> nothing
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	172	if (len == 0)
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	173	return 0;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	174
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	175	// look for terminating '\r\n' or '\n' sequence
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	176	for (i = *hint; i < len; i++) {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	177	// match this + next char?
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	178	if (i < len - 1 && buf[i] == '\r' && buf[i + 1] == '\n') {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	179	next = i + 2;
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	180	break;
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	181
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	182	} else if (buf[i] == '\n') {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	183	next = i + 1;
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	184	break;
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	185	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	186	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	187
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	188	// searched the whole buffer?
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	189	if (i >= len) {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	190	// do continue one char back, to keep any \r
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	191	*hint = len - 1;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	192	return 0;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	193	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	194
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	195	// mangle the newline off
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	196	buf[i] = '\0';
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	197
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	198	// return offset to next line, as set in loop based on delim
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	199	return next;
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	200	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	201
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	202	err_t line_proto_recv (struct line_proto lp, char *line_ptr)
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	203	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	204	// offset to recv() new data into, offset to _parse_line hint, offset to next line from _parse_line
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	205	size_t recv_offset = 0, peek_offset = 0, next_offset = 0;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	206	int ret;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	207
12 4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	208	// adjust offset to beyond previous data (as will be moved next)
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	209	recv_offset = lp->tail_len;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	210
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	211	// move trailing data from previous line to front of buffer
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	212	if (lp->tail_offset) {
41 40f7aa051acb add line_proto test, enhance others Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	213	// move to front, no-op if tail_len is zero
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	214	memmove(lp->in_buf, lp->in_buf + lp->tail_offset, lp->tail_len);
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	215
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	216	// reset
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	217	lp->tail_offset = 0;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	218	lp->tail_len = 0;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	219	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	220
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	221	// readline loop
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	222	do {
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	223	// parse any line at the beginning of the buffer
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	224	if ((next_offset = _parse_line(lp->in_buf, recv_offset, &peek_offset)) > 0) {
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	225	// store a valid *line_ptr
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	226	*line_ptr = lp->in_buf;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	227
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	228	// exit loop and return
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	229	break;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	230	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	231
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	232	// ensure there's enough space for the rest of the line
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	233	if (recv_offset >= lp->buf_len)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	234	return ERR_LINE_TOO_LONG;
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	235
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	236	// otherwise, read more data
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	237	if ((ret = sock_stream_read(lp->sock, lp->in_buf + recv_offset, lp->buf_len - recv_offset)) < 0)
12 4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	238	// store and return NULL on errors
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	239	RETURN_SET_ERROR_INFO(&lp->err, sock_stream_error(lp->sock));
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	240
12 4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	241	// EAGAIN?
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	242	if (ret == 0) {
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	243	// return a NULL *line_ptr
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	244	*line_ptr = NULL;
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	245	break;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	246	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	247
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	248	// update recv_offset
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	249	recv_offset += ret;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	250
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	251	} while (1);
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	252
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	253	// update state for next call
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	254	lp->tail_offset = next_offset;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	255	lp->tail_len = recv_offset - next_offset;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	256
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	257	// ok
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	258	return SUCCESS;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	259	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	260
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	261	int line_proto_send (struct line_proto lp, const char line)
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	262	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	263	int ret;
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	264	size_t len = strlen(line), ret_len;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	265
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	266	// drop line if we already have output buffered
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	267	if (lp->out_offset)
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	268	return -ERR_LINE_TOO_LONG;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	269
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	270	// try and write the line
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	271	if ((ret = sock_stream_write(lp->sock, line, len)) < 0) {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	272	SET_ERROR_INFO(&lp->err, sock_stream_error(lp->sock));
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	273
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	274	return -ERROR_CODE(&lp->err);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	275	}
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	276
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	277	// length of the sent data
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	278	ret_len = ret;
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	279
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	280	// EAGAIN or partial?
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	281	if (ret_len < len) {
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	282	size_t trailing = len - ret_len;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	283
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	284	// ensure it's not waaaay too long
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	285	if (trailing > lp->buf_len)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	286	return -ERR_LINE_TOO_LONG;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	287
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	288	// copy remaining portion to buffer
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	289	memcpy(lp->out_buf, line + ret_len, trailing);
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	290
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	291	// update offset
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	292	lp->out_offset = trailing;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	293
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	294	// register for EV_WRITE
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	295	if (line_proto_schedule_events(lp, EV_READ \| EV_WRITE))
0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	296	return -ERROR_CODE(&lp->err);
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	297
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	298	// buffered...
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	299	return 1;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	300
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	301	} else {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	302	// ok, no buffering needed
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	303	return SUCCESS;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	304
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	305	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	306	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	307
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	308	int line_proto_flush (struct line_proto *lp)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	309	{
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	310	int ret;
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	311	size_t ret_len;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	312
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	313	// try and write the line
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	314	if ((ret = sock_stream_write(lp->sock, lp->out_buf, lp->out_offset)) < 0) {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	315	SET_ERROR_INFO(&lp->err, sock_stream_error(lp->sock));
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	316
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	317	return -ERROR_CODE(&lp->err);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	318	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	319
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	320	ret_len = ret;
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	321
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	322	// empty now?
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	323	if (ret_len == lp->out_offset) {
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	324	lp->out_offset = 0;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	325
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	326	return SUCCESS;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	327	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	328
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	329	// partial?
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	330	if (ret_len > 0) {
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	331	size_t remaining = lp->out_offset - ret_len;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	332
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	333	// move the rest up
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	334	memmove(lp->out_buf, lp->out_buf + ret_len, remaining);
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	335
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	336	// update offset
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	337	lp->out_offset = remaining;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	338	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	339
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	340	// register for EV_WRITE
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	341	if (line_proto_schedule_events(lp, EV_READ \| EV_WRITE))
0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	342	return -ERROR_CODE(&lp->err);
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	343
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	344	// ok
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	345	return 1;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	346	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	347
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	348	const struct error_info* line_proto_error (struct line_proto *lp)
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	349	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	350	// return pointer
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	351	return &lp->err;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	352	}
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	353
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	354	void line_proto_release (struct line_proto *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	355	{
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	356	// free buffers
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	357	free(lp->in_buf);
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	358	free(lp->out_buf);
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	359
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	360	// socket?
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	361	if (lp->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	362	sock_stream_release(lp->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	363
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	364	// free the state itself
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	365	free(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	366	}
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	367

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