diff options
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/attr.c | 4 | ||||
| -rw-r--r-- | lib/debug.c | 4 | ||||
| -rw-r--r-- | lib/err.c | 6 | ||||
| -rw-r--r-- | lib/examples/Makefile | 2 | ||||
| -rw-r--r-- | lib/examples/client-blocking.c | 2 | ||||
| -rw-r--r-- | lib/include/radsec/libradsec.h | 121 | ||||
| -rw-r--r-- | lib/include/radsec/radsec-impl.h (renamed from lib/include/radsec/libradsec-impl.h) | 0 | ||||
| -rw-r--r-- | lib/packet.c | 4 | ||||
| -rw-r--r-- | lib/radsec.c | 13 |
10 files changed, 19 insertions, 139 deletions
diff --git a/lib/Makefile b/lib/Makefile index 3575305..cb64ed4 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -11,7 +11,7 @@ all: libradsec.a libradsec.a: $(OFILES) ar rc $@ $^ -$(OFILES): include/radsec/libradsec.h include/radsec/libradsec-impl.h +$(OFILES): include/radsec/radsec.h include/radsec/radsec-impl.h doc: doxygen @@ -1,8 +1,8 @@ /* See the file COPYING for licensing information. */ #include <freeradius/libradius.h> -#include <radsec/libradsec.h> -#include <radsec/libradsec-impl.h> +#include <radsec/radsec.h> +#include <radsec/radsec-impl.h> int rs_attr_create(struct rs_connection *conn, struct rs_attr **attr, const char *type, const char *val) diff --git a/lib/debug.c b/lib/debug.c index 26e2403..e6c6afe 100644 --- a/lib/debug.c +++ b/lib/debug.c @@ -2,8 +2,8 @@ #include <stdio.h> #include <freeradius/libradius.h> -#include <radsec/libradsec.h> -#include <radsec/libradsec-impl.h> +#include <radsec/radsec.h> +#include <radsec/radsec-impl.h> #include "debug.h" /* From freeradius-server/src/lib/radius.c */ @@ -3,8 +3,8 @@ #include <stdio.h> #include <string.h> #include <assert.h> -#include <radsec/libradsec.h> -#include <radsec/libradsec-impl.h> +#include <radsec/radsec.h> +#include <radsec/radsec-impl.h> const char *_errtxt[] = { "SUCCESS", /* 0 RSE_OK */ @@ -52,7 +52,7 @@ _err_new (unsigned int code, const char *file, int line, const char *fmt, va_lis sizeof(err->buf)); n = strlen (err->buf); } - if (n >= 0) + if (n >= 0 && file) { char *sep = strrchr (file, '/'); if (sep) diff --git a/lib/examples/Makefile b/lib/examples/Makefile index 618afdb..2771542 100644 --- a/lib/examples/Makefile +++ b/lib/examples/Makefile @@ -1,6 +1,6 @@ CFLAGS = -Wall -g -I ../include -HFILES = ../include/radsec/libradsec.h ../include/radsec/libradsec-impl.h +HFILES = ../include/radsec/radsec.h ../include/radsec/radsec-impl.h all: client-blocking diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c index 0d2a58a..f14e280 100644 --- a/lib/examples/client-blocking.c +++ b/lib/examples/client-blocking.c @@ -6,7 +6,7 @@ #include <stdlib.h> #include <event2/event.h> #include <freeradius/libradius.h> -#include <radsec/libradsec.h> +#include <radsec/radsec.h> #define SECRET "sikrit" #define USER_NAME "bob" diff --git a/lib/include/radsec/libradsec.h b/lib/include/radsec/libradsec.h deleted file mode 100644 index ce6940e..0000000 --- a/lib/include/radsec/libradsec.h +++ /dev/null @@ -1,121 +0,0 @@ -/** @file libradsec.h - @brief Header file for libradsec. */ -/* See the file COPYING for licensing information. */ - -#include <unistd.h> - -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; /* <freeradius/libradius.h> */ -struct event_base; /* <event2/event-internal.h> */ - -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); -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/include/radsec/libradsec-impl.h b/lib/include/radsec/radsec-impl.h index 3abb71e..3abb71e 100644 --- a/lib/include/radsec/libradsec-impl.h +++ b/lib/include/radsec/radsec-impl.h diff --git a/lib/packet.c b/lib/packet.c index 8d9be93..63e2b60 100644 --- a/lib/packet.c +++ b/lib/packet.c @@ -5,8 +5,8 @@ #include <freeradius/libradius.h> #include <event2/event.h> #include <event2/bufferevent.h> -#include <radsec/libradsec.h> -#include <radsec/libradsec-impl.h> +#include <radsec/radsec.h> +#include <radsec/radsec-impl.h> #if defined DEBUG #include "debug.h" #endif diff --git a/lib/radsec.c b/lib/radsec.c index 6d0308d..058d0f8 100644 --- a/lib/radsec.c +++ b/lib/radsec.c @@ -9,8 +9,8 @@ #include <freeradius/libradius.h> #include <event2/event.h> #include <event2/util.h> -#include <radsec/libradsec.h> -#include <radsec/libradsec-impl.h> +#include <radsec/radsec.h> +#include <radsec/radsec-impl.h> int rs_context_create(struct rs_handle **ctx, const char *dict) @@ -103,8 +103,7 @@ _resolv (struct rs_connection *conn, const char *hostname, int port) snprintf (portstr, sizeof(portstr), "%d", port); memset (&hints, 0, sizeof(struct evutil_addrinfo)); - //hints.ai_family = AF_UNSPEC; /* v4 or v6. */ - hints.ai_family = AF_INET; /* FIXME: v4 only, while debuging */ + hints.ai_family = AF_UNSPEC; /* v4 or v6. */ hints.ai_flags = AI_ADDRCONFIG; switch (conn->type) { @@ -112,11 +111,13 @@ _resolv (struct rs_connection *conn, const char *hostname, int port) rs_conn_err_push_fl (conn, RSE_INVALID_CONN, __FILE__, __LINE__, NULL); return NULL; case RS_CONN_TYPE_TCP: + /* Fall through. */ case RS_CONN_TYPE_TLS: hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP; break; case RS_CONN_TYPE_UDP: + /* Fall through. */ case RS_CONN_TYPE_DTLS: hints.ai_socktype = SOCK_DGRAM; hints.ai_protocol = IPPROTO_UDP; @@ -125,7 +126,7 @@ _resolv (struct rs_connection *conn, const char *hostname, int port) err = evutil_getaddrinfo (hostname, portstr, &hints, &res); if (err) rs_conn_err_push_fl (conn, RSE_BADADDR, __FILE__, __LINE__, - " %s:%d: bad host name or port (%s)", + "%s:%d: bad host name or port (%s)", hostname, port, evutil_gai_strerror(err)); return res; /* Simply use first result. */ } @@ -180,7 +181,7 @@ rs_conn_add_server(struct rs_connection *conn, struct rs_peer **server, } if (*server) *server = srv; - return srv ? RSE_OK : rs_conn_err_push (conn, RSE_NOMEM, NULL); + return srv ? RSE_OK : -1; } void rs_server_set_timeout(struct rs_peer *server, int timeout) |