summaryrefslogtreecommitdiff
path: root/lib/include/radsec
diff options
context:
space:
mode:
Diffstat (limited to 'lib/include/radsec')
-rw-r--r--lib/include/radsec/radsec-impl.h19
-rw-r--r--lib/include/radsec/radsec.h68
2 files changed, 49 insertions, 38 deletions
diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h
index 45ce7f6..28e9e4c 100644
--- a/lib/include/radsec/radsec-impl.h
+++ b/lib/include/radsec/radsec-impl.h
@@ -90,6 +90,7 @@ struct rs_realm {
int timeout;
int retries;
struct rs_listener *listeners;
+ struct rs_peer *local_addr;
struct rs_peer *peers;
struct rs_realm *next;
};
@@ -103,9 +104,10 @@ struct rs_config {
/** Libradsec context. */
struct rs_context {
struct rs_config *config;
+ struct rs_realm *realms;
struct rs_alloc_scheme alloc_scheme;
struct rs_error *err;
- struct event_base *evb; /* Event base. */
+ struct event_base *evb;
};
/** Base class for a connection. */
@@ -113,11 +115,11 @@ struct rs_conn_base {
uint32_t magic; /* Must be one of RS_CONN_MAGIC_*. */
struct rs_context *ctx;
struct rs_realm *realm; /* Owned by ctx. */
+ enum rs_conn_type transport;
/** For a listener, allowed client addr/port pairs.
- For an outgoing connection, set of servers.
+ For an outgoing connection, set of configured servers.
For an incoming connection, the peer (as the only entry). */
- struct rs_peer *peers; /**< Configured peers. */
- struct rs_peer *active_peer; /**< The other end of the connection. */
+ struct rs_peer *peers;
struct timeval timeout;
int tryagain; /* For server failover. */
void *user_data;
@@ -137,16 +139,13 @@ enum rs_conn_state {
RS_CONN_STATE_CONNECTED,
};
-/** A "generic" connection. */
+/** A generic connection. */
struct rs_connection {
struct rs_conn_base base_;
struct event *tev; /* Timeout event. */
struct rs_conn_callbacks callbacks;
enum rs_conn_state state;
-#if 0
- char is_connecting; /* FIXME: replace with a single state member */
- char is_connected; /* FIXME: replace with a single state member */
-#endif /* 0 */
+ struct rs_peer *active_peer;
struct rs_message *out_queue; /* Queue for outgoing UDP packets. */
#if defined(RS_ENABLE_TLS)
/* TLS specifics. */
@@ -156,7 +155,7 @@ struct rs_connection {
};
/** A listening connection. Spawns generic connections when peers
- * connect to it. */
+ connect to it. */
struct rs_listener {
struct rs_conn_base base_;
struct evconnlistener *evlistener;
diff --git a/lib/include/radsec/radsec.h b/lib/include/radsec/radsec.h
index cb98db7..2858f9e 100644
--- a/lib/include/radsec/radsec.h
+++ b/lib/include/radsec/radsec.h
@@ -22,6 +22,7 @@
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
+#include "compat.h"
enum rs_error_code {
RSE_OK = 0,
@@ -72,7 +73,7 @@ enum rs_error_code {
RSE_MAX = RSE_CERT
};
-enum rs_conn_type {
+enum rs_conn_type { /* FIXME: Rename rs_transport_type? */
RS_CONN_TYPE_NONE = 0,
RS_CONN_TYPE_UDP,
RS_CONN_TYPE_TCP,
@@ -174,10 +175,14 @@ struct rs_conn_callbacks {
rs_conn_message_sent_cb sent_cb;
};
-typedef void (*rs_listener_new_conn_cb) (struct rs_connection *conn,
- void *user_data);
-typedef void (*rs_listener_error_cb) (void *user_data);
+typedef struct rs_peer *(*rs_listener_client_filter_cb)
+ (const struct rs_listener *listener, void *user_data);
+typedef void (*rs_listener_new_conn_cb)
+ (struct rs_connection *conn, void *user_data);
+typedef void (*rs_listener_error_cb)
+ (struct rs_connection *conn, void *user_data);
struct rs_listener_callbacks {
+ rs_listener_client_filter_cb client_filter_cb;
rs_listener_new_conn_cb new_conn_cb;
rs_listener_error_cb error_cb;
};
@@ -228,8 +233,13 @@ int rs_listener_create (struct rs_context *ctx,
struct rs_listener **listener,
const char *config);
void rs_listener_set_callbacks (struct rs_listener *listener,
- const struct rs_listener_callbacks *cb);
+ const struct rs_listener_callbacks *cb,
+ void *user_data);
+int rs_listener_listen (struct rs_listener *listener);
int rs_listener_dispatch (const struct rs_listener *listener);
+int rs_listener_close (struct rs_listener *l);
+struct event_base *rs_listener_get_eventbase (const struct rs_listener *l);
+int rs_listener_get_fd (const struct rs_listener *l);
/****************/
/* Connection. */
@@ -277,7 +287,8 @@ int rs_conn_set_eventbase(struct rs_connection *conn, struct event_base *eb);
/** Register callbacks \a cb for connection \a conn. */
void rs_conn_set_callbacks(struct rs_connection *conn,
- struct rs_conn_callbacks *cb);
+ struct rs_conn_callbacks *cb,
+ void *user_data);
/** Remove callbacks for connection \a conn. */
void rs_conn_del_callbacks(struct rs_connection *conn);
@@ -356,28 +367,27 @@ int rs_message_create(struct rs_connection *conn, struct rs_message **pkt_out);
/** Free all memory allocated for message \a msg. */
void rs_message_destroy(struct rs_message *msg);
-/** Send message \a msg on the connection associated with \a msg.
- \a user_data is sent to the \a rs_conn_message_received_cb callback
- registered with the connection. If no callback is registered with
- the connection, the event loop is run by \a rs_message_send and it
- blocks until the message has been succesfully sent.
+/** Send \a msg on the connection associated with \a msg.
+ If no callback is registered with the connection
+ (\a rs_conn_set_callbacks), the event loop is run by
+ \a rs_message_send and it blocks until the message has been
+ succesfully sent.
- \return On success, RSE_OK (0) is returned. On error, !0 is
+ \return On success, RSE_OK (0) is returned. On error, !0 is
returned and a struct \a rs_error is pushed on the error stack for
- the connection. The error can be accessed using \a
- rs_err_conn_pop. */
-int rs_message_send(struct rs_message *msg, void *user_data);
+ the connection. The error can be accessed using \a
+ rs_err_conn_pop. */
+int rs_message_send(struct rs_message *msg);
/** Create a RADIUS authentication request message associated with
- connection \a conn. Optionally, User-Name and User-Password
- attributes are added to the message using the data in \a user_name,
- \a user_pw and \a secret where \secret is the RADIUS shared
- secret. */
+ connection \a conn. Optionally, User-Name and User-Password
+ attributes are added to the message using the data in \a user_name
+ and \a user_pw.
+ FIXME: describe what RADIUS shared secret is being used */
int rs_message_create_authn_request(struct rs_connection *conn,
struct rs_message **msg,
const char *user_name,
- const char *user_pw,
- const char *secret);
+ const char *user_pw);
/*** Append \a tail to message \a msg. */
int
@@ -439,15 +449,17 @@ int rs_err_conn_push_fl(struct rs_connection *conn,
int line,
const char *fmt,
...);
-int rs_err_connbase_push_fl (struct rs_conn_base *connbase,
- int code,
- const char *file,
- int line,
- const char *fmt,
- ...);
+int rs_err_connbase_push_fl(struct rs_conn_base *connbase,
+ int code,
+ const char *file,
+ int line,
+ const char *fmt,
+ ...);
/** Pop the first error from the error FIFO associated with connection
- \a conn or NULL if there are no errors in the FIFO. */
+ \a conn or NULL if there are no errors in the FIFO. */
struct rs_error *rs_err_conn_pop(struct rs_connection *conn);
+struct rs_error *rs_err_connbase_pop(struct rs_conn_base *connbase);
+struct rs_error *rs_err_listener_pop(struct rs_listener *l);
int rs_err_conn_peek_code (struct rs_connection *conn);
void rs_err_free(struct rs_error *err);
generated by cgit v1.1 at 2024-12-28 03:43:30 +0000