/* See the file COPYING for licensing information. */
+#if defined HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <libgen.h>
+#include <assert.h>
#include <freeradius/libradius.h>
#include <event2/event.h>
#include <event2/util.h>
#include <radsec/radsec.h>
#include <radsec/radsec-impl.h>
+#if defined RS_ENABLE_TLS
+#include <regex.h>
+#include "rsp_list.h"
+#include "../radsecproxy.h"
+#endif
+#include "rsp_debug.h"
int
-rs_context_create(struct rs_handle **ctx, const char *dict)
+rs_context_create(struct rs_context **ctx, const char *dict)
{
- struct rs_handle *h;
+ struct rs_context *h;
if (ctx)
*ctx = NULL;
- h = (struct rs_handle *) malloc (sizeof(struct rs_handle));
+ h = (struct rs_context *) malloc (sizeof(struct rs_context));
if (h)
{
char *buf1 = NULL, *buf2 = NULL;
}
free (buf1);
free (buf2);
+#if defined RS_ENABLE_TLS
+ ssl_init ();
+#endif
#if defined (DEBUG)
fr_log_fp = stderr;
fr_debug_flag = 1;
#endif
+ debug_init ("libradsec"); /* radsecproxy compat, FIXME: remove */
- memset (h, 0, sizeof(struct rs_handle));
+ memset (h, 0, sizeof(struct rs_context));
fr_randinit (&h->fr_randctx, 0);
fr_rand_seed (NULL, 0);
return h ? RSE_OK : RSE_NOMEM;
}
-void rs_context_destroy(struct rs_handle *ctx)
+void rs_context_destroy(struct rs_context *ctx)
{
free (ctx);
}
-int rs_context_set_alloc_scheme(struct rs_handle *ctx, struct rs_alloc_scheme *scheme)
-{
- return rs_err_ctx_push_fl (ctx, RSE_NOSYS, __FILE__, __LINE__,
- "%s: NYI", __func__);
-}
-
-int rs_context_config_read(struct rs_handle *ctx, const char *config_file)
+int rs_context_set_alloc_scheme(struct rs_context *ctx,
+ struct rs_alloc_scheme *scheme)
{
return rs_err_ctx_push_fl (ctx, RSE_NOSYS, __FILE__, __LINE__,
"%s: NYI", __func__);
}
-int rs_conn_create(struct rs_handle *ctx, struct rs_connection **conn)
-{
- struct rs_connection *c;
-
- c = (struct rs_connection *) malloc (sizeof(struct rs_connection));
- if (c)
- {
- memset (c, 0, sizeof(struct rs_connection));
- c->ctx = ctx;
- }
- if (conn)
- *conn = c;
- return c ? RSE_OK : rs_err_ctx_push (ctx, RSE_NOMEM, NULL);
-}
-
-struct addrinfo *
-_resolv (struct rs_connection *conn, const char *hostname, int port)
-{
- int err;
- char portstr[6];
- struct evutil_addrinfo hints, *res = NULL;
-
- snprintf (portstr, sizeof(portstr), "%d", port);
- memset (&hints, 0, sizeof(struct evutil_addrinfo));
- hints.ai_family = AF_UNSPEC; /* v4 or v6. */
- hints.ai_flags = AI_ADDRCONFIG;
- switch (conn->type)
- {
- case RS_CONN_TYPE_NONE:
- rs_err_conn_push_fl (conn, RSE_INVALID_CONN, __FILE__, __LINE__, NULL);
- return NULL;
- case RS_CONN_TYPE_TCP:
- /* Fall through. */
- case RS_CONN_TYPE_TLS:
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_protocol = IPPROTO_TCP;
- break;
- case RS_CONN_TYPE_UDP:
- /* Fall through. */
- case RS_CONN_TYPE_DTLS:
- hints.ai_socktype = SOCK_DGRAM;
- hints.ai_protocol = IPPROTO_UDP;
- break;
- }
- err = evutil_getaddrinfo (hostname, portstr, &hints, &res);
- if (err)
- rs_err_conn_push_fl (conn, RSE_BADADDR, __FILE__, __LINE__,
- "%s:%d: bad host name or port (%s)",
- hostname, port, evutil_gai_strerror(err));
- return res; /* Simply use first result. */
-}
-static struct rs_peer *
-_peer_new (struct rs_connection *conn, const char *hostname, int port)
+struct rs_peer *
+_rs_peer_create (struct rs_context *ctx, struct rs_peer **rootp)
{
struct rs_peer *p;
- struct evutil_addrinfo *addr;
- addr = _resolv (conn, hostname, port);
- if (!addr)
- return NULL;
-
- p = (struct rs_peer *) malloc (sizeof(*p));
+ p = (struct rs_peer *) rs_malloc (ctx, sizeof(*p));
if (p)
{
memset (p, 0, sizeof(struct rs_peer));
- p->conn = conn;
p->fd = -1;
- p->addr = addr;
- p->next = conn->peers;
- if (conn->peers)
- conn->peers->next = p;
+ if (*rootp)
+ (*rootp)->next = p;
else
- conn->peers = p;
- }
- else
- {
- evutil_freeaddrinfo (addr);
- rs_err_conn_push_fl (conn, RSE_NOMEM, __FILE__, __LINE__, NULL);
+ *rootp = p;
}
return p;
}
int
-rs_conn_add_server(struct rs_connection *conn, struct rs_peer **server,
- rs_conn_type_t type, const char *hostname, int port)
+rs_server_create (struct rs_connection *conn, struct rs_peer **server)
{
struct rs_peer *srv;
- if (conn->type == RS_CONN_TYPE_NONE)
- conn->type = type;
- else if (conn->type != type)
- return rs_err_conn_push (conn, RSE_CONN_TYPE_MISMATCH, NULL);
-
- srv = _peer_new (conn, hostname, port);
+ srv = _rs_peer_create (conn->ctx, &conn->peers);
if (srv)
{
- srv->timeout = 10;
+ srv->conn = conn;
+ srv->timeout = 1;
srv->tries = 3;
}
+ else
+ return rs_err_conn_push_fl (conn, RSE_NOMEM, __FILE__, __LINE__, NULL);
if (*server)
*server = srv;
- return srv ? RSE_OK : -1;
+ return RSE_OK;
}
-void rs_server_set_timeout(struct rs_peer *server, int timeout)
+int
+rs_server_set_address (struct rs_peer *server, const char *hostname,
+ const char *service)
+{
+ struct rs_error *err;
+
+ err = _rs_resolv (&server->addr, server->conn->type, hostname, service);
+ if (err)
+ return _rs_err_conn_push_err (server->conn, err);
+ return RSE_OK;
+}
+
+void
+rs_server_set_timeout (struct rs_peer *server, int timeout)
{
server->timeout = timeout;
}
-void rs_server_set_tries(struct rs_peer *server, int tries)
+void
+rs_server_set_tries (struct rs_peer *server, int tries)
{
server->tries = tries;
}
-int rs_server_set_secret(struct rs_peer *server, const char *secret)
+
+int
+rs_server_set_secret (struct rs_peer *server, const char *secret)
{
if (server->secret)
free (server->secret);
return RSE_OK;
}
-int rs_conn_add_listener(struct rs_connection *conn, rs_conn_type_t type, const char *hostname, int port)
-{
- return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
- "%s: NYI", __func__);
-}
-
-void
-rs_conn_destroy(struct rs_connection *conn)
-{
- struct rs_peer *p;
-
-#warning "TODO: Disconnect active_peer."
-
- for (p = conn->peers; p; p = p->next)
- {
- if (p->addr)
- evutil_freeaddrinfo (p->addr);
- if (p->secret)
- rs_free (conn->ctx, p->secret);
- }
-
- if (conn->evb)
- event_base_free (conn->evb);
-}
-
-int rs_conn_set_eventbase(struct rs_connection *conn, struct event_base *eb)
-{
- return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
- "%s: NYI", __func__);
-}
-
-int rs_conn_set_callbacks(struct rs_connection *conn, struct rs_conn_callbacks *cb)
-{
- return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
- "%s: NYI", __func__);
-}
-
-int rs_conn_set_server(struct rs_connection *conn, const char *name)
-{
- return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
- "%s: NYI", __func__);
-}
-
-int rs_conn_get_current_server(struct rs_connection *conn, const char *name, size_t buflen)
-{
- return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
- "%s: NYI", __func__);
-}
-
projects / radsecproxy.git / blobdiff