X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=lib%2Finclude%2Fradsec%2Fradsec-impl.h;h=0ecd631b86744e4961877bd066bf86b94d6bf5bf;hb=787ccb8ea4a0c384749338fb4665c790c42af665;hp=59cb8bfacd2ca705aea564445e962b31fdff185f;hpb=dcd224f1fdf864fba1e1c1dd0b3f521fe43e4013;p=radsecproxy.git

diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h
index 59cb8bf..0ecd631 100644
--- a/lib/include/radsec/radsec-impl.h
+++ b/lib/include/radsec/radsec-impl.h
@@ -1,9 +1,12 @@
 /** @file libradsec-impl.h
     @brief Libraray internal header file for libradsec.  */
 
-/* See the file COPYING for licensing information.  */
+/* Copyright 2010-2013 NORDUnet A/S. All rights reserved.
+   See LICENSE for licensing information. */
+
+#ifndef _RADSEC_RADSEC_IMPL_H_
+#define _RADSEC_RADSEC_IMPL_H_ 1
 
-#include <freeradius/libradius.h>
 #include <event2/util.h>
 #include <confuse.h>
 #if defined(RS_ENABLE_TLS)
@@ -50,8 +53,10 @@ struct rs_error {
 struct rs_peer {
     struct rs_connection *conn;
     struct rs_realm *realm;
-    struct evutil_addrinfo *addr;
+    char *hostname;
+    char *service;
     char *secret;               /* RADIUS secret.  */
+    struct evutil_addrinfo *addr_cache;
     struct rs_peer *next;
 };
 
@@ -65,6 +70,7 @@ struct rs_realm {
     char *cacertpath;
     char *certfile;
     char *certkeyfile;
+    int disable_hostname_check;
     struct rs_credentials *transport_cred;
     struct rs_peer *peers;
     struct rs_realm *next;
@@ -72,7 +78,6 @@ struct rs_realm {
 
 /** Top configuration object.  */
 struct rs_config {
-    char *dictionary;
     struct rs_realm *realms;
     cfg_t *cfg;
 };
@@ -81,7 +86,6 @@ struct rs_context {
     struct rs_config *config;
     struct rs_alloc_scheme alloc_scheme;
     struct rs_error *err;
-    fr_randctx fr_randctx;
 };
 
 struct rs_connection {
@@ -114,24 +118,21 @@ struct rs_connection {
 };
 
 enum rs_packet_flags {
-    rs_packet_hdr_read_flag,
-    rs_packet_received_flag,
-    rs_packet_sent_flag,
+    RS_PACKET_HEADER_READ,
+    RS_PACKET_RECEIVED,
+    RS_PACKET_SENT,
 };
 
+struct radius_packet;
+
 struct rs_packet {
     struct rs_connection *conn;
     unsigned int flags;
     uint8_t hdr[RS_HEADER_LEN];
-    RADIUS_PACKET *rpkt;	/* FreeRADIUS object.  */
+    struct radius_packet *rpkt;	/* FreeRADIUS object.  */
     struct rs_packet *next;	/* Used for UDP output queue.  */
 };
 
-/* 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
@@ -148,6 +149,8 @@ struct rs_error *rs_resolv (struct evutil_addrinfo **addr,
 #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" */
 /* End: */