projects
/
radsecproxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename COPYING -> LICENSE.
[radsecproxy.git]
/
lib
/
request.c
diff --git
a/lib/request.c
b/lib/request.c
index
c74ed92
..
9ad7843
100644
(file)
--- a/
lib/request.c
+++ b/
lib/request.c
@@
-1,5
+1,5
@@
/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
/* 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 <config.h>
#if defined HAVE_CONFIG_H
#include <config.h>
@@
-14,7
+14,7
@@
#include <radsec/radsec-impl.h>
#include <radsec/request.h>
#include <radsec/request-impl.h>
#include <radsec/radsec-impl.h>
#include <radsec/request.h>
#include <radsec/request-impl.h>
-#include <
freeradius/libradius
.h>
+#include <
radius/client
.h>
#include "debug.h"
#include "conn.h"
#include "tcp.h"
#include "debug.h"
#include "conn.h"
#include "tcp.h"
@@
-51,17
+51,20
@@
int
rs_request_create_authn (struct rs_connection *conn,
struct rs_request **req_out,
const char *user_name,
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);
assert (req_out);
+
if (rs_request_create (conn, &req))
return -1;
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;
return -1;
- *req_out = req;
+ if (req_out)
+ *req_out = req;
return RSE_OK;
}
return RSE_OK;
}
@@
-69,15
+72,18
@@
void
rs_request_destroy (struct rs_request *request)
{
assert (request);
rs_request_destroy (struct rs_request *request)
{
assert (request);
- rs_packet_destroy (request->req_msg);
- rs_packet_destroy (request->resp_msg);
+ 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
_rand_rt (struct timeval *res, uint32_t rtprev, uint32_t factor)
{
rs_free (request->conn->ctx, request);
}
static void
_rand_rt (struct timeval *res, uint32_t rtprev, uint32_t factor)
{
- uint32_t ms = rtprev * (
f
r_rand () % factor);
+ uint32_t ms = rtprev * (
n
r_rand () % factor);
res->tv_sec = rtprev + ms / 1000;
res->tv_usec = (ms % 1000) * 1000;
}
res->tv_sec = rtprev + ms / 1000;
res->tv_usec = (ms % 1000) * 1000;
}
@@
-142,3
+148,10
@@
rs_request_send (struct rs_request *request, struct rs_packet **resp_msg)
rs_debug (("%s: returning %d\n", __func__, r));
return r;
}
rs_debug (("%s: returning %d\n", __func__, r));
return r;
}
+
+struct rs_packet *
+rs_request_get_reqmsg (const struct rs_request *request)
+{
+ assert (request);
+ return request->req_msg;
+}