Fix community table sweep / removal. Trust router now stable.

[trust_router.git] / common / tr_idp.c

diff --git a/common/tr_idp.c b/common/tr_idp.c
index 2ef9e93..bcbbd8d 100644 (file)
--- a/common/tr_idp.c
+++ b/common/tr_idp.c
@@ -33,10 +33,12 @@
  */
 
 #include <talloc.h>
+#include <time.h>
 
 #include <trust_router/tr_name.h>
 #include <tr_idp.h>
 #include <tr_config.h>
+#include <tr_debug.h>
 
 static int tr_aaa_server_destructor(void *obj)
 {
@@ -113,6 +115,64 @@ TR_IDP_REALM *tr_idp_realm_new(TALLOC_CTX *mem_ctx)
   return idp;
 }
 
+void tr_idp_realm_free(TR_IDP_REALM *idp)
+{
+  talloc_free(idp);
+}
+
+TR_NAME *tr_idp_realm_get_id(TR_IDP_REALM *idp)
+{
+  if (idp==NULL)
+    return NULL;
+  
+  return idp->realm_id;
+}
+
+TR_NAME *tr_idp_realm_dup_id(TR_IDP_REALM *idp)
+{
+  if (idp==NULL)
+    return NULL;
+  
+  return tr_dup_name(tr_idp_realm_get_id(idp));
+}
+
+void tr_idp_realm_set_id(TR_IDP_REALM *idp, TR_NAME *id)
+{
+  if (idp->realm_id!=NULL)
+    tr_free_name(idp->realm_id);
+  idp->realm_id=id;
+}
+
+void tr_idp_realm_set_apcs(TR_IDP_REALM *idp, TR_APC *apc)
+{
+  if (idp->apcs!=NULL)
+    tr_apc_free(idp->apcs);
+  idp->apcs=apc;
+  talloc_steal(idp, apc);
+}
+
+TR_APC *tr_idp_realm_get_apcs(TR_IDP_REALM *idp)
+{
+  return idp->apcs;
+}
+
+TR_IDP_REALM *tr_idp_realm_lookup(TR_IDP_REALM *idp_realms, TR_NAME *idp_name)
+{
+  TR_IDP_REALM *idp = NULL;
+
+  if (!idp_name) {
+    tr_debug("tr_idp_realm_lookup: Bad parameters.");
+    return NULL;
+  }
+
+  for (idp=idp_realms; NULL!=idp; idp=idp->next) {
+    if (0==tr_name_cmp(tr_idp_realm_get_id(idp), idp_name))
+      return idp;
+  } 
+  return NULL;
+}
+
+
 static TR_IDP_REALM *tr_idp_realm_tail(TR_IDP_REALM *idp)
 {
   if (idp==NULL)
@@ -123,8 +183,8 @@ static TR_IDP_REALM *tr_idp_realm_tail(TR_IDP_REALM *idp)
   return idp;
 }
 
-/* for correct behavior, call like: idp_realms=tr_idp_realm_add(idp_realms, new_realm); */
-TR_IDP_REALM *tr_idp_realm_add(TR_IDP_REALM *head, TR_IDP_REALM *new)
+/* do not call directly, use the tr_idp_realm_add() macro */
+TR_IDP_REALM *tr_idp_realm_add_func(TR_IDP_REALM *head, TR_IDP_REALM *new)
 {
   if (head==NULL)
     head=new;
@@ -138,6 +198,37 @@ TR_IDP_REALM *tr_idp_realm_add(TR_IDP_REALM *head, TR_IDP_REALM *new)
   return head;
 }
 
+/* use the macro */
+TR_IDP_REALM *tr_idp_realm_remove_func(TR_IDP_REALM *head, TR_IDP_REALM *remove)
+{
+  TALLOC_CTX *list_ctx=talloc_parent(head);
+  TR_IDP_REALM *this=NULL;
+
+  if (head==NULL)
+    return NULL;
+
+  if (head==remove) {
+    /* if we're removing the head, put the next element (if present) into the context
+     * the list head was in. */
+    head=head->next;
+    if (head!=NULL) {
+      talloc_steal(list_ctx, head);
+      /* now put all the other elements in the context of the list head */
+      for (this=head->next; this!=NULL; this=this->next)
+        talloc_steal(head, this);
+    }
+  } else {
+    /* not removing the head; no need to play with contexts */
+    for (this=head; this->next!=NULL; this=this->next) {
+      if (this->next==remove) {
+        this->next=remove->next;
+        break;
+      }
+    }
+  }
+  return head;
+}
+
 static int tr_idp_realm_apc_count(TR_IDP_REALM *idp)
 {
   int ii=0;
@@ -237,3 +328,46 @@ char *tr_idp_realm_to_str(TALLOC_CTX *mem_ctx, TR_IDP_REALM *idp)
   talloc_free(tmp_ctx);
   return result;
 }
+
+void tr_idp_realm_incref(TR_IDP_REALM *realm)
+{
+  realm->refcount++;
+}
+
+void tr_idp_realm_decref(TR_IDP_REALM *realm)
+{
+  if (realm->refcount>0)
+    realm->refcount--;
+}
+
+/* remove any with zero refcount 
+ * Call via macro. */
+TR_IDP_REALM *tr_idp_realm_sweep_func(TR_IDP_REALM *head)
+{
+  TR_IDP_REALM *idp=NULL;
+  TR_IDP_REALM *old_next=NULL;
+
+  if (head==NULL)
+    return NULL;
+
+  while ((head!=NULL) && (head->refcount==0)) {
+    idp=head; /* keep a pointer so we can remove it */
+    tr_idp_realm_remove(head, idp); /* use this to get talloc contexts right */
+    tr_idp_realm_free(idp);
+  }
+
+  if (head==NULL)
+    return NULL;
+
+  /* will not remove the head here, that has already been done */
+  for (idp=head; idp->next!=NULL; idp=idp->next) {
+    if (idp->next->refcount==0) {
+      old_next=idp->next;
+      tr_idp_realm_remove(head, idp->next); /* changes idp->next */
+      tr_idp_realm_free(old_next);
+    }
+  }
+
+  return head;
+}
+