evirc: src/sock_tcp.c@51678c7eae03 (annotated)

1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	1
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	2	#include "sock_tcp.h"
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	3
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	4	#include <stdlib.h>
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	5	#include <sys/types.h>
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	6	#include <sys/socket.h>
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	7	#include <unistd.h>
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 <fcntl.h>
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	9	#include <string.h>
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	10	#include <assert.h>
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	11
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	12	/*
11 14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	13	* Our basic socket event handler for driving our callbacks
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	14	*/
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	15	static void sock_tcp_event_handler (evutil_socket_t fd, short what, void *arg)
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	16	{
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	17	struct sock_tcp *sock = arg;
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	18
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	19	(void) fd;
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	20
11 14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	21	// invoke appropriate callback
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	22	sock_stream_invoke_callbacks(SOCK_TCP_BASE(sock), what);
11 14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	23	}
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	24
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	25	/*
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	26	* Our sock_stream_methods.read method
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	27	*/
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	28	static err_t sock_tcp_read (struct sock_stream base_sock, void buf, size_t *len)
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	29	{
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	30	struct sock_tcp *sock = SOCK_FROM_BASE(base_sock, struct sock_tcp);
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	31	int ret;
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	32
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	33	// read(), and detect non-EAGAIN or EOF
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	34	if ((ret = read(sock->fd, buf, *len)) < 0 && errno != 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	35	// unexpected error
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	36	RETURN_SET_ERROR_ERRNO(SOCK_TCP_ERR(sock), ERR_READ);
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	37
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	38	else 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	39	// EOF
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	40	return SET_ERROR(SOCK_TCP_ERR(sock), ERR_READ_EOF);
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	41
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	42
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	43	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	44	// EAGAIN -> zero bytes
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	45	*len = 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	46
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	47	} else {
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	48	// normal -> bytes read
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	49	*len = ret;
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	50	}
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	51
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	52	// ok
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	53	return SUCCESS;
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	54	}
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	55
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	56	/*
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	57	* Our sock_stream_methods.write method
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	58	*/
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	static err_t sock_tcp_write (struct sock_stream base_sock, const void buf, size_t *len)
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	60	{
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	61	struct sock_tcp *sock = SOCK_FROM_BASE(base_sock, struct sock_tcp);
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	62	int ret;
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	63
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	64	// write(), and detect non-EAGAIN or EOF
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	65	if ((ret = write(sock->fd, buf, *len)) < 0 && errno != 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	66	// unexpected error
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	67	RETURN_SET_ERROR_ERRNO(SOCK_TCP_ERR(sock), ERR_WRITE);
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	68
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	69	else 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	70	// EOF
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	71	return SET_ERROR(SOCK_TCP_ERR(sock), ERR_WRITE_EOF);
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	72
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	73
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	74	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	75	// EAGAIN -> zero bytes
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	76	*len = 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	77
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	78	} else {
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	79	// normal -> bytes read
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	80	*len = ret;
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	81	}
10 9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	82
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	83	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	84	}
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
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	static err_t sock_tcp_event_init (struct sock_stream *base_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	87	{
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	struct sock_tcp *sock = SOCK_FROM_BASE(base_sock, struct sock_tcp);
11 14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	89	err_t err;
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	90
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	91	// set nonblocking
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	92	if ((err = sock_tcp_set_nonblock(sock, 1)))
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	93	return err;
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	94
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	95	// add ourselves as the event handler
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	96	if ((err = sock_tcp_init_ev(sock, &sock_tcp_event_handler, sock)))
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	97	return 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	98
11 14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	99	// done
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	100	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	101	}
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	102
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	103	static err_t sock_tcp_event_enable (struct sock_stream *base_sock, short mask)
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	104	{
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	105	struct sock_tcp *sock = SOCK_FROM_BASE(base_sock, struct sock_tcp);
9fe218576d13 fix sock_stream read/write return value, move line buffer inside of line_proto, add some initial code for event-based non-blocking operation Tero Marttila <terom@fixme.fi> parents: 8 diff changeset	106
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	107	// implemented in sock_tcp_add_event
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	108	return sock_tcp_add_event(sock, mask);
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	109	}
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	110
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	111	static void sock_tcp_release (struct sock_stream *base_sock)
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	112	{
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	113	struct sock_tcp *sock = SOCK_FROM_BASE(base_sock, struct sock_tcp);
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	114
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	115	// close and free
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	116	sock_tcp_close(sock);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	117	sock_tcp_free(sock);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	118	}
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	119
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	120	/*
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	121	* Our sock_stream_type
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	122	*/
40 51678c7eae03 add sock_test module and some basic initial tests Tero Marttila <terom@fixme.fi> parents: 30 diff changeset	123	static struct sock_stream_type sock_tcp_type = {
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	124	.methods = {
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	125	.read = &sock_tcp_read,
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	126	.write = &sock_tcp_write,
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	127	.event_init = &sock_tcp_event_init,
e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	128	.event_enable = &sock_tcp_event_enable,
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	129	.release = &sock_tcp_release,
27 e6639132bead add irc_conn_callbacks, and delay irc_chan_join until on_registered Tero Marttila <terom@fixme.fi> parents: 21 diff changeset	130	},
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	131	};
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	132
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	133	err_t sock_tcp_alloc (struct sock_tcp **sock_ptr)
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	134	{
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	135	// alloc
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	136	if ((sock_ptr = calloc(1, sizeof(*sock_ptr))) == NULL)
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	137	return ERR_CALLOC;
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	138
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	139	// initialize base with sock_tcp_type
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	140	sock_stream_init(SOCK_TCP_BASE(*sock_ptr), &sock_tcp_type);
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	141
21 0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	142	// invalid fds are <0
0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	143	(*sock_ptr)->fd = -1;
0911d0b828d4 add basic log.c module Tero Marttila <terom@fixme.fi> parents: 12 diff changeset	144
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	145	// done
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	146	return SUCCESS;
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	147	}
a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	148
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	149	err_t sock_tcp_init_fd (struct sock_tcp *sock, int fd)
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	150	{
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	151	// valid fd
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	152	assert(fd >= 0);
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	153
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	154	// initialize
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	155	sock->fd = fd;
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	156
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	157	// done
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	158	return SUCCESS;
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	159	}
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	160
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	161	err_t sock_tcp_init_ev (struct sock_tcp sock, void (ev_cb)(evutil_socket_t, short, void ), void 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	162	{
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	163	// require valid fd
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	164	assert(sock->fd >= 0);
11 14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	165
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	166	// this is initialization
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	167	assert(sock->ev_read == NULL && sock->ev_write == NULL);
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	168
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	169	// create new event
11 14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	170	if ((sock->ev_read = event_new(_sock_stream_ctx.ev_base, sock->fd, EV_READ, ev_cb, cb_arg)) == NULL)
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	171	return SET_ERROR(SOCK_TCP_ERR(sock), ERR_EVENT_NEW);
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	172
14e79683c48c working event-based operation for sock_tcp Tero Marttila <terom@fixme.fi> parents: 10 diff changeset	173	if ((sock->ev_write = event_new(_sock_stream_ctx.ev_base, sock->fd, EV_WRITE, ev_cb, cb_arg)) == NULL)
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	174	return SET_ERROR(SOCK_TCP_ERR(sock), ERR_EVENT_NEW);
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	175
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	176	// ok
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	177	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	178	}
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	179
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	180	err_t sock_tcp_add_event (struct sock_tcp *sock, short mask)
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	181	{
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	182	// just add the appropraite events
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	183	if (mask & EV_READ && event_add(sock->ev_read, 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	184	return SET_ERROR(SOCK_TCP_ERR(sock), ERR_EVENT_ADD);
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	185
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	186	if (mask & EV_WRITE && event_add(sock->ev_write, 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	187	return SET_ERROR(SOCK_TCP_ERR(sock), ERR_EVENT_ADD);
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	188
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	// done
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	return SUCCESS;
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	191	}
4147fae232d9 update sock_stream_read/write semantics for EOF/EAGAIN, tentative event-based gnutls code Tero Marttila <terom@fixme.fi> parents: 11 diff changeset	192
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	193	err_t sock_tcp_init_connect (struct sock_tcp sock, const char hostname, const char *service)
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	194	{
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	195	struct addrinfo hints, res, r;
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	196	int ret;
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	197	struct error_info *err = SOCK_TCP_ERR(sock);
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	198
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	199	// zero error code
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	200	RESET_ERROR(err);
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	201
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	202	// hints
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	203	memset(&hints, 0, sizeof(hints));
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	204	hints.ai_family = AF_UNSPEC;
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	205	hints.ai_socktype = SOCK_STREAM;
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	206
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	207	// resolve
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	208	if ((ret = getaddrinfo(hostname, service, &hints, &res)))
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	209	RETURN_SET_ERROR_EXTRA(err, ERR_GETADDRINFO, ret);
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	210
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	211	// try each result in turn
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	212	for (r = res; r; r = r->ai_next) {
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	213	// create the socket
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	214	if ((sock->fd = socket(r->ai_family, r->ai_socktype, r->ai_protocol)) < 0) {
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	215	// remember error
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	216	SET_ERROR_ERRNO(err, ERR_SOCKET);
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	217
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	218	// skip to next one
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	219	continue;
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	220	}
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	221
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	222	// connect to remote address
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	223	if (connect(sock->fd, r->ai_addr, r->ai_addrlen)) {
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	224	// remember error
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	225	SET_ERROR_ERRNO(err, ERR_CONNECT);
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	226
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	227	// close/invalidate socket
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	228	close(sock->fd);
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	229	sock->fd = -1;
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	230
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	231	// skip to next one
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	232	continue;
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	233	}
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	234
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	235	// valid socket, use this
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	236	break;
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	237	}
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	238
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	239	// ensure we got some valid socket, else return last error code
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	240	if (sock->fd < 0) {
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	241	// did we hit some error?
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	242	if (IS_ERROR(err))
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	243	// return last error
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	244	return ERROR_CODE(err);
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	245
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	246	else
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	247	// no results
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	248	return SET_ERROR(err, ERR_GETADDRINFO_EMPTY);
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	249	}
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	250
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	251	// ok, done
a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	252	return 0;
1 cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	253	}
cf0e1bb6bcab a fancy socket abstraction layer, with TCP, next, SSL. Also, .hgignore Tero Marttila <terom@fixme.fi> parents: diff changeset	254
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	255	err_t sock_tcp_set_nonblock (struct sock_tcp *sock, int nonblock)
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	256	{
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	257	// fcntl it
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	258	// XXX: maintain old flags?
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	259	if (fcntl(sock->fd, F_SETFL, nonblock ? O_NONBLOCK : 0) < 0)
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	260	RETURN_SET_ERROR_ERRNO(SOCK_TCP_ERR(sock), ERR_FCNTL);
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	261
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	262	// ok
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	263	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	264	}
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	265
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	266	err_t sock_tcp_close (struct sock_tcp *sock)
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	{
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	268	struct error_info *err = SOCK_TCP_ERR(sock);
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	269
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	270	// no errors yet
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	271	RESET_ERROR(err);
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	272
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	273	// must be connected
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	274	assert(sock->fd >= 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	275
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	276	// kill any events
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	277	if (sock->ev_read)
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	278	event_del(sock->ev_read);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	279
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	280	if (sock->ev_write)
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	281	event_del(sock->ev_write);
9c1050bc8709 add sock_stream_release/line_proto_release/irc_conn_release functions, and add proper cleanup to irc_net_create Tero Marttila <terom@fixme.fi> parents: 27 diff changeset	282
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	283	// close the socket itself
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	284	if (close(sock->fd))
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	285	SET_ERROR_ERRNO(err, ERR_CLOSE);
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	286
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	287	// invalidate
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	288	sock->fd = -1;
29 3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	289
3f0f2898fea3 add sock_gnutls_destroy, and error cleanup for sock_ssl_connect. Fix various XXX's Tero Marttila <terom@fixme.fi> parents: 28 diff changeset	290	return ERROR_CODE(err);
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	291	}
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	292
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	void sock_tcp_free (struct sock_tcp *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	294	{
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	295	// must not be connected
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	296	assert(sock->fd < 0);
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	297
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	298	// free
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	299	free(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	300	}
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	301
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	302	err_t sock_tcp_connect (struct sock_stream *sock_ptr, const char host, const char service, struct error_info err_info)
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	303	{
a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	304	struct sock_tcp *sock;
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	305	err_t err;
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	306
a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	307	// allocate
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	308	if ((err = sock_tcp_alloc(&sock)))
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	309	return err;
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	310
a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	311	// connect
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	312	if ((err = sock_tcp_init_connect(sock, host, service))) {
8 be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: 4 diff changeset	313	// copy error_info
be88e543c8ff split off line_proto, and make sock_stream_error return a const error_info Tero Marttila <terom@fixme.fi> parents: 4 diff changeset	314	SET_ERROR_INFO(err_info, sock_stream_error(SOCK_TCP_BASE(sock)));
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	315
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	316	// cleanup
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	317	sock_tcp_free(sock);
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	318
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	319	// return error code
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	320	return err;
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	321	}
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	322
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	323	// good
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	324	*sock_ptr = SOCK_TCP_BASE(sock);
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	325
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	326	return 0;
2 a834f0559939 working SSL using gnutls - a bit of a painful process Tero Marttila <terom@fixme.fi> parents: 1 diff changeset	327	}
3 cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	328
cc94ae754e2a error handling magic Tero Marttila <terom@fixme.fi> parents: 2 diff changeset	329

author	Tero Marttila <terom@fixme.fi>
	Thu, 12 Mar 2009 20:00:48 +0200
changeset 40	51678c7eae03
parent 30	7f8dd120933f
child 85	75bc8b164ef8
permissions	-rw-r--r--