diff options
Diffstat (limited to 'lib/include')
| -rw-r--r-- | lib/include/radsec/radsec-impl.h | 26 | ||||
| -rw-r--r-- | lib/include/radsec/radsec.h | 4 |
2 files changed, 17 insertions, 13 deletions
diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h index 14801ab..b5dafef 100644 --- a/lib/include/radsec/radsec-impl.h +++ b/lib/include/radsec/radsec-impl.h @@ -23,8 +23,6 @@ typedef unsigned int rs_cred_type_t; extern "C" { #endif -struct rs_packet; - struct rs_credentials { enum rs_cred_type type; char *identity; @@ -37,22 +35,19 @@ struct rs_error { char buf[1024]; }; -struct rs_peer { +struct rs_peer { /* Config object for a connection. */ 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 with a single state member */ char *secret; - int timeout; /* client only */ - int tries; /* client only */ struct rs_peer *next; }; -struct rs_realm { +struct rs_realm { /* Config object for a RADIUS realm. */ char *name; enum rs_conn_type type; + int timeout; + int retries; char *cacertfile; char *cacertpath; char *certfile; @@ -70,15 +65,20 @@ struct rs_context { struct rs_connection { struct rs_context *ctx; - struct event_base *evb; - struct bufferevent *bev; - enum rs_conn_type type; + struct rs_realm *realm; /* Owned by ctx. */ + struct event_base *evb; /* Event base. */ + struct bufferevent *bev; /* Buffer event. */ + 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; + 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; int nextid; int user_dispatch_flag : 1; /* User does the dispatching. */ #if defined(RS_ENABLE_TLS) @@ -125,6 +125,8 @@ int _rs_err_conn_push_err(struct rs_connection *conn, (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)) /* Local Variables: */ /* c-file-style: "stroustrup" */ diff --git a/lib/include/radsec/radsec.h b/lib/include/radsec/radsec.h index d609118..c929111 100644 --- a/lib/include/radsec/radsec.h +++ b/lib/include/radsec/radsec.h @@ -21,6 +21,7 @@ enum rs_err_code { RSE_INTERNAL = 13, RSE_SSLERR = 14, /* OpenSSL error. */ RSE_INVALID_PKT = 15, + RSE_IOTIMEOUT = 16, RSE_SOME_ERROR = 21, /* Unspecified error. Shouldn't happen. */ }; @@ -115,7 +116,7 @@ int rs_server_set_address(struct rs_peer *server, const char *hostname, const char *service); int rs_server_set_secret(struct rs_peer *server, const char *secret); void rs_server_set_timeout(struct rs_peer *server, int timeout); -void rs_server_set_tries(struct rs_peer *server, int tries); +void rs_server_set_retries(struct rs_peer *server, int retries); /* Packet. */ int rs_packet_create(struct rs_connection *conn, struct rs_packet **pkt_out); @@ -149,6 +150,7 @@ 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, const char *file, int line, const char *fmt, ...); struct rs_error *rs_err_conn_pop(struct rs_connection *conn); +int rs_err_conn_peek_code (struct rs_connection *conn); void rs_err_free(struct rs_error *err); char *rs_err_msg(struct rs_error *err, int dofree_flag); int rs_err_code(struct rs_error *err, int dofree_flag); |