evirc: src/line_proto.c@8c80580ccde9 (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"
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	3
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	4	#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	5	#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	6	#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	7
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	8	#include <err.h>
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	9
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	10	/*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	11	* 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	12	*/
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	13	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	14	/* 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	15	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	16
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	17	/* The incoming/outgoing line buffer */
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	18	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	19
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	20	/* 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	21	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	22
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	23	/* 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	24	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	25
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	26	/* 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	27	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	28
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	29	/* Amount of data in the out buffer */
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	30	size_t out_offset;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	31
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	32	/* 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	33	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	34
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	/* 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	36	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	37	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	38	};
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	39
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	40	// 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	41	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	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	/*
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	* 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	45	*/
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	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	47	{
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	48	struct line_proto *lp = arg;
17 5001564ac5fc irc_line implementation Tero Marttila <terom@fixme.fi> parents: 13 diff changeset	49	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	50
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	51	// 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	52	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	53
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	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	55	// attempt to read a line
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	56	if (line_proto_recv(lp, &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	57	// XXX: fail
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	58	errx(1, "line_proto_recv: %s", error_msg(&lp->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	59
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	// 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	61	if (line)
11 14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	62	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	63
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	} 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	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	// 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	67	if (line_proto_schedule_events(lp, EV_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	68	errx(1, "line_proto_schedule_events: %s", error_msg(&lp->err));
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	69	}
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	/*
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	72	* Signal for write
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	73	*/
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	74	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	75	{
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	76	struct line_proto *lp = arg;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	77	err_t err;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	78
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	79	// just flush
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	80	if ((err = line_proto_flush(lp)) < 0)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	81	errx(1, "line_proto_flush: %s", error_name(err));
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	82	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	83
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	84	/*
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	85	* 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	86	*/
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	87	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	88	{
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	// 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	90	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	91	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	92
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	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	94	}
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	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	97	.on_read = &line_proto_on_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	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
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	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	101	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	102	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	103	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	104
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	105	// allocate struct and buffers
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	106	if (
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	107	(lp = calloc(1, sizeof(*lp))) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	108	\|\| (lp->in_buf = malloc(buf_size)) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	109	\|\| (lp->out_buf = malloc(buf_size)) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	110	)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	111	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	112
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	113	// store
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	114	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	115	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	116	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	117	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	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	// initialize event-based stuff
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	120	if (
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	121	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	122	\|\| 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	123	)
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	124	return ERROR_CODE(&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	125
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	126	// return
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	127	*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	128
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	129	return SUCCESS;
19 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	error:
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	132	if (lp) {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	133	free(lp->in_buf);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	134	free(lp->out_buf);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	135	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	136
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	137	free(lp);
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	138	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	139
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	140	/*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	141	* 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	142	* 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	143	* (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	144	*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	145	* 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	146	* 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	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	int _parse_line (char buf, size_t len, size_t hint) {
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	150	int 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	151
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	152	// 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	153	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	154	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	155
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	156	// 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	157	for (i = *hint; i < len; i++) {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	158	// match this + next char?
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	159	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	160	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	161	break;
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	162
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	163	} else if (buf[i] == '\n') {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	164	next = i + 1;
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	165	break;
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	166	}
8 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
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	169	// searched the whole buffer?
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	170	if (i >= len) {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	171	// 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	172	*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	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	}
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	// 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	177	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	178
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	179	// 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	180	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	181	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	182
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	183	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	184	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	185	// 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	186	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	187	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	188
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	189	// 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	190	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	191
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	192	// 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	193	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	194	// move to front
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	195	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	196
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	197	// reset
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	198	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	199	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	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
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	202	// 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	203	do {
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	204	// 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	205	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	206	// store a valid *line_ptr
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	207	*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	208
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	209	// 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	210	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	211	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	212
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	213	// 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	214	if (recv_offset >= lp->buf_len)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	215	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	216
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	217	// otherwise, read more data
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	218	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	219	// 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	220	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	221
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	222	// 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	223	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	224	// 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	225	*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	226	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	227	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	228
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	229	// 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	230	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	231
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	232	} 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	233
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	234	// 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	235	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	236	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	237
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	238	// ok
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	239	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	240	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	241
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	242	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	243	{
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	244	int ret;
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	245	size_t len = strlen(line);
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	246
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	247	// drop line if we already have output buffered
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	248	if (lp->out_offset)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	249	return -ERR_WRITE_EOF;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	250
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	251	// try and write the line
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	252	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	253	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	254
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	255	return -ERROR_CODE(&lp->err);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	256	}
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	257
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	258	// EAGAIN or partial?
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	259	if (ret < len) {
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	260	size_t trailing = len - ret;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	261
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	262	// ensure it's not waaaay too long
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	263	if (trailing > lp->buf_len)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	264	return -ERR_LINE_TOO_LONG;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	265
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	266	// copy remaining portion to buffer
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	267	memcpy(lp->out_buf, line + ret, trailing);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	268
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	269	// update offset
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	270	lp->out_offset = trailing;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	271
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	272	// register for EV_WRITE
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	273	line_proto_schedule_events(lp, EV_READ \| EV_WRITE);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	274
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	275	// buffered...
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	276	return 1;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	277
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	278	} else {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	279	// ok, no buffering needed
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	280	return SUCCESS;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	281
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	282	}
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
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	285	int line_proto_flush (struct line_proto *lp)
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	int ret;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	288
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	289	// try and write the line
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	290	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	291	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	292
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	293	return -ERROR_CODE(&lp->err);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	294	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	295
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	296	// empty now?
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	297	if (ret == lp->out_offset) {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	298	lp->out_offset = 0;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	299
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	300	return SUCCESS;
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
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	303	// partial?
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	304	if (ret > 0) {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	305	size_t remaining = lp->out_offset - ret;
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	// move the rest up
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	308	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	309
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	310	// update offset
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	311	lp->out_offset = remaining;
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
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	314	// register for EV_WRITE
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	315	line_proto_schedule_events(lp, EV_READ \| EV_WRITE);
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	316
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	317	// ok
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	318	return 1;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	319	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	320
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	321	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	322	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	323	// 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	324	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	325	}
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	326

author	Tero Marttila <terom@fixme.fi>
	Sat, 28 Feb 2009 23:48:34 +0200
changeset 19	8c80580ccde9
parent 18	dedf137b504f
child 20	d9c4c2980a0d
permissions	-rw-r--r--