remove rs_packet_frpkt

[libradsec.git] / lib / include / radsec / radsec-impl.h

diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h
index c92d9e9..da4e99c 100644 (file)
--- a/lib/include/radsec/radsec-impl.h
+++ b/lib/include/radsec/radsec-impl.h
@@ -3,8 +3,14 @@
 
 /* See the file COPYING for licensing information.  */
 
-#include <freeradius/libradius.h>
+#ifndef _RADSEC_RADSEC_IMPL_H_
+#define _RADSEC_RADSEC_IMPL_H_ 1
+
 #include <event2/util.h>
+#include <confuse.h>
+#if defined(RS_ENABLE_TLS)
+#include <openssl/ssl.h>
+#endif
 
 /* Constants.  */
 #define RS_HEADER_LEN 4
@@ -16,7 +22,9 @@ enum rs_cred_type {
 };
 typedef unsigned int rs_cred_type_t;
 
-struct rs_packet;
+#if defined (__cplusplus)
+extern "C" {
+#endif
 
 struct rs_credentials {
     enum rs_cred_type type;
@@ -26,52 +34,100 @@ struct rs_credentials {
 
 struct rs_error {
     int code;
-    char *msg;
     char buf[1024];
 };
 
-struct rs_handle {
-    struct rs_alloc_scheme alloc_scheme;
-    struct rs_error *err;
-    fr_randctx fr_randctx;
-    /* TODO: dictionary? */
-};
-
+/** Configuration object for a connection.  */
 struct rs_peer {
     struct rs_connection *conn;
+    struct rs_realm *realm;
     struct evutil_addrinfo *addr;
-    int fd;            /* Socket.  */
-    char is_connecting;        /* FIXME: replace with a single state member */
-    char is_connected; /* FIXME: replace */
     char *secret;
-    int timeout;               /* client only */
-    int tries;                 /* client only */
     struct rs_peer *next;
 };
 
-struct rs_connection {
-    struct rs_handle *ctx;
-    struct event_base *evb;
-    struct bufferevent *bev;
+/** Configuration object for a RADIUS realm.  */
+struct rs_realm {
+    char *name;
     enum rs_conn_type type;
+    int timeout;
+    int retries;
+    char *cacertfile;
+    char *cacertpath;
+    char *certfile;
+    char *certkeyfile;
+    struct rs_peer *peers;
+    struct rs_realm *next;
+};
+
+/** Top configuration object.  */
+struct rs_config {
+    char *dictionary;
+    struct rs_realm *realms;
+    cfg_t *cfg;
+};
+
+struct rs_context {
+    struct rs_config *config;
+    struct rs_alloc_scheme alloc_scheme;
+    struct rs_error *err;
+};
+
+struct rs_connection {
+    struct rs_context *ctx;
+    struct rs_realm *realm;    /* Owned by ctx.  */
+    struct event_base *evb;    /* Event base.  */
+    struct event *tev;         /* Timeout event.  */
     struct rs_credentials transport_credentials;
     struct rs_conn_callbacks callbacks;
+    void *user_data;
     struct rs_peer *peers;
     struct rs_peer *active_peer;
     struct rs_error *err;
+    struct timeval timeout;
+    char is_connecting;                /* FIXME: replace with a single state member */
+    char is_connected;         /* FIXME: replace with a single state member */
+    int fd;                    /* Socket.  */
+    int tryagain;              /* For server failover.  */
+    int nextid;                        /* Next RADIUS packet identifier.  */
+    /* TCP transport specifics.  */
+    struct bufferevent *bev;   /* Buffer event.  */
+    /* UDP transport specifics.  */
+    struct event *wev;         /* Write event (for UDP).  */
+    struct event *rev;         /* Read event (for UDP).  */
+    struct rs_packet *out_queue; /* Queue for outgoing UDP packets.  */
+#if defined(RS_ENABLE_TLS)
+    /* TLS specifics.  */
+    SSL_CTX *tls_ctx;
+    SSL *tls_ssl;
+#endif
 };
 
+enum rs_packet_flags {
+    rs_packet_hdr_read_flag,
+    rs_packet_received_flag,
+    rs_packet_sent_flag,
+};
+
+struct radius_packet;
+
 struct rs_packet {
     struct rs_connection *conn;
-    char hdr_read_flag;
-    uint8_t hdr[4];
-    RADIUS_PACKET *rpkt;
+    unsigned int flags;
+    uint8_t hdr[RS_HEADER_LEN];
+    struct radius_packet *rpkt;        /* FreeRADIUS object.  */
+    struct rs_packet *next;    /* Used for UDP output queue.  */
 };
 
-struct rs_attr {
-    struct rs_packet *pkt;
-    VALUE_PAIR *vp;
-};
+/* Nonpublic functions (in radsec.c -- FIXME: move?).  */
+struct rs_error *rs_resolv (struct evutil_addrinfo **addr,
+                           rs_conn_type_t type,
+                           const char *hostname,
+                           const char *service);
+
+#if defined (__cplusplus)
+}
+#endif
 
 /* Convenience macros.  */
 #define rs_calloc(h, nmemb, size) \
@@ -82,6 +138,10 @@ struct rs_attr {
     (h->alloc_scheme.free ? h->alloc_scheme.free : free)(ptr)
 #define rs_realloc(h, realloc, ptr, size) \
     (h->alloc_scheme.realloc ? h->alloc_scheme.realloc : realloc)(ptr, size)
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#define max(a, b) ((a) > (b) ? (a) : (b))
+
+#endif /* _RADSEC_RADSEC_IMPL_H_ */
 
 /* Local Variables: */
 /* c-file-style: "stroustrup" */