From 683e3e1bbbdfe2f08dc12f1e840e71ed6088a0e3 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 24 Jan 2013 08:32:23 +0100 Subject: Rename rs_packet_flags members. Uppercase to make them appear as the constants they are, as opposed to variables. Remove 'flag' suffix, typically used for variables. Spell out HEADER. --- lib/conn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/conn.c') diff --git a/lib/conn.c b/lib/conn.c index c6692a2..09a1ac0 100644 --- a/lib/conn.c +++ b/lib/conn.c @@ -207,7 +207,7 @@ _rcb (struct rs_packet *packet, void *user_data) assert (pkt); assert (pkt->conn); - pkt->flags |= rs_packet_received_flag; + pkt->flags |= RS_PACKET_RECEIVED; if (pkt->conn->bev) bufferevent_disable (pkt->conn->bev, EV_WRITE|EV_READ); else @@ -234,7 +234,7 @@ rs_conn_receive_packet (struct rs_connection *conn, conn->callbacks.received_cb = _rcb; conn->user_data = pkt; - pkt->flags &= ~rs_packet_received_flag; + pkt->flags &= ~RS_PACKET_RECEIVED; if (conn->bev) /* TCP. */ { @@ -267,7 +267,7 @@ rs_conn_receive_packet (struct rs_connection *conn, evutil_gai_strerror (err)); rs_debug (("%s: event loop done\n", __func__)); - if ((pkt->flags & rs_packet_received_flag) == 0 + if ((pkt->flags & RS_PACKET_RECEIVED) == 0 || (req_msg && packet_verify_response (pkt->conn, pkt, req_msg) != RSE_OK)) { -- cgit v1.1 From 0fc12902522123ec85913beac30349925b9deed8 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 24 Jan 2013 17:22:14 +0100 Subject: Order functions properly in conn.c. --- lib/conn.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'lib/conn.c') diff --git a/lib/conn.c b/lib/conn.c index 09a1ac0..64c2344 100644 --- a/lib/conn.c +++ b/lib/conn.c @@ -43,6 +43,25 @@ conn_user_dispatch_p (const struct rs_connection *conn) conn->callbacks.sent_cb); } + +int +conn_activate_timeout (struct rs_connection *conn) +{ + assert (conn); + assert (conn->tev); + assert (conn->evb); + if (conn->timeout.tv_sec || conn->timeout.tv_usec) + { + rs_debug (("%s: activating timer: %d.%d\n", __func__, + conn->timeout.tv_sec, conn->timeout.tv_usec)); + if (evtimer_add (conn->tev, &conn->timeout)) + return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__, + "evtimer_add: %d", errno); + } + return RSE_OK; +} + +/* Public functions. */ int rs_conn_create (struct rs_context *ctx, struct rs_connection **conn, @@ -290,20 +309,3 @@ rs_conn_set_timeout(struct rs_connection *conn, struct timeval *tv) assert (tv); conn->timeout = *tv; } - -int -conn_activate_timeout (struct rs_connection *conn) -{ - assert (conn); - assert (conn->tev); - assert (conn->evb); - if (conn->timeout.tv_sec || conn->timeout.tv_usec) - { - rs_debug (("%s: activating timer: %d.%d\n", __func__, - conn->timeout.tv_sec, conn->timeout.tv_usec)); - if (evtimer_add (conn->tev, &conn->timeout)) - return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__, - "evtimer_add: %d", errno); - } - return RSE_OK; -} -- cgit v1.1 From abd279561b8fc63e9a8ae7c8cab5135df77bb816 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 24 Jan 2013 17:31:49 +0100 Subject: Add two helper functions to conn.[ch]. --- lib/conn.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'lib/conn.c') diff --git a/lib/conn.c b/lib/conn.c index 64c2344..7522782 100644 --- a/lib/conn.c +++ b/lib/conn.c @@ -61,6 +61,21 @@ conn_activate_timeout (struct rs_connection *conn) return RSE_OK; } +int +conn_type_tls (const struct rs_connection *conn) +{ + return conn->realm->type == RS_CONN_TYPE_TLS + || conn->realm->type == RS_CONN_TYPE_DTLS; +} + +int +conn_cred_psk (const struct rs_connection *conn) +{ + return conn->realm->transport_cred && + conn->realm->transport_cred->type == RS_CRED_TLS_PSK; +} + + /* Public functions. */ int rs_conn_create (struct rs_context *ctx, -- cgit v1.1 From f0df8b47b0c7639ab3842c2b92c80f70b8ed66d3 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 9 May 2013 09:49:37 +0200 Subject: Update copyright years. --- lib/conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/conn.c') diff --git a/lib/conn.c b/lib/conn.c index 7522782..f89ac70 100644 --- a/lib/conn.c +++ b/lib/conn.c @@ -1,5 +1,5 @@ -/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved. - See LICENSE for licensing information. */ +/* Copyright 2010-2013 NORDUnet A/S. All rights reserved. + See LICENSE for licensing information. */ #if defined HAVE_CONFIG_H #include -- cgit v1.1 From 65b62d83ee72012d1171f1813b8f989f8805497c Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 15 May 2013 11:57:09 +0200 Subject: Don't crash on reading invalid messages. Also, invoke disconnected callback and close connection in error cases. --- lib/conn.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'lib/conn.c') diff --git a/lib/conn.c b/lib/conn.c index f89ac70..499c330 100644 --- a/lib/conn.c +++ b/lib/conn.c @@ -20,19 +20,6 @@ #include "tcp.h" int -conn_close (struct rs_connection **connp) -{ - int r = 0; - assert (connp); - assert (*connp); - if ((*connp)->is_connected) - r = rs_conn_disconnect (*connp); - if (r == RSE_OK) - *connp = NULL; - return r; -} - -int conn_user_dispatch_p (const struct rs_connection *conn) { assert (conn); @@ -145,6 +132,25 @@ rs_conn_disconnect (struct rs_connection *conn) assert (conn); + if (conn->is_connected) + event_on_disconnect (conn); + + if (conn->bev) + { + bufferevent_free (conn->bev); + conn->bev = NULL; + } + if (conn->rev) + { + event_free (conn->rev); + conn->rev = NULL; + } + if (conn->wev) + { + event_free (conn->wev); + conn->wev = NULL; + } + err = evutil_closesocket (conn->fd); conn->fd = -1; return err; -- cgit v1.1