Merge pull request #62 from painless-security/jennifer/report_incoming_ipaddr

[trust_router.git] / common / tr_rp.c

diff --git a/common/tr_rp.c b/common/tr_rp.c
index 35c2714..0b7d08e 100644 (file)
--- a/common/tr_rp.c
+++ b/common/tr_rp.c
@@ -35,92 +35,12 @@
 #include <talloc.h>
 
 #include <tr.h>
-#include <trust_router/tr_name.h>
-#include <tr_gss.h>
+#include <tr_name_internal.h>
+#include <tr_gss_names.h>
 #include <tr_config.h>
 #include <tr_rp.h>
 #include <tr_debug.h>
 
-static int tr_rp_client_destructor(void *obj)
-{
-  return 0;
-}
-
-TR_RP_CLIENT *tr_rp_client_new(TALLOC_CTX *mem_ctx)
-{
-  TR_RP_CLIENT *client=talloc(mem_ctx, TR_RP_CLIENT);
-
-  if (client!=NULL) {
-    client->next=NULL;
-    client->comm_next=NULL;
-    client->gss_names=NULL;
-    client->filters=NULL;
-    talloc_set_destructor((void *)client, tr_rp_client_destructor);
-  }
-  return client;
-}
-
-void tr_rp_client_free(TR_RP_CLIENT *client)
-{
-  talloc_free(client);
-}
-
-static TR_RP_CLIENT *tr_rp_client_tail(TR_RP_CLIENT *client)
-{
-  if (client==NULL)
-    return NULL;
-
-  while (client->next!=NULL)
-    client=client->next;
-  return client;
-}
-
-/* do not call directly, use the tr_rp_client_add() macro */
-TR_RP_CLIENT *tr_rp_client_add_func(TR_RP_CLIENT *clients, TR_RP_CLIENT *new)
-{
-  if (clients==NULL)
-    clients=new;
-  else {
-    tr_rp_client_tail(clients)->next=new;
-    while (new!=NULL) {
-      talloc_steal(clients, new); /* put it in the right context */
-      new=new->next;
-    }
-  }
-  return clients;
-}
-
-
-int tr_rp_client_add_gss_name(TR_RP_CLIENT *rp_client, TR_NAME *gss_name)
-{
-  return tr_gss_names_add(rp_client->gss_names, gss_name);
-}
-
-int tr_rp_client_set_filters(TR_RP_CLIENT *client, TR_FILTER_SET *filts)
-{
-  if (client->filters!=NULL)
-    tr_filter_set_free(client->filters);
-  client->filters=filts;
-  talloc_steal(client, filts);
-  return 0; /* success */
-}
-
-TR_RP_CLIENT *tr_rp_client_lookup(TR_RP_CLIENT *rp_clients, TR_NAME *gss_name)
-{
-  TR_RP_CLIENT *rp = NULL;
-
-  if ((!rp_clients) || (!gss_name)) {
-    tr_debug("tr_rp_client_lookup: Bad parameters.");
-    return NULL;
-  }
-
-  for (rp = rp_clients; NULL != rp; rp = rp->next) {
-    if (tr_gss_names_matches(rp->gss_names, gss_name))
-      return rp;
-  } 
-  return NULL;
-}
-
 TR_RP_REALM *tr_rp_realm_lookup(TR_RP_REALM *rp_realms, TR_NAME *rp_name)
 {
   TR_RP_REALM *rp = NULL;
@@ -255,10 +175,10 @@ TR_RP_REALM *tr_rp_realm_sweep_func(TR_RP_REALM *head)
     return NULL;
 
   /* will not remove the head here, that has already been done */
-  for (rp=head; rp->next!=NULL; rp=rp->next) {
+  for (rp=head; (rp!=NULL) && (rp->next!=NULL); rp=rp->next) {
     if (rp->next->refcount==0) {
       old_next=rp->next;
-      tr_rp_realm_remove(head, rp->next); /* changes rp->next */
+      tr_rp_realm_remove(head, rp->next); /* changes rp->next, may make it null */
       tr_rp_realm_free(old_next);
     }
   }
@@ -295,3 +215,4 @@ char *tr_rp_realm_to_str(TALLOC_CTX *mem_ctx, TR_RP_REALM *rp)
                          "RP realm: \"%.*s\"\n",
                          rp->realm_id->len, rp->realm_id->buf);
 }
+