From 5c60297a1eaab7b10d6f584ba329493a41b812d0 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Sun, 6 Mar 2011 15:53:58 +0100 Subject: Restructure code, moving most code out of packet.c Also, move copyright notice out of COPYING and into every file. --- lib/request.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/request.c') diff --git a/lib/request.c b/lib/request.c index 9aa29cb..1d0b4ac 100644 --- a/lib/request.c +++ b/lib/request.c @@ -1,4 +1,5 @@ -/* See the file COPYING for licensing information. */ +/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved. + See the file COPYING for licensing information. */ #if defined HAVE_CONFIG_H #include -- cgit v1.1 From e5207cd80b8a522be84e3f66479663e559309ee7 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Sun, 6 Mar 2011 16:44:43 +0100 Subject: Replace asserts with EINVAL checks. --- lib/request.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'lib/request.c') diff --git a/lib/request.c b/lib/request.c index 1d0b4ac..0d98544 100644 --- a/lib/request.c +++ b/lib/request.c @@ -95,19 +95,13 @@ _rs_req_packet_sent(void *user_data) int rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) { - int err; - struct rs_connection *conn; - - assert (request); - assert (request->conn); - assert (request->req_msg); - conn = request->conn; + int err = 0; + struct rs_connection *conn = NULL; if (!request || !request->conn || !request->req_msg || !resp_msg) return rs_err_conn_push_fl (conn, RSE_INVAL, __FILE__, __LINE__, NULL); - + conn = request->conn; request->saved_cb = conn->callbacks; - conn->callbacks.connected_cb = _rs_req_connected; conn->callbacks.disconnected_cb = _rs_req_disconnected; conn->callbacks.received_cb = _rs_req_packet_received; -- cgit v1.1 From 43d0740f143ba737a1fc5ace3a323ffa8b09e7ae Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Sun, 6 Mar 2011 17:04:54 +0100 Subject: request: Save callers user_data and do invoke callers callbacks. --- lib/request.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'lib/request.c') diff --git a/lib/request.c b/lib/request.c index 0d98544..9c4b58f 100644 --- a/lib/request.c +++ b/lib/request.c @@ -62,34 +62,50 @@ rs_request_destroy (struct rs_request *request) #if 0 static void -_timer_cb(evutil_socket_t fd, short what, void *arg) +_timer_cb (evutil_socket_t fd, short what, void *arg) { } #endif static void -_rs_req_connected(void *user_data) +_rs_req_connected (void *user_data) { - //struct rs_request *request = (struct rs_request *)user_data; + struct rs_request *request = (struct rs_request *) user_data; + assert (request); + assert (request->conn); + if (request->saved_cb.connected_cb) + request->saved_cb.connected_cb (request->saved_user_data); } static void -_rs_req_disconnected(void *user_data) +_rs_req_disconnected (void *user_data) { - //struct rs_request *request = (struct rs_request *)user_data; + struct rs_request *request = (struct rs_request *) user_data; + assert (request); + assert (request->conn); + if (request->saved_cb.disconnected_cb) + request->saved_cb.disconnected_cb (request->saved_user_data); } static void -_rs_req_packet_received(struct rs_packet *msg, void *user_data) +_rs_req_packet_received (struct rs_packet *msg, void *user_data) { - //struct rs_request *request = (struct rs_request *)user_data; + struct rs_request *request = (struct rs_request *) user_data; + assert (request); + assert (request->conn); + if (request->saved_cb.received_cb) + request->saved_cb.received_cb (msg, request->saved_user_data); } static void -_rs_req_packet_sent(void *user_data) +_rs_req_packet_sent (void *user_data) { - //struct rs_request *request = (struct rs_request *)user_data; + struct rs_request *request = (struct rs_request *) user_data; + assert (request); + assert (request->conn); + if (request->saved_cb.sent_cb) + request->saved_cb.sent_cb (request->saved_user_data); } int @@ -101,6 +117,10 @@ rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) if (!request || !request->conn || !request->req_msg || !resp_msg) return rs_err_conn_push_fl (conn, RSE_INVAL, __FILE__, __LINE__, NULL); conn = request->conn; + + request->saved_user_data = conn->user_data; + conn->user_data = request; + request->saved_cb = conn->callbacks; conn->callbacks.connected_cb = _rs_req_connected; conn->callbacks.disconnected_cb = _rs_req_disconnected; @@ -116,6 +136,7 @@ rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) goto cleanup; cleanup: + conn->user_data = request->saved_user_data; conn->callbacks = request->saved_cb; return err; } -- cgit v1.1 From 41af6cd03dac4eb905d0d3de574d2e4f3f9600eb Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 7 Mar 2011 09:53:40 +0100 Subject: Formatting changes. --- lib/request.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/request.c') diff --git a/lib/request.c b/lib/request.c index 9c4b58f..80a0a81 100644 --- a/lib/request.c +++ b/lib/request.c @@ -127,11 +127,11 @@ rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) conn->callbacks.received_cb = _rs_req_packet_received; conn->callbacks.sent_cb = _rs_req_packet_sent; - err = rs_packet_send(request->req_msg, request); + err = rs_packet_send (request->req_msg, request); if (err) goto cleanup; - err = rs_conn_receive_packet(request->conn, request->req_msg, resp_msg); + err = rs_conn_receive_packet (request->conn, request->req_msg, resp_msg); if (err) goto cleanup; -- cgit v1.1 From a379adb7d6cf86ebf2c60451fab1df588060de23 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 7 Mar 2011 15:25:33 +0100 Subject: Requests are now high level, i.e. not for user doing the dispatching. --- lib/request.c | 67 +++++++---------------------------------------------------- 1 file changed, 7 insertions(+), 60 deletions(-) (limited to 'lib/request.c') diff --git a/lib/request.c b/lib/request.c index 80a0a81..8cb8b7e 100644 --- a/lib/request.c +++ b/lib/request.c @@ -12,6 +12,7 @@ #include #include #include +#include "conn.h" int rs_request_create (struct rs_connection *conn, struct rs_request **req_out) @@ -68,75 +69,21 @@ _timer_cb (evutil_socket_t fd, short what, void *arg) } #endif -static void -_rs_req_connected (void *user_data) -{ - struct rs_request *request = (struct rs_request *) user_data; - assert (request); - assert (request->conn); - if (request->saved_cb.connected_cb) - request->saved_cb.connected_cb (request->saved_user_data); -} - -static void -_rs_req_disconnected (void *user_data) -{ - struct rs_request *request = (struct rs_request *) user_data; - assert (request); - assert (request->conn); - if (request->saved_cb.disconnected_cb) - request->saved_cb.disconnected_cb (request->saved_user_data); -} - -static void -_rs_req_packet_received (struct rs_packet *msg, void *user_data) -{ - struct rs_request *request = (struct rs_request *) user_data; - assert (request); - assert (request->conn); - if (request->saved_cb.received_cb) - request->saved_cb.received_cb (msg, request->saved_user_data); -} - -static void -_rs_req_packet_sent (void *user_data) -{ - struct rs_request *request = (struct rs_request *) user_data; - assert (request); - assert (request->conn); - if (request->saved_cb.sent_cb) - request->saved_cb.sent_cb (request->saved_user_data); -} - int rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) { - int err = 0; struct rs_connection *conn = NULL; if (!request || !request->conn || !request->req_msg || !resp_msg) return rs_err_conn_push_fl (conn, RSE_INVAL, __FILE__, __LINE__, NULL); conn = request->conn; + assert (!conn_user_dispatch_p (conn)); /* This function is high level. */ - request->saved_user_data = conn->user_data; - conn->user_data = request; - - request->saved_cb = conn->callbacks; - conn->callbacks.connected_cb = _rs_req_connected; - conn->callbacks.disconnected_cb = _rs_req_disconnected; - conn->callbacks.received_cb = _rs_req_packet_received; - conn->callbacks.sent_cb = _rs_req_packet_sent; - - err = rs_packet_send (request->req_msg, request); - if (err) - goto cleanup; + if (rs_packet_send (request->req_msg, request)) + return -1; - err = rs_conn_receive_packet (request->conn, request->req_msg, resp_msg); - if (err) - goto cleanup; + if (rs_conn_receive_packet (request->conn, request->req_msg, resp_msg)) + return -1; -cleanup: - conn->user_data = request->saved_user_data; - conn->callbacks = request->saved_cb; - return err; + return RSE_OK; } -- cgit v1.1 From d464ebb9235fe78e6588e95d4d3333d5ee95ca48 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 8 Mar 2011 13:37:46 +0100 Subject: Timeout implemented in request objects, supported by TCP. TODO: UDP. --- lib/request.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 10 deletions(-) (limited to 'lib/request.c') diff --git a/lib/request.c b/lib/request.c index 8cb8b7e..b0a8eef 100644 --- a/lib/request.c +++ b/lib/request.c @@ -5,14 +5,26 @@ #include #endif -#include +#include +#include #include +#include #include #include #include #include #include +#include +#include "debug.h" #include "conn.h" +#include "tcp.h" + +/* RFC 5080 2.2.1. Retransmission Behavior. */ +#define IRT 2 +#define MRC 5 +#define MRT 16 +#define MRD 30 +#define RAND 100 /* Rand factor, milliseconds. */ int rs_request_create (struct rs_connection *conn, struct rs_request **req_out) @@ -61,29 +73,69 @@ rs_request_destroy (struct rs_request *request) rs_free (request->conn->ctx, request); } -#if 0 static void -_timer_cb (evutil_socket_t fd, short what, void *arg) - +_rand_rt (struct timeval *res, uint32_t rtprev, uint32_t factor) { + uint32_t ms = rtprev * (fr_rand () % factor); + res->tv_sec = rtprev + ms / 1000; + res->tv_usec = (ms % 1000) * 1000; } -#endif int rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) { + int r = 0; struct rs_connection *conn = NULL; + int count = 0; + struct timeval rt = {0,0}; + struct timeval end = {0,0}; + struct timeval now = {0,0}; + struct timeval tmp_tv = {0,0}; + struct timeval mrt_tv = {MRT,0}; if (!request || !request->conn || !request->req_msg || !resp_msg) return rs_err_conn_push_fl (conn, RSE_INVAL, __FILE__, __LINE__, NULL); conn = request->conn; assert (!conn_user_dispatch_p (conn)); /* This function is high level. */ - if (rs_packet_send (request->req_msg, request)) - return -1; + gettimeofday (&end, NULL); + end.tv_sec += MRD; + _rand_rt (&rt, IRT, RAND); + while (1) + { + rs_conn_set_timeout (conn, &rt); + r = rs_packet_send (request->req_msg, NULL); + if (r == RSE_OK) + { + r = rs_conn_receive_packet (request->conn, + request->req_msg, + resp_msg); + if (r == RSE_OK) + break; /* Success. */ - if (rs_conn_receive_packet (request->conn, request->req_msg, resp_msg)) - return -1; + /* Timing out on receiving data or reconnecting a broken TCP + connection is ok. */ + if (r != RSE_TIMEOUT_CONN && r != RSE_TIMEOUT_IO) + break; /* Error. */ + } + else if (r != RSE_TIMEOUT_CONN) /* Timeout on TCP connect is ok. */ + break; /* Error. */ - return RSE_OK; + gettimeofday (&now, NULL); + if (++count > MRC || timercmp (&now, &end, >)) + { + r = RSE_TIMEOUT; + break; /* Timeout. */ + } + + /* rt = 2 * rt + _rand_rt (rt, RAND); */ + timeradd (&rt, &rt, &rt); /* rt = 2 * rt */ + _rand_rt (&tmp_tv, IRT, RAND); + timeradd (&rt, &tmp_tv, &rt); + if (timercmp (&rt, &mrt_tv, >)) + _rand_rt (&rt, MRT, RAND); + } + + rs_debug (("%s: returning %d\n", __func__, r)); + return r; } -- cgit v1.1 From 8967b5275fa61ddba7031b5b82750031e4f8bb4b Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 9 Mar 2011 10:24:22 +0100 Subject: Use retransmisison timer in request object. --- lib/request.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'lib/request.c') diff --git a/lib/request.c b/lib/request.c index b0a8eef..f354382 100644 --- a/lib/request.c +++ b/lib/request.c @@ -18,6 +18,7 @@ #include "debug.h" #include "conn.h" #include "tcp.h" +#include "udp.h" /* RFC 5080 2.2.1. Retransmission Behavior. */ #define IRT 2 @@ -91,7 +92,7 @@ rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) struct timeval end = {0,0}; struct timeval now = {0,0}; struct timeval tmp_tv = {0,0}; - struct timeval mrt_tv = {MRT,0}; + const struct timeval mrt_tv = {MRT,0}; if (!request || !request->conn || !request->req_msg || !resp_msg) return rs_err_conn_push_fl (conn, RSE_INVAL, __FILE__, __LINE__, NULL); @@ -104,6 +105,7 @@ rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) while (1) { rs_conn_set_timeout (conn, &rt); + r = rs_packet_send (request->req_msg, NULL); if (r == RSE_OK) { @@ -113,13 +115,11 @@ rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) if (r == RSE_OK) break; /* Success. */ - /* Timing out on receiving data or reconnecting a broken TCP - connection is ok. */ if (r != RSE_TIMEOUT_CONN && r != RSE_TIMEOUT_IO) break; /* Error. */ } - else if (r != RSE_TIMEOUT_CONN) /* Timeout on TCP connect is ok. */ - break; /* Error. */ + else if (r != RSE_TIMEOUT_CONN && r != RSE_TIMEOUT_IO) + break; /* Error. */ gettimeofday (&now, NULL); if (++count > MRC || timercmp (&now, &end, >)) @@ -128,14 +128,17 @@ rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) break; /* Timeout. */ } - /* rt = 2 * rt + _rand_rt (rt, RAND); */ - timeradd (&rt, &rt, &rt); /* rt = 2 * rt */ + /* rt = 2 * rt + rand_rt (rt, RAND); */ + timeradd (&rt, &rt, &rt); _rand_rt (&tmp_tv, IRT, RAND); timeradd (&rt, &tmp_tv, &rt); if (timercmp (&rt, &mrt_tv, >)) _rand_rt (&rt, MRT, RAND); } + timerclear (&rt); + rs_conn_set_timeout (conn, &rt); + rs_debug (("%s: returning %d\n", __func__, r)); return r; } -- cgit v1.1