Merge pull request #86 from painless-security/jennifer/aaa_server_port

[trust_router.git] / include / tr_idp.h

diff --git a/include/tr_idp.h b/include/tr_idp.h
index 361439c..8b56c37 100644 (file)
--- a/include/tr_idp.h
+++ b/include/tr_idp.h
@@ -38,14 +38,10 @@
 #include <talloc.h>
 #include <time.h>
 
-#include <trust_router/tr_name.h>
+#include <tr_name_internal.h>
+#include <tr_aaa_server.h>
 #include <tr_apc.h>
 
-typedef struct tr_aaa_server {
-  struct tr_aaa_server *next;
-  TR_NAME *hostname;
-} TR_AAA_SERVER;
-
 /* may also want to use in tr_rp.h */
 typedef enum tr_realm_origin {
   TR_REALM_LOCAL=0, /* realm we were configured to contact */
@@ -79,14 +75,16 @@ TR_IDP_REALM *tr_idp_realm_remove_func(TR_IDP_REALM *head, TR_IDP_REALM *remove)
 #define tr_idp_realm_remove(head,remove) ((head)=tr_idp_realm_remove_func((head),(remove)))
 TR_IDP_REALM *tr_idp_realm_sweep_func(TR_IDP_REALM *head);
 #define tr_idp_realm_sweep(head) ((head)=tr_idp_realm_sweep_func((head)))
-char *tr_idp_realm_to_str(TALLOC_CTX *mem_ctx, TR_IDP_REALM *idp);
+int tr_idp_realm_aaa_server_count(TR_IDP_REALM *idp);
+int tr_idp_realm_apc_count(TR_IDP_REALM *idp);
 void tr_idp_realm_incref(TR_IDP_REALM *realm);
-void tr_idp_realm_decref(TR_IDP_REALM *realm);
-
-TR_AAA_SERVER *tr_aaa_server_new(TALLOC_CTX *mem_ctx, TR_NAME *hostname);
-void tr_aaa_server_free(TR_AAA_SERVER *aaa);
 
-TR_AAA_SERVER *tr_idp_aaa_server_lookup(TR_IDP_REALM *idp_realms, TR_NAME *idp_realm_name, TR_NAME *comm);
+void tr_idp_realm_decref(TR_IDP_REALM *realm);
+TR_AAA_SERVER *tr_idp_aaa_server_lookup(TR_IDP_REALM *idp_realms, TR_NAME *idp_realm_name, TR_NAME *comm, int *shared_out);
 TR_AAA_SERVER *tr_default_server_lookup(TR_AAA_SERVER *default_servers, TR_NAME *comm);
 
+/* tr_idp_encoders.c */
+char *tr_idp_realm_to_str(TALLOC_CTX *mem_ctx, TR_IDP_REALM *idp);
+json_t *tr_idp_realms_to_json(TR_IDP_REALM *idp);
+
 #endif