Use TR_LIST for TR_GSS_NAMES

[trust_router.git] / common / tests / cfg_test.c

diff --git a/common/tests/cfg_test.c b/common/tests/cfg_test.c
index d8a0117..29a949d 100644 (file)
--- a/common/tests/cfg_test.c
+++ b/common/tests/cfg_test.c
@@ -36,11 +36,12 @@
 #include <talloc.h>
 #include <assert.h>
 
-#include <trust_router/tr_name.h>
+#include <tr_name_internal.h>
 #include <tr_comm.h>
 #include <tr_idp.h>
 #include <tr_config.h>
 #include <tr_debug.h>
+#include <tr_gss_names.h>
 
 static void tr_talloc_log(const char *msg)
 {
@@ -51,16 +52,15 @@ static int verify_idp_cfg(TR_CFG *cfg)
 {
   TR_COMM *comm=NULL;
   TR_NAME *name=NULL;
-  TR_APC *apc=NULL;
   TR_IDP_REALM *idp_realm=NULL;
   TR_AAA_SERVER *aaa=NULL;
 
   assert(cfg!=NULL);
 
   /* test the comms attribute */
-  assert(cfg->comms!=NULL);
+  assert(cfg->ctable!=NULL);
   name=tr_new_name("apc.example.com");
-  comm=tr_comm_lookup(cfg->comms, name);
+  comm=tr_comm_table_find_comm(cfg->ctable, name);
   tr_free_name(name);
   assert(comm!=NULL);
 
@@ -69,9 +69,8 @@ static int verify_idp_cfg(TR_CFG *cfg)
   assert(comm->apcs==NULL);
 
   name=tr_new_name("A.idp.cfg");
-  for (idp_realm=comm->idp_realms;
-       (idp_realm!=NULL) && (tr_name_cmp(name, idp_realm->realm_id)!=0);
-       idp_realm=idp_realm->comm_next) { }
+  assert(name!=NULL);
+  idp_realm=tr_comm_find_idp(cfg->ctable, comm, name);
   assert(idp_realm!=NULL);
   assert(idp_realm->shared_config==0);
   assert(idp_realm->origin==TR_REALM_LOCAL);
@@ -100,37 +99,35 @@ static int verify_idp_cfg(TR_CFG *cfg)
 
 static int verify_rp_cfg(TR_CFG *cfg)
 {
-  int ii=0;
   TR_NAME *name=NULL;
 
   assert(cfg!=NULL);
   assert(cfg->rp_clients!=NULL);
   assert(cfg->rp_clients->next==NULL);
   assert(cfg->rp_clients->comm_next==NULL);
-  /* need to update next test to use TR_GSS_NAMES structure */
-#if 0
-  for (ii=1; ii<TR_MAX_GSS_NAMES; ii++)
-    assert(cfg->rp_clients->gss_names[ii]==NULL);
-  assert(cfg->rp_clients->gss_names[0]!=NULL);
+
+  assert(cfg->rp_clients->gss_names!=NULL);
+  assert(tr_gss_names_length(cfg->rp_clients->gss_names) == 1);
   name=tr_new_name("gss@example.com");
-  assert(tr_name_cmp(name, cfg->rp_clients->gss_names[0])==0);
-#endif
+  assert(tr_name_cmp(name, tr_gss_names_index(cfg->rp_clients->gss_names, 0))==0);
   return 0;
 }
 
 int main(void)
 {
   TALLOC_CTX *mem_ctx=talloc_new(NULL);
-  TR_CFG *cfg=NULL;
+  TR_CFG_MGR *cfg_mgr=NULL;
   TR_CFG_RC rc=TR_CFG_ERROR;
+  char *fname=NULL;
 
   tr_log_open();
 
   talloc_set_log_fn(tr_talloc_log);
-  cfg=tr_cfg_new(mem_ctx);
+  cfg_mgr=tr_cfg_mgr_new(mem_ctx);
 
   printf("Parsing idp.cfg.\n");
-  rc=tr_cfg_parse_one_config_file(cfg, "idp.cfg");
+  fname="idp.cfg";
+  rc=tr_parse_config(cfg_mgr, 1, &fname);
   switch(rc) {
   case TR_CFG_SUCCESS:
     tr_debug("main: TR_CFG_SUCCESS");
@@ -150,55 +147,21 @@ int main(void)
   }
 
   printf("Verifying IDP parse results... ");
-  if (verify_idp_cfg(cfg)!=0) {
+  if (verify_idp_cfg(cfg_mgr->new)!=0) {
     printf("Error!\n");
     exit(-1);
   }
   printf("success!\n");
 
   printf("Verifying RP parse results... ");
-  if (verify_rp_cfg(cfg)!=0) {
+  if (verify_rp_cfg(cfg_mgr->new)!=0) {
     printf("Error!\n");
     exit(-1);
   }
   printf("success!\n");
 
   talloc_report_full(mem_ctx, stderr);
-  tr_cfg_free(cfg);
-
-  printf("Cleared configuration for next test.\n\n");
-
-  cfg=tr_cfg_new(mem_ctx);
-  
-  printf("Parsing rp.cfg.\n");
-  rc=tr_cfg_parse_one_config_file(cfg, "rp.cfg");
-  switch(rc) {
-  case TR_CFG_SUCCESS:
-    tr_debug("main: TR_CFG_SUCCESS");
-    break;
-  case TR_CFG_ERROR:
-    tr_debug("main: TR_CFG_ERROR");
-    break;
-  case TR_CFG_BAD_PARAMS:
-    tr_debug("main: TR_CFG_BAD_PARAMS");
-    break;
-  case TR_CFG_NOPARSE:
-    tr_debug("main: TR_CFG_NOPARSE");
-    break;
-  case TR_CFG_NOMEM:
-    tr_debug("main: TR_CFG_NOMEM");
-    break;
-  }
-
-#if 0
-  printf("Verifying RP parse results... ");
-  if (verify_rp_cfg(cfg)!=0) {
-    printf("Error!\n");
-    exit(-1);
-  }
-  printf("success!\n");
-#endif
-
+  tr_cfg_mgr_free(cfg_mgr);
   talloc_free(mem_ctx);
   return 0;
 }