evirc: src/lib/line_proto.c@cefec18b8268 (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 {
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	13	/* The transport we read/write with */
6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	14	transport_t *transport;
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	15
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	16	/* The incoming/outgoing line buffer */
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	17	char in_buf, out_buf;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	18
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	19	/* Buffer size (same for both) */
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	20	size_t buf_len;
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	21
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	22	/* Offset of trailing data in buf */
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	23	size_t tail_offset;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	24
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	25	/* Length of trailing data in buf, if any */
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	26	size_t tail_len;
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	27
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	28	/* Amount of data in the out buffer */
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	29	size_t out_offset;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	30
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	31	/* Last error */
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	32	struct error_info err;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	33
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	34	/* Callback info */
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	35	struct line_proto_callbacks callbacks;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	36	void *cb_arg;
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	37	};
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	38
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	39	/**
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 41 diff changeset	40	* An error occured which we could not recover from; the line_proto should now be considered corrupt.
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	41	*
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 41 diff changeset	42	* Notify the user callback, which will probably call line_proto_release().
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	43	*/
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 41 diff changeset	44	static void line_proto_set_error (struct line_proto *lp)
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	45	{
47 7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	46	// copy error_info, as it might get free'd
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	47	struct error_info err = lp->err;
7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	48
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	49	// trigger callback
47 7d4094eb3117 add irc_net_destroy and fix code to be valgrind-clean on bin/test Tero Marttila <terom@fixme.fi> parents: 45 diff changeset	50	lp->callbacks.on_error(&err, lp->cb_arg);
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	51	}
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	52
e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	53	/**
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	54	* Our transport_callbacks::on_read handler
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	55	*/
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	56	static void line_proto_on_read (transport_t transport, void 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	57	{
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	58	struct line_proto *lp = arg;
17 5001564ac5fc irc_line implementation Tero Marttila <terom@fixme.fi> parents: 13 diff changeset	59	char *line;
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	60
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	61	(void) transport;
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	62
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	63	// sanity-check
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	64	assert(lp->tail_offset < lp->buf_len);
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	65
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	66	do {
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	67	// attempt to read a line
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	68	if (line_proto_recv(lp, &line))
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	69	// faaail
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 41 diff changeset	70	return line_proto_set_error(lp);
33 e5139b339b18 add line_proto_callbacks.on_error, although irc_conn doesn't pass it up Tero Marttila <terom@fixme.fi> parents: 32 diff changeset	71
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	72	// 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	73	if (line)
32 ae66e9ae4afb convert line_proto to use a line_proto_callbacks struct Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	74	lp->callbacks.on_line(line, lp->cb_arg);
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	75
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	76	} 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	77	}
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	78
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	79	/*
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	80	* Signal for write
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	81	*/
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	82	static void line_proto_on_write (transport_t transport, void arg)
19 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	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	85	int ret;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 22 diff changeset	86
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	87	(void) transport;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	88
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	89	// just flush
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	90	if ((ret = line_proto_flush(lp)) < 0)
6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	91	// faaail
45 71e65564afd2 remove irc_chan.state, modify irc_chan_callbacks.on_msg to take a irc_nm, improve error handling a bit further (up to irc_net now) Tero Marttila <terom@fixme.fi> parents: 41 diff changeset	92	return line_proto_set_error(lp);
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	93	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	94
168 a58ad50911fc refactor test.c into tests/* Tero Marttila <terom@fixme.fi> parents: 160 diff changeset	95	// XXX: implement on_error!
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	96	static const struct transport_callbacks line_proto_transport_callbacks = {
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	97	.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	98	.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	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
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	101	err_t line_proto_create (struct line_proto *lp_ptr, transport_t transport, size_t buf_size,
6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	102	const struct line_proto_callbacks callbacks, void cb_arg, error_t *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	103	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	104	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	105
160 4f8dc89d7cbb fix line_proto bugs Tero Marttila <terom@fixme.fi> parents: 157 diff changeset	106	// alloc
4f8dc89d7cbb fix line_proto bugs Tero Marttila <terom@fixme.fi> parents: 157 diff changeset	107	if ((lp = calloc(1, sizeof(*lp))) == NULL)
4f8dc89d7cbb fix line_proto bugs Tero Marttila <terom@fixme.fi> parents: 157 diff changeset	108	return SET_ERROR(err, ERR_CALLOC);
4f8dc89d7cbb fix line_proto bugs Tero Marttila <terom@fixme.fi> parents: 157 diff changeset	109
157 1e5674d0eec4 fixed fifo Tero Marttila <terom@fixme.fi> parents: 156 diff changeset	110	// store
1e5674d0eec4 fixed fifo Tero Marttila <terom@fixme.fi> parents: 156 diff changeset	111	lp->transport = transport;
1e5674d0eec4 fixed fifo Tero Marttila <terom@fixme.fi> parents: 156 diff changeset	112	lp->buf_len = buf_size;
1e5674d0eec4 fixed fifo Tero Marttila <terom@fixme.fi> parents: 156 diff changeset	113	lp->callbacks = *callbacks;
1e5674d0eec4 fixed fifo Tero Marttila <terom@fixme.fi> parents: 156 diff changeset	114	lp->cb_arg = cb_arg;
1e5674d0eec4 fixed fifo Tero Marttila <terom@fixme.fi> parents: 156 diff changeset	115
160 4f8dc89d7cbb fix line_proto bugs Tero Marttila <terom@fixme.fi> parents: 157 diff changeset	116	// allocate buffers
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	117	if (
160 4f8dc89d7cbb fix line_proto bugs Tero Marttila <terom@fixme.fi> parents: 157 diff changeset	118	(lp->in_buf = malloc(buf_size)) == NULL
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	119	\|\| (lp->out_buf = malloc(buf_size)) == NULL
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	120	)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	121	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	122
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	123	// setup the transport
6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	124	transport_set_callbacks(transport, &line_proto_transport_callbacks, lp);
6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	125
6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	126	if ((ERROR_CODE(err) = transport_events(transport, TRANSPORT_READ \| TRANSPORT_WRITE)))
6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	127	goto error;
8 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
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	130	*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	131
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	132	return SUCCESS;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	133
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	134	error:
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	135	// cleanup the lp
160 4f8dc89d7cbb fix line_proto bugs Tero Marttila <terom@fixme.fi> parents: 157 diff changeset	136	line_proto_destroy(lp);
20 d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	137
d9c4c2980a0d irc_conn PING/PONG code, and line_proto fixups Tero Marttila <terom@fixme.fi> parents: 19 diff changeset	138	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	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	/*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	142	* 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	143	* 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	144	* (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	145	*
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	146	* 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	147	* 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	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	*/
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	150	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	151	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	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	// 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	154	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	155	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	156
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	157	// 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	158	for (i = *hint; i < len; i++) {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	159	// match this + next char?
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	160	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	161	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	162	break;
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	163
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	164	} else if (buf[i] == '\n') {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	165	next = i + 1;
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	166	break;
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	167	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	168	}
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	169
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	170	// searched the whole buffer?
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	171	if (i >= len) {
ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	172	// 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	173	*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	174	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	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
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	177	// 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	178	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	179
13 ca16f3a8f3b7 add support for \n line endings as well Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	180	// 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	181	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	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
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	184	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	185	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	186	// 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	187	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	188	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	189
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	190	// 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	191	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	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	// 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	194	if (lp->tail_offset) {
41 40f7aa051acb add line_proto test, enhance others Tero Marttila <terom@fixme.fi> parents: 33 diff changeset	195	// move to front, no-op if tail_len is zero
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	196	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	197
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	198	// reset
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_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	200	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	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
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	203	// 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	204	do {
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	205	// 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	206	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	207	// store a valid *line_ptr
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	208	*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	209
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	210	// 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	211	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	212	}
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	213
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	// 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	215	if (recv_offset >= lp->buf_len)
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	216	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	217
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	218	// otherwise, read more data
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	219	if ((ret = transport_read(lp->transport, lp->in_buf + recv_offset, lp->buf_len - recv_offset, &lp->err)) < 0)
6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	220	return ERROR_CODE(&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	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;
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	245	size_t len = strlen(line), ret_len;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	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)
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 20 diff changeset	249	return -ERR_LINE_TOO_LONG;
19 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
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	252	if ((ret = transport_write(lp->transport, line, len, &lp->err)) < 0)
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	253	return -ERROR_CODE(&lp->err);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	254
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	255	// length of the sent data
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	256	ret_len = ret;
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	257
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	258	// EAGAIN or partial?
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	259	if (ret_len < len) {
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	260	size_t trailing = len - ret_len;
19 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
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	267	memcpy(lp->out_buf, line + ret_len, trailing);
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	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
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	272	// buffered... transport should invoke on_write itself
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	273	return 1;
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	} else {
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	276	// ok, no buffering needed
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	277	return SUCCESS;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	278
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	}
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	int line_proto_flush (struct line_proto *lp)
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	int ret;
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	285	size_t ret_len;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	286
160 4f8dc89d7cbb fix line_proto bugs Tero Marttila <terom@fixme.fi> parents: 157 diff changeset	287	assert(lp->out_offset);
4f8dc89d7cbb fix line_proto bugs Tero Marttila <terom@fixme.fi> parents: 157 diff changeset	288
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	289	// try and write the line
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	290	if ((ret = transport_write(lp->transport, lp->out_buf, lp->out_offset, &lp->err)) < 0)
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	291	return -ERROR_CODE(&lp->err);
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	292
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	293	ret_len = ret;
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	294
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	295	// empty now?
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	296	if (ret_len == lp->out_offset) {
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	297	lp->out_offset = 0;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	298
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	299	return SUCCESS;
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	300	}
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	301
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	302	// partial?
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	303	if (ret_len > 0) {
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	304	size_t remaining = lp->out_offset - ret_len;
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	305
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	306	// move the rest up
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	307	memmove(lp->out_buf, lp->out_buf + ret_len, remaining);
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	308
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	309	// update offset
8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	310	lp->out_offset = remaining;
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
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	313	// ok
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	314	return 1;
18 dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	315	}
dedf137b504f add initial irc_conn code that can register Tero Marttila <terom@fixme.fi> parents: 17 diff changeset	316
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	317	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	318	{
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: diff changeset	319	// 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	320	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	321	}
19 8c80580ccde9 improve line_proto output buffering slightly Tero Marttila <terom@fixme.fi> parents: 18 diff changeset	322
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	323	void line_proto_destroy (struct line_proto *lp)
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	324	{
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	325	// free buffers
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	326	free(lp->in_buf);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	327	free(lp->out_buf);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	328
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	329	// socket?
156 6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	330	if (lp->transport)
6534a4ac957b add transport/sock/line_proto/etc code compiles Tero Marttila <terom@fixme.fi> parents: 47 diff changeset	331	transport_destroy(lp->transport);
28 9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	332
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	333	// free the state itself
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	334	free(lp);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	335	}
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	336

author	Tero Marttila <terom@fixme.fi>
	Thu, 28 May 2009 01:17:36 +0300
branch	new-lib-errors
changeset 219	cefec18b8268
parent 168	src/line_proto.c@a58ad50911fc
permissions	-rw-r--r--