+/* See the file COPYING for licensing information. */
+
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <freeradius/libradius.h>
#include <event2/event.h>
#include <event2/util.h>
-#include "libradsec.h"
-#include "libradsec-impl.h"
+#include <radsec/radsec.h>
+#include <radsec/radsec-impl.h>
int
rs_context_create(struct rs_handle **ctx, const char *dict)
int rs_context_set_alloc_scheme(struct rs_handle *ctx, struct rs_alloc_scheme *scheme)
{
- return rs_ctx_err_push_fl (ctx, RSE_NOSYS, __FILE__, __LINE__,
+ 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)
{
- return rs_ctx_err_push_fl (ctx, RSE_NOSYS, __FILE__, __LINE__,
+ 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)
+int
+rs_conn_create(struct rs_handle *ctx, struct rs_connection **conn,
+ const char *config)
{
struct rs_connection *c;
{
memset (c, 0, sizeof(struct rs_connection));
c->ctx = ctx;
+ if (config)
+ {
+ struct rs_realm *r = rs_conf_find_realm (ctx, config);
+ if (r)
+ {
+ c->type = r->type;
+ c->peers = r->peers; /* FIXME: Copy? */
+ }
+ }
}
if (conn)
*conn = c;
- return c ? RSE_OK : rs_ctx_err_push (ctx, RSE_NOMEM, NULL);
+ return c ? RSE_OK : rs_err_ctx_push (ctx, RSE_NOMEM, NULL);
+}
+
+void
+rs_conn_set_type(struct rs_connection *conn, rs_conn_type_t type)
+{
+ conn->type = type;
}
struct addrinfo *
snprintf (portstr, sizeof(portstr), "%d", port);
memset (&hints, 0, sizeof(struct evutil_addrinfo));
- //hints.ai_family = AF_UNSPEC; /* v4 or v6. */
- hints.ai_family = AF_INET; /* FIXME: v4 only, while debuging */
+ hints.ai_family = AF_UNSPEC; /* v4 or v6. */
hints.ai_flags = AI_ADDRCONFIG;
switch (conn->type)
{
case RS_CONN_TYPE_NONE:
- rs_conn_err_push_fl (conn, RSE_INVALID_CONN, __FILE__, __LINE__, NULL);
+ 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;
}
err = evutil_getaddrinfo (hostname, portstr, &hints, &res);
if (err)
- rs_conn_err_push_fl (conn, RSE_BADADDR, __FILE__, __LINE__,
- " %s:%d: bad host name or port (%s)",
+ 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. */
}
-int
-rs_conn_add_server(struct rs_connection *conn, struct rs_peer **server,
- rs_conn_type_t type, const char *hostname, int port)
+static struct rs_peer *
+_peer_new (struct rs_connection *conn)
{
- struct rs_peer *srv;
- struct evutil_addrinfo *addr;
+ struct rs_peer *p;
- if (conn->type == RS_CONN_TYPE_NONE)
- conn->type = type;
- else if (conn->type != type)
- return rs_conn_err_push (conn, RSE_CONN_TYPE_MISMATCH, NULL);
+ p = (struct rs_peer *) malloc (sizeof(*p));
+ if (p)
+ {
+ memset (p, 0, sizeof(struct rs_peer));
+ p->conn = conn;
+ p->fd = -1;
+ p->next = conn->peers;
+ if (conn->peers)
+ conn->peers->next = p;
+ else
+ conn->peers = p;
+ }
+ else
+ rs_err_conn_push_fl (conn, RSE_NOMEM, __FILE__, __LINE__, NULL);
+ return p;
+}
- addr = _resolv (conn, hostname, port);
- if (!addr)
- return -1;
+int
+rs_server_create (struct rs_connection *conn, struct rs_peer **server)
+{
+ struct rs_peer *srv;
- srv = (struct rs_peer *) malloc (sizeof(struct rs_peer));
+ srv = _peer_new (conn);
if (srv)
{
- memset (srv, 0, sizeof(struct rs_peer));
- srv->conn = conn;
- srv->addr = addr;
- srv->timeout = 10;
+ srv->timeout = 1;
srv->tries = 3;
- srv->next = conn->peers;
- if (conn->peers)
- conn->peers->next = srv;
- else
- conn->peers = srv;
}
if (*server)
*server = srv;
- return srv ? RSE_OK : rs_conn_err_push (conn, RSE_NOMEM, NULL);
+ return srv ? RSE_OK : -1;
}
-void rs_server_set_timeout(struct rs_peer *server, int timeout)
+int
+rs_server_set_address (struct rs_peer *server, const char *hostname, int port)
+{
+ server->addr = _resolv (server->conn, hostname, port);
+ return server->addr ? RSE_OK : -1;
+}
+
+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);
server->secret = (char *) malloc (strlen(secret) + 1);
if (!server->secret)
- return rs_conn_err_push (server->conn, RSE_NOMEM, NULL);
+ return rs_err_conn_push (server->conn, RSE_NOMEM, NULL);
strcpy (server->secret, secret);
return RSE_OK;
}
-int rs_conn_add_listener(struct rs_connection *conn, rs_conn_type_t type, const char *hostname, int port)
+int
+rs_conn_add_listener (struct rs_connection *conn, rs_conn_type_t type,
+ const char *hostname, int port)
{
- return rs_conn_err_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
+ return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
"%s: NYI", __func__);
}
-
void
-rs_conn_destroy(struct rs_connection *conn)
+rs_conn_destroy (struct rs_connection *conn)
{
struct rs_peer *p;
int rs_conn_set_eventbase(struct rs_connection *conn, struct event_base *eb)
{
- return rs_conn_err_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
+ 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_conn_err_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
- "%s: NYI", __func__);
-}
-
-int rs_conn_set_server(struct rs_connection *conn, const char *name)
-{
- return rs_conn_err_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
+ 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_conn_err_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
+ return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
"%s: NYI", __func__);
}
-/* Non-public. */
-int
-rs_conn_open(struct rs_connection *conn)
-{
- int s;
- struct rs_peer *p;
-
- if (conn->active_peer)
- return RSE_OK;
- p = conn->peers;
- if (!p)
- return rs_conn_err_push_fl (conn, RSE_NOPEER, __FILE__, __LINE__, NULL);
-
- s = socket (p->addr->ai_family, p->addr->ai_socktype, p->addr->ai_protocol);
- if (s < 0)
- return rs_conn_err_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__,
- strerror (errno));
-#if 0 /* let librevent do this in rs_packet_send() */
- if (connect (s, p->addr->ai_addr, p->addr->ai_addrlen))
- {
- /* TODO: handle nonblocking sockets (EINTR, EAGAIN). */
- EVUTIL_CLOSESOCKET (s);
- return rs_conn_err_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__,
- strerror (errno));
- }
-#endif
-
- if (!conn->evb)
- {
-#if defined (DEBUG)
- event_enable_debug_mode ();
-#endif
- conn->evb = event_base_new ();
- }
-
- if (!conn->evb)
- {
- EVUTIL_CLOSESOCKET (s);
- return rs_conn_err_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
- "event_base_new");
- }
-
- p->s = s;
- conn->active_peer = p;
- return RSE_OK;
-}
projects / radsecproxy.git / blobdiff