X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=lib%2Frequest.c;h=5649ee1cbe5724490532daa9a681043c7e2c504a;hb=c682577a243902164de1d80f38425a66a4853d82;hp=5cb87bb0247d14d4b359bfe938678788a61fc79e;hpb=06936d1f263c456017e20ea6c74d2756e1e30fcc;p=libradsec.git diff --git a/lib/request.c b/lib/request.c index 5cb87bb..5649ee1 100644 --- a/lib/request.c +++ b/lib/request.c @@ -1,17 +1,37 @@ -/* See the file COPYING for licensing information. */ +/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved. + See LICENSE for licensing information. */ -#include +#if defined HAVE_CONFIG_H +#include +#endif + +#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) { struct rs_request *req = rs_malloc (conn->ctx, sizeof(*req)); + assert (req_out); if (!req) return rs_err_conn_push_fl (conn, RSE_NOMEM, __FILE__, __LINE__, NULL); memset (req, 0, sizeof(*req)); @@ -21,73 +41,116 @@ rs_request_create (struct rs_connection *conn, struct rs_request **req_out) } void -rs_request_destroy (struct rs_request *request) +rs_request_add_reqpkt (struct rs_request *req, struct rs_packet *req_msg) { - rs_packet_destroy (request->req); - rs_packet_destroy (request->resp); - rs_free (request->conn->ctx, request); + assert (req); + req->req_msg = req_msg; } -#if 0 -static void -_timer_cb(evutil_socket_t fd, short what, void *arg) - +int +rs_request_create_authn (struct rs_connection *conn, + struct rs_request **req_out, + const char *user_name, + const char *user_pw) { -} -#endif + struct rs_request *req = NULL; + assert (req_out); -static void -_rs_req_connected(void *user_data) -{ - struct rs_request *request = (struct rs_request *)user_data; -} + if (rs_request_create (conn, &req)) + return -1; -static void -_rs_req_disconnected(void *user_data) -{ - struct rs_request *request = (struct rs_request *)user_data; + if (rs_packet_create_authn_request (conn, &req->req_msg, user_name, user_pw)) + return -1; + + if (req_out) + *req_out = req; + return RSE_OK; } -static void -_rs_req_packet_received(const struct rs_packet *pkt, void *user_data) +void +rs_request_destroy (struct rs_request *request) { - struct rs_request *request = (struct rs_request *)user_data; + assert (request); + assert (request->conn); + assert (request->conn->ctx); + + if (request->req_msg) + rs_packet_destroy (request->req_msg); + rs_free (request->conn->ctx, request); } static void -_rs_req_packet_sent(void *user_data) +_rand_rt (struct timeval *res, uint32_t rtprev, uint32_t factor) { - struct rs_request *request = (struct rs_request *)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 *req, - struct rs_packet **resp) +rs_request_send (struct rs_request *request, struct rs_packet **resp_msg) { - int err; - struct rs_connection *conn; - - assert (request); - assert (request->conn); + 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->req = req; /* take ownership */ - 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, request); - if (err) - goto cleanup; - - err = rs_conn_receive_packet(request->conn, request->req, resp); - if (err) - goto cleanup; - -cleanup: - 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; }