1 files changed, 19 insertions, 20 deletions

diff --git a/ecp/server/dir.c b/ecp/server/dir.c
index b941050..8064d0c 100644
--- a/ecp/server/dir.c
+++ b/ecp/server/dir.c
@@ -29,7 +29,9 @@ static int dir_process_enable;
 
 static SRVConfig *srv_config;
 
-#define MAX(X, Y)   (((X) > (Y)) ? (X) : (Y))
+/* other directory servers */
+#define _dir_item_is_dir(dir_item)      (((dir_item)->roles & ECP_ROLE_DIR) && (memcmp(&(dir_item)->node.key_perma.public, &srv_config->key_perma.public, sizeof(srv_config->key_perma.public)) != 0))
+#define MAX(X, Y)                       (((X) > (Y)) ? (X) : (Y))
 
 /* messages from clients */
 ssize_t dir_send_online(ECPConnection *conn, uint8_t region) {
@@ -414,14 +416,19 @@ void dir_process_item(ECPDirItem *dir_item, ECPSocket *sock, ecp_ecdh_public_t *
             if (rv) pthread_rwlock_unlock(&dir_shadow_rwlock);
         }
         if (rv) {
-            if (node) {
-                dir_destroy_node(node);
-                node = NULL;
-            }
-            LOG(LOG_ERR, "dir_process_item: err:%d\n", rv);
+            if (node) dir_destroy_node(node);
+            /* ignore duplicate hashtable inserts */
+            if (rv != ECP_ERR_DUP) LOG(LOG_ERR, "dir_process_item: create node err:%d\n", rv);
+
             return;
         }
 
+        /* try to open connection to other directory servers */
+        if (_dir_item_is_dir(dir_item)) {
+            rv = dir_open_conn(node, sock);
+            if (rv) LOG(LOG_ERR, "dir_process_item: conn open err:%d\n", rv);
+        }
+
         LOG(LOG_DEBUG, "dir_process_item: new node\n");
     }
 
@@ -496,7 +503,7 @@ int dir_open_conn(DIRNode *node, ECPSocket *sock) {
     ecp_conn_init(node->conn, sock, CTYPE_DIR);
     ecp_conn_set_flags(node->conn, ECP_CONN_FLAG_VBOX);
 
-    rv = ecp_conn_open(node->conn, &node->dir_item.node);
+    rv = ecp_conn_open(node->conn, &node->dir_item.node.key_perma.public, &node->dir_item.node.addr);
     if (rv) {
         free(node->conn);
         node->conn = NULL;
@@ -522,16 +529,7 @@ int dir_create_node(ECPDirItem *dir_item, ECPSocket *sock, DIRNode **node) {
 
     _node->dir_item = *dir_item;
     _node->is_new = 1;
-
-    /* open connection to other directory servers */
-    if ((dir_item->roles & ECP_ROLE_DIR) && (memcmp(&dir_item->node.key_perma.public, &srv_config->key_perma.public, sizeof(srv_config->key_perma.public)) != 0)) {
-        rv = dir_open_conn(_node, sock);
-        if (rv) {
-            pthread_mutex_destroy(&_node->mutex);
-            free(_node);
-            return rv;
-        }
-    }
+    _node->conn = NULL;
 
     *node = _node;
     return ECP_OK;
@@ -802,7 +800,8 @@ void dir_announce(ECPSocket *sock, int ann_period) {
             do {
                 node = ecp_ht_itr_value(&itr);
 
-                if ((node->dir_item.roles & ECP_ROLE_DIR) && (memcmp(&node->dir_item.node.key_perma.public, &srv_config->key_perma.public, sizeof(srv_config->key_perma.public)) != 0)) {
+                /* announce to other directory servers */
+                if (_dir_item_is_dir(&node->dir_item)) {
                     if (announce_cnt < MAX_NODE_ANNOUNCE) {
                         announce_node[announce_cnt] = node;
                         announce_cnt++;
@@ -922,7 +921,7 @@ void dir_init_switch(ECPSocket *sock, int init_ann) {
     sleep(init_ann);
 }
 
-int dir_init_ann(ECPSocket *sock, ECPNode *node) {
+int dir_init_ann(ECPSocket *sock, ecp_ecdh_public_t *public, ecp_tr_addr_t *addr) {
     ECPConnection *conn;
     int i, is_open;
     int rv;
@@ -933,7 +932,7 @@ int dir_init_ann(ECPSocket *sock, ECPNode *node) {
 
     ecp_conn_init(conn, sock, CTYPE_DIR);
     ecp_conn_set_flags(conn, ECP_CONN_FLAG_VBOX);
-    rv = ecp_conn_open(conn, node);
+    rv = ecp_conn_open(conn, public, addr);
     if (rv) {
         free(conn);
         LOG(LOG_ERR, "dir_init_ann: conn open err:%d\n", rv);