evirc: src/line_proto.c@e6639132bead (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 */
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	35	line_proto_read_cb cb_read;
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
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	42	/*
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	43	* 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	44	*/
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	45	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	46	{
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	47	struct line_proto *lp = arg;
17 5001564ac5fc irc_line implementation Tero Marttila <terom@fixme.fi> parents: 13 diff changeset	48	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	49
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	50	(void) sock;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	51
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	52	// 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	53	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	54
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	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	56	// attempt to read a line
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	57	if (line_proto_recv(lp, &line))
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	58	// XXX: un-fatalize
c339c020fd33 add missing irc_cmd.h, and modify line_proto/irc_conn to use log Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	59	FATAL_ERROR(&lp->err, "line_proto_recv");
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
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	61	// 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	62	if (line)
11 14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	63	lp->cb_read(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	64
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	} 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	66
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	// 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	68	if (line_proto_schedule_events(lp, EV_READ))
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	69	FATAL_ERROR(&lp->err, "line_proto_schedule_events");
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	70	}
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	71
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	72	/*
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	73	* Signal for write
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	74	*/
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	75	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	76	{
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	77	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	78	int ret;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	79
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	80	(void) sock;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	81
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	82	// just flush
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	83	if ((ret = line_proto_flush(lp)) < 0)
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	84	FATAL_ERR(-ret, "line_proto_flush");
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	85	}
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	/*
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	88	* 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	89	*/
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	90	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	91	{
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	92	// 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	93	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	94	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	95
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	96	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	97	}
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	98
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	99	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	100	.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	101	.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	102	};
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	103
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	err_t line_proto_create (struct line_proto *lp_ptr, struct sock_stream sock, size_t buf_size,
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	line_proto_read_cb cb_func, 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	106	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	107	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	108
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	109	// allocate struct and buffers
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	110	if (
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	111	(lp = calloc(1, sizeof(*lp))) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	112	\|\| (lp->in_buf = malloc(buf_size)) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	113	\|\| (lp->out_buf = malloc(buf_size)) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	114	)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	115	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	116
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	117	// store
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	118	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	119	lp->buf_len = buf_size;
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	lp->cb_read = cb_func;
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	121	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	122
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	123	// initialize event-based stuff
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	124	if (
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	125	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	126	\|\| 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	127	)
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	128	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	129
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	130	// return
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	131	*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	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	return SUCCESS;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	134
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	135	error:
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	136	if (lp) {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	137	free(lp->in_buf);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	138	free(lp->out_buf);
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	139
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	140	// XXX: handle sock init errors
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	141	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	142
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	143	free(lp);
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	144
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	145	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	146	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	147
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	* 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	150	* 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	151	* (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	152	*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	153	* 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	154	* 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	155	*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	156	*/
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	157	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	158	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	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	// 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	161	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	162	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	163
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	164	// 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	165	for (i = *hint; i < len; i++) {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	166	// match this + next char?
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	167	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	168	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	169	break;
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	170
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	171	} else if (buf[i] == '\n') {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	172	next = i + 1;
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	173	break;
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	174	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	175	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	176
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	177	// searched the whole buffer?
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	178	if (i >= len) {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	179	// 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	180	*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	181	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	182	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	183
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	184	// 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	185	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	186
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	187	// 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	188	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	189	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	190
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	191	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	192	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	193	// 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	194	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	195	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	196
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	197	// 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	198	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	199
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	200	// 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	201	if (lp->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	202	// move to front
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	203	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	204
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	205	// reset
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	206	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	207	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	208	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	209
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	210	// 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	211	do {
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	212	// 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	213	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	214	// store a valid *line_ptr
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	215	*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	216
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	217	// 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	218	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	219	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	220
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	221	// 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	222	if (recv_offset >= lp->buf_len)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	223	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	224
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	225	// otherwise, read more data
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	226	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	227	// 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	228	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	229
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	230	// 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	231	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	232	// 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	233	*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	234	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	235	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	236
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	237	// 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	238	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	239
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	240	} 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	241
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	242	// 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	243	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	244	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	245
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	246	// ok
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	247	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	248	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	249
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	250	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	251	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	252	int ret;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	253	size_t len = strlen(line);
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	254
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	255	// drop line if we already have output buffered
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	256	if (lp->out_offset)
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	257	return -ERR_LINE_TOO_LONG;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	258
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	259	// try and write the line
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	260	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	261	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	262
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	263	return -ERROR_CODE(&lp->err);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	264	}
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	265
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	266	// EAGAIN or partial?
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	267	if (ret < len) {
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	268	size_t trailing = len - ret;
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	// ensure it's not waaaay too long
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	271	if (trailing > lp->buf_len)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	272	return -ERR_LINE_TOO_LONG;
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	// copy remaining portion to buffer
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	275	memcpy(lp->out_buf, line + ret, trailing);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	276
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	277	// update offset
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	278	lp->out_offset = trailing;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	279
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	280	// register for EV_WRITE
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	281	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	282	return -ERROR_CODE(&lp->err);
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	// buffered...
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	285	return 1;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	286
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	287	} else {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	288	// ok, no buffering needed
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	289	return SUCCESS;
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	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	292	}
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	int line_proto_flush (struct line_proto *lp)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	295	{
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	296	int ret;
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	// try and write the line
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	299	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	300	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	301
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	302	return -ERROR_CODE(&lp->err);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	303	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	304
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	305	// empty now?
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	306	if (ret == lp->out_offset) {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	307	lp->out_offset = 0;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	308
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	309	return SUCCESS;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	310	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	311
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	312	// partial?
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	313	if (ret > 0) {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	314	size_t remaining = lp->out_offset - ret;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	315
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	316	// move the rest up
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	317	memmove(lp->out_buf, lp->out_buf + ret, remaining);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	318
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	319	// update offset
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	320	lp->out_offset = remaining;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	321	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	322
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	323	// register for EV_WRITE
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	324	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	325	return -ERROR_CODE(&lp->err);
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	326
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	327	// ok
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	328	return 1;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	329	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	330
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	331	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	332	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	333	// 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	334	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	335	}
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	336

author	Tero Marttila <terom@fixme.fi>
	Tue, 10 Mar 2009 01:46:09 +0200
changeset 27	e6639132bead
parent 22	c339c020fd33
child 28	9c1050bc8709
permissions	-rw-r--r--