--- libaitcfg/src/parse.c	2012/04/03 12:54:49	1.6.4.3
+++ libaitcfg/src/parse.c	2012/04/03 13:47:23	1.6.4.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.6.4.3 2012/04/03 12:54:49 misho Exp $
+* $Id: parse.c,v 1.6.4.4 2012/04/03 13:47:23 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -255,29 +255,40 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 	return 0;
 }
 
-#if 0
 /*
- * ConcatConfig() Concat two list in one
- * @cfg = Head list element of main list
- * @add_cfg = Head list element of added list
- * return: 0 ok; -1 error:: can`t concat lists
-*/
-int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg)
+ * cfgConcatConfig() - Concat two configs into one
+ *
+ * @cfg = Config root
+ * @add_cfg = Concated config will be destroy after merge
+ * return: -1 error or 0 ok
+ */
+int
+cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg)
 {
-	struct tagPair *item;
-	int ret = 0;
+	struct tagCfg *item;
 
 	if (!cfg || !add_cfg)
 		return -1;
 
-	for (item = cfg->slh_first; item->sle_next; item = item->sle_next);
-	item->sle_next = add_cfg->slh_first;
+	CFG_RC_LOCK(add_cfg);
+	CFG_RC_LOCK(cfg);
 
-	add_cfg->slh_first = NULL;
+	/* concat lists */
+	for (item = SLIST_FIRST(cfg); SLIST_NEXT(item, cfg_next); item = SLIST_NEXT(item, cfg_next));
+	SLIST_NEXT(item, cfg_next) = SLIST_FIRST(add_cfg);
 
-	return ret;
+	/* concat red-black trees */
+	SLIST_FOREACH(item, add_cfg, cfg_next)
+		RB_INSERT(tagRC, cfg, item);
+
+	CFG_RC_UNLOCK(cfg);
+	CFG_RC_UNLOCK(add_cfg);
+
+	add_cfg->slh_first = NULL;
+	add_cfg->rbh_root = NULL;
+	pthread_mutex_destroy(&add_cfg->rc_mtx);
+	return 0;
 }
-#endif
 
 /*
  * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg