Merge pull request #100 from painless-security/milestone/monitoring

[trust_router.git] / common / tr_apc.c

diff --git a/common/tr_apc.c b/common/tr_apc.c
index 06229e6..8f590e8 100644 (file)
--- a/common/tr_apc.c
+++ b/common/tr_apc.c
@@ -34,7 +34,7 @@
 
 #include <talloc.h>
 
-#include <trust_router/tr_name.h>
+#include <tr_name_internal.h>
 #include <tr_apc.h>
 #include <tr_debug.h>
 
@@ -88,10 +88,39 @@ TR_APC *tr_apc_add_func(TR_APC *head, TR_APC *new)
 }
 
 /* does not copy next pointer */
-TR_APC *tr_apc_dup(TALLOC_CTX *mem_ctx, TR_APC *apc)
+TR_APC *tr_apc_dup_one(TALLOC_CTX *mem_ctx, TR_APC *apc)
 {
   TR_APC *new=tr_apc_new(mem_ctx);
-  tr_apc_set_id(new, tr_apc_dup_id(apc));
+  if (new!=NULL) 
+    tr_apc_set_id(new, tr_apc_dup_id(apc));
+  return new;
+}
+
+/* copies next pointer */
+TR_APC *tr_apc_dup(TALLOC_CTX *mem_ctx, TR_APC *apc)
+{
+  TALLOC_CTX *tmp_ctx=talloc_new(NULL);
+  TR_APC *cur=NULL;
+  TR_APC *new=NULL;
+
+  if (apc==NULL)
+    return NULL;
+
+  if (NULL==(new=tr_apc_dup_one(tmp_ctx, apc)))
+    return NULL;
+  
+  for (cur=new,apc=apc->next; apc!=NULL; cur=cur->next,apc=apc->next) {
+    cur->next=tr_apc_dup_one(new, apc);
+    if (cur->next==NULL) {
+      new=NULL;
+      goto cleanup;
+    }
+  }
+
+  talloc_steal(mem_ctx, new);
+
+cleanup:
+  talloc_free(tmp_ctx);
   return new;
 }