X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=lib%2Frequest.c;h=9ad7843e63eaa68041c4e1e0d9ac3375717be286;hb=937144b230752ac640e611cabb57387f613997bc;hp=80a0a81738573b0b5e3eb960a1ac6027246756a7;hpb=41af6cd03dac4eb905d0d3de574d2e4f3f9600eb;p=radsecproxy.git diff --git a/lib/request.c b/lib/request.c index 80a0a81..9ad7843 100644 --- a/lib/request.c +++ b/lib/request.c @@ -1,17 +1,31 @@ /* Copyright 2010, 2011 NORDUnet A/S. All rights reserved. - See the file COPYING for licensing information. */ + See LICENSE for licensing information. */ #if defined HAVE_CONFIG_H #include #endif -#include +#include +#include #include +#include #include #include #include #include #include +#include +#include "debug.h" +#include "conn.h" +#include "tcp.h" +#include "udp.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) @@ -27,27 +41,30 @@ rs_request_create (struct rs_connection *conn, struct rs_request **req_out) } void -rs_request_add_reqpkt (struct rs_request *req, struct rs_packet *reqpkt) +rs_request_add_reqpkt (struct rs_request *req, struct rs_packet *req_msg) { assert (req); - req->req_msg = reqpkt; + req->req_msg = req_msg; } int rs_request_create_authn (struct rs_connection *conn, struct rs_request **req_out, const char *user_name, - const char *user_pw) + const char *user_pw, + const char *secret) { - struct rs_request *req; + struct rs_request *req = NULL; assert (req_out); + if (rs_request_create (conn, &req)) return -1; - if (rs_packet_create_authn_request (conn, &req->req_msg, user_name, user_pw)) + if (rs_packet_create_authn_request (conn, &req->req_msg, user_name, user_pw, secret)) return -1; - *req_out = req; + if (req_out) + *req_out = req; return RSE_OK; } @@ -55,88 +72,86 @@ void rs_request_destroy (struct rs_request *request) { assert (request); - rs_packet_destroy (request->req_msg); - rs_packet_destroy (request->resp_msg); - rs_free (request->conn->ctx, request); -} - -#if 0 -static void -_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); -} + assert (request->conn->ctx); -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); + if (request->req_msg) + rs_packet_destroy (request->req_msg); + rs_free (request->conn->ctx, request); } static void -_rs_req_packet_received (struct rs_packet *msg, void *user_data) +_rand_rt (struct timeval *res, uint32_t rtprev, uint32_t factor) { - 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); + uint32_t ms = rtprev * (nr_rand () % factor); + res->tv_sec = rtprev + ms / 1000; + res->tv_usec = (ms % 1000) * 1000; } int rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) { - int err = 0; + 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}; + 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); conn = request->conn; + assert (!conn_user_dispatch_p (conn)); /* This function is high level. */ + + 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 (r != RSE_TIMEOUT_CONN && r != RSE_TIMEOUT_IO) + break; /* Error. */ + } + else if (r != RSE_TIMEOUT_CONN && r != RSE_TIMEOUT_IO) + break; /* Error. */ + + 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); + _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; +} - 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; - - err = rs_conn_receive_packet (request->conn, request->req_msg, resp_msg); - if (err) - goto cleanup; - -cleanup: - conn->user_data = request->saved_user_data; - conn->callbacks = request->saved_cb; - return err; +struct rs_packet * +rs_request_get_reqmsg (const struct rs_request *request) +{ + assert (request); + return request->req_msg; }