From: Linus Nordberg Date: Sun, 3 Oct 2010 13:39:08 +0000 (+0200) Subject: WIP X-Git-Tag: libradsec-0.0.1~122 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=radsecproxy.git;a=commitdiff_plain;h=81aa93c41def5b73bc5523de852c429355926e93 WIP --- diff --git a/lib/Makefile b/lib/Makefile index cb64ed4..c622dc2 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -4,6 +4,7 @@ OFILES = attr.o \ debug.o \ err.o \ packet.o \ + request.o \ radsec.o all: libradsec.a diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h index 5c85f26..c92d9e9 100644 --- a/lib/include/radsec/radsec-impl.h +++ b/lib/include/radsec/radsec-impl.h @@ -40,7 +40,7 @@ struct rs_handle { struct rs_peer { struct rs_connection *conn; struct evutil_addrinfo *addr; - int s; /* Socket. */ + int fd; /* Socket. */ char is_connecting; /* FIXME: replace with a single state member */ char is_connected; /* FIXME: replace */ char *secret; diff --git a/lib/include/radsec/radsec.h b/lib/include/radsec/radsec.h new file mode 100644 index 0000000..158ca2a --- /dev/null +++ b/lib/include/radsec/radsec.h @@ -0,0 +1,122 @@ +/** @file libradsec.h + @brief Header file for libradsec. */ +/* See the file COPYING for licensing information. */ + +#include + +enum rs_err_code { + RSE_OK = 0, + RSE_NOMEM = 1, + RSE_NOSYS = 2, + RSE_INVALID_CTX = 3, + RSE_INVALID_CONN = 4, + RSE_CONN_TYPE_MISMATCH = 5, + RSE_FR = 6, + RSE_BADADDR = 7, + RSE_NOPEER = 8, + RSE_EVENT = 9, + RSE_CONNERR = 10, + RSE_SOME_ERROR = 21, +}; + +enum rs_conn_type { + RS_CONN_TYPE_NONE = 0, + RS_CONN_TYPE_UDP, + RS_CONN_TYPE_TCP, + RS_CONN_TYPE_TLS, + RS_CONN_TYPE_DTLS, +}; +typedef unsigned int rs_conn_type_t; + + +/* Data types. */ +struct rs_handle; /* radsec-impl.h */ +struct rs_connection; /* radsec-impl.h */ +struct rs_packet; /* radsec-impl.h */ +struct rs_conn; /* radsec-impl.h */ +struct rs_attr; /* radsec-impl.h */ +struct rs_error; /* radsec-impl.h */ +struct rs_peer; /* radsec-impl.h */ +struct radius_packet; /* */ +struct event_base; /* */ + +typedef void * (*rs_calloc_fp)(size_t nmemb, size_t size); +typedef void * (*rs_malloc_fp)(size_t size); +typedef void (*rs_free_fp)(void *ptr); +typedef void * (*rs_realloc_fp)(void *ptr, size_t size); +struct rs_alloc_scheme { + rs_calloc_fp calloc; + rs_malloc_fp malloc; + rs_free_fp free; + rs_realloc_fp realloc; +}; + +typedef void (*rs_conn_connected_cb)(void *user_data /* FIXME: peer? */); +typedef void (*rs_conn_disconnected_cb)(void *user_data /* FIXME: reason? */); +typedef void (*rs_conn_packet_received_cb)(const struct rs_packet *packet, + void *user_data); +typedef void (*rs_conn_packet_sent_cb)(void *user_data); +struct rs_conn_callbacks { + /** Callback invoked when the connection has been established. */ + rs_conn_connected_cb connected_cb; + /** Callback invoked when the connection has been torn down. */ + rs_conn_disconnected_cb disconnected_cb; + /** Callback invoked when a packet was received. */ + rs_conn_packet_received_cb received_cb; + /** Callback invoked when a packet was successfully sent. */ + rs_conn_packet_sent_cb sent_cb; +}; + + +/* 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, struct rs_alloc_scheme *scheme); +int rs_context_config_read(struct rs_handle *ctx, const char *config_file); + +/* Server and client configuration. */ +void rs_server_set_timeout(struct rs_peer *server, int timeout); +void rs_server_set_tries(struct rs_peer *server, int tries); +int rs_server_set_secret(struct rs_peer *server, const char *secret); + +/* Connection. */ +int rs_conn_create(struct rs_handle *ctx, struct rs_connection **conn); +int rs_conn_add_server(struct rs_connection *conn, struct rs_peer **server, 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); +void rs_conn_destroy(struct rs_connection *conn); +int rs_conn_set_eventbase(struct rs_connection *conn, struct event_base *eb); +int rs_conn_set_callbacks(struct rs_connection *conn, struct rs_conn_callbacks *cb); +struct rs_conn_callbacks *rs_conn_get_callbacks(struct rs_connection *conn); +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 **pkt_out); + +/* 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); +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. */ +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); + +/* Error. */ +int rs_ctx_err_push(struct rs_handle *ctx, int code, const char *fmt, ...); +int rs_ctx_err_push_fl(struct rs_handle *ctx, int code, const char *file, int line, const char *fmt, ...); +struct rs_error *rs_ctx_err_pop (struct rs_handle *ctx); +int rs_conn_err_push(struct rs_connection *conn, int code, const char *fmt, ...); +int rs_conn_err_push_fl(struct rs_connection *conn, int code, const char *file, int line, const char *fmt, ...); +struct rs_error *rs_conn_err_pop (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); + +/* Local Variables: */ +/* c-file-style: "stroustrup" */ +/* End: */ diff --git a/lib/packet.c b/lib/packet.c index 9a27e8c..79c140d 100644 --- a/lib/packet.c +++ b/lib/packet.c @@ -219,14 +219,20 @@ _init_evb (struct rs_connection *conn) static int _init_socket (struct rs_connection *conn, struct rs_peer *p) { - if (p->s < 0) + if (p->fd != -1) + return RSE_OK; + + assert (p->addr); + p->fd = socket (p->addr->ai_family, p->addr->ai_socktype, + p->addr->ai_protocol); + if (p->fd < 0) + return rs_conn_err_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__, + strerror (errno)); + if (evutil_make_socket_nonblocking (p->fd) < 0) { - assert (p->addr); - p->s = socket (p->addr->ai_family, p->addr->ai_socktype, - p->addr->ai_protocol); - if (p->s < 0) - return rs_conn_err_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__, - strerror (errno)); + evutil_closesocket (p->fd); + return rs_conn_err_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__, + strerror (errno)); } return RSE_OK; } @@ -244,7 +250,7 @@ _init_bev (struct rs_connection *conn, struct rs_peer *peer) { if (!conn->bev) { - conn->bev = bufferevent_socket_new (conn->evb, peer->s, 0); + conn->bev = bufferevent_socket_new (conn->evb, peer->fd, 0); if (!conn->bev) return rs_conn_err_push_fl (conn, RSE_EVENT, __FILE__, __LINE__, "bufferevent_socket_new"); @@ -340,7 +346,7 @@ rs_packet_send (struct rs_packet *pkt, void *user_data) assert (conn->evb); assert (conn->bev); assert (conn->active_peer); - assert (conn->active_peer->s >= 0); + assert (conn->active_peer->fd >= 0); if (conn->callbacks.connected_cb || conn->callbacks.disconnected_cb || conn->callbacks.received_cb || conn->callbacks.sent_cb) @@ -376,7 +382,7 @@ rs_conn_receive_packet (struct rs_connection *conn, struct rs_packet **pkt_out) assert (conn->evb); assert (conn->bev); assert (conn->active_peer); - assert (conn->active_peer->s >= 0); + assert (conn->active_peer->fd >= 0); bufferevent_setwatermark (conn->bev, EV_READ, RS_HEADER_LEN, 0); bufferevent_enable (conn->bev, EV_READ); diff --git a/lib/radsec.c b/lib/radsec.c index 058d0f8..3a2f5f7 100644 --- a/lib/radsec.c +++ b/lib/radsec.c @@ -146,7 +146,7 @@ _peer_new (struct rs_connection *conn, const char *hostname, int port) { memset (p, 0, sizeof(struct rs_peer)); p->conn = conn; - p->s = -1; + p->fd = -1; p->addr = addr; p->next = conn->peers; if (conn->peers)