Bringing up TLS connections working.

[radsecproxy.git] / lib / include / radsec / radsec.h

diff --git a/lib/include/radsec/radsec.h b/lib/include/radsec/radsec.h
index 142c0c7..d80c296 100644 (file)
--- a/lib/include/radsec/radsec.h
+++ b/lib/include/radsec/radsec.h
@@ -17,6 +17,9 @@ enum rs_err_code {
     RSE_EVENT = 9,
     RSE_CONNERR = 10,
     RSE_CONFIG = 11,
+    RSE_BADAUTH = 12,
+    RSE_INTERNAL = 13,
+    RSE_SSLERR = 14,
     RSE_SOME_ERROR = 21,
 };
 
@@ -31,7 +34,7 @@ typedef unsigned int rs_conn_type_t;
 
 
 /* Data types.  */
-struct rs_handle;              /* radsec-impl.h */
+struct rs_context;             /* radsec-impl.h */
 struct rs_connection;          /* radsec-impl.h */
 struct rs_packet;              /* radsec-impl.h */
 struct rs_conn;                        /* radsec-impl.h */
@@ -72,14 +75,15 @@ struct rs_conn_callbacks {
 
 /* Function prototypes.  */
 /* Context.  */
-int rs_context_create(struct rs_handle **ctx, const char *dict);
-void rs_context_destroy(struct rs_handle *ctx);
-int rs_context_set_alloc_scheme(struct rs_handle *ctx,
+int rs_context_create(struct rs_context **ctx, const char *dict);
+void rs_context_destroy(struct rs_context *ctx);
+int rs_context_set_alloc_scheme(struct rs_context *ctx,
                                struct rs_alloc_scheme *scheme);
-int rs_context_read_config(struct rs_handle *ctx, const char *config_file);
+int rs_context_read_config(struct rs_context *ctx,
+                          const char *config_file);
 
 /* Connection.  */
-int rs_conn_create(struct rs_handle *ctx, struct rs_connection **conn,
+int rs_conn_create(struct rs_context *ctx, struct rs_connection **conn,
                   const char *config);
 void rs_conn_set_type(struct rs_connection *conn, rs_conn_type_t type);
 int rs_conn_add_listener(struct rs_connection *conn, rs_conn_type_t type,
@@ -95,7 +99,9 @@ int rs_conn_select_server(struct rs_connection *conn, const char *name);
 int rs_conn_get_current_server(struct rs_connection *conn,
                               const char *name, size_t buflen);
 int rs_conn_receive_packet(struct rs_connection *conn,
+                          struct rs_packet *request,
                           struct rs_packet **pkt_out);
+int rs_conn_fd(struct rs_connection *conn);
 
 /* Server and client.  */
 int rs_server_create(struct rs_connection *conn, struct rs_peer **server);
@@ -108,30 +114,29 @@ void rs_server_set_tries(struct rs_peer *server, int tries);
 /* Packet.  */
 int rs_packet_create_acc_request(struct rs_connection *conn,
                                 struct rs_packet **pkt,
-                                const char *user_name,
-                                const char *user_pw);
-//int rs_packet_create_acc_accept(cstruct rs_connection *conn, struct rs_packet **pkt);
-//int rs_packet_create_acc_reject(struct rs_connection *conn, struct rs_packet **pkt);
-//int rs_packet_create_acc_challenge(struct rs_connection *conn, struct rs_packet **pkt);
+                                const char *user_name, /* FIXME: remove? */
+                                const char *user_pw);  /* FIXME: remove? */
 void rs_packet_destroy(struct rs_packet *pkt);
 void rs_packet_add_attr(struct rs_packet *pkt, struct rs_attr *attr);
 int rs_packet_send(struct rs_packet *pkt, void *data);
 struct radius_packet *rs_packet_frpkt(struct rs_packet *pkt);
 
 /* Attribute.  */
+/* FIXME: Replace (or complement) with a wrapper for paircreate().  */
 int rs_attr_create(struct rs_connection *conn, struct rs_attr **attr,
                   const char *type, const char *val);
 void rs_attr_destroy(struct rs_attr *attr);
 
 /* Config.  */
-struct rs_realm *rs_conf_find_realm(struct rs_handle *ctx,
+struct rs_realm *rs_conf_find_realm(struct rs_context *ctx,
                                    const char *name);
 
 /* Error.  */
-int rs_err_ctx_push(struct rs_handle *ctx, int code, const char *fmt, ...);
-int rs_err_ctx_push_fl(struct rs_handle *ctx, int code, const char *file,
+int rs_err_ctx_push(struct rs_context *ctx, int code, const char *fmt,
+                   ...);
+int rs_err_ctx_push_fl(struct rs_context *ctx, int code, const char *file,
                       int line, const char *fmt, ...);
-struct rs_error *rs_err_ctx_pop(struct rs_handle *ctx);
+struct rs_error *rs_err_ctx_pop(struct rs_context *ctx);
 int rs_err_conn_push(struct rs_connection *conn, int code, const char *fmt,
                     ...);
 int rs_err_conn_push_fl(struct rs_connection *conn, int code,