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

[trust_router.git] / include / tr_config.h

diff --git a/include/tr_config.h b/include/tr_config.h
index e83071c..47be960 100644 (file)
--- a/include/tr_config.h
+++ b/include/tr_config.h
@@ -41,7 +41,7 @@
 #include <syslog.h>
 #include <sys/time.h>
 #include <talloc.h>
-#include <gmodule.h>
+#include <glib.h>
 
 #include <tr_comm.h>
 #include <tr_rp.h>
@@ -53,6 +53,7 @@
 #define TR_DEFAULT_MAX_TREE_DEPTH 12
 #define TR_DEFAULT_TRPS_PORT 12308
 #define TR_DEFAULT_TIDS_PORT 12309
+#define TR_DEFAULT_MONITORING_PORT 0 /* defaults to being turned off */
 #define TR_DEFAULT_LOG_THRESHOLD LOG_INFO
 #define TR_DEFAULT_CONSOLE_THRESHOLD LOG_NOTICE
 #define TR_DEFAULT_APC_EXPIRATION_INTERVAL 43200
@@ -75,9 +76,9 @@ typedef enum tr_cfg_rc {
 
 typedef struct tr_cfg_internal {
   unsigned int max_tree_depth;
-  unsigned int tids_port;
-  unsigned int trps_port;
-  unsigned int monitoring_port;
+  int tids_port;
+  int trps_port;
+  int mons_port;
   const char *hostname;
   int log_threshold;
   int console_threshold;
@@ -89,6 +90,7 @@ typedef struct tr_cfg_internal {
   unsigned int tid_req_timeout;
   unsigned int tid_resp_numer; /* numerator of fraction of AAA servers to wait for in unshared mode */
   unsigned int tid_resp_denom; /* denominator of fraction of AAA servers to wait for in unshared mode */
+  TR_GSS_NAMES *monitoring_credentials;
 } TR_CFG_INTERNAL;
 
 /* record of files loaded for this configuration */
@@ -150,7 +152,7 @@ TR_APC *tr_cfg_parse_apcs(TALLOC_CTX *mem_ctx, json_t *japcs, TR_CFG_RC *rc);
 
 /* tr_config_rp_clients.c */
 TR_RP_CLIENT *tr_cfg_parse_rp_clients(TALLOC_CTX *mem_ctx, json_t *jrealms, TR_CFG_RC *rc);
-TR_GSS_NAMES *tr_cfg_parse_gss_names(TALLOC_CTX *mem_ctx, json_t *jgss_names, TR_CFG_RC *rc);
+TR_CFG_RC tr_cfg_parse_gss_names(TALLOC_CTX *mem_ctx, json_t *jgss_names, TR_GSS_NAMES **gssn_out);
 
 /* tr_config_encoders.c */
 json_t *tr_cfg_files_to_json_array(TR_CFG *cfg);