Changeset 7941 for branches/cu-security-branch/src/io/bmi/bmi_ib/ib.c

Timestamp:

08/25/09 13:56:42 (4 years ago)

Author:

nlmills

Message:

merged in changes from summer at LANL

Files:

• branches/cu-security-branch/src/io/bmi/bmi_ib/ib.c (modified) (8 diffs)

branches/cu-security-branch/src/io/bmi/bmi_ib/ib.c

@@ -82 +82 @@
 static int send_cts(struct ib_work *rq);
 static void ib_close_connection(ib_connection_t *c);
-#ifndef __PVFS2_SERVER__
 static int ib_tcp_client_connect(ib_method_addr_t *ibmap,
                                  struct bmi_method_addr *remote_map);
-#endif
 static int ib_tcp_server_check_new_connections(void);
 static int ib_block_for_activity(int timeout_ms);
@@ -793 +791 @@
     ib_method_addr_t *ibmap = remote_map->method_data;
 
-    if (!ibmap->c)
-#ifdef __PVFS2_SERVER__
-        /* cannot actively connect */
-        ret = 1;
-#else
+    if (!ibmap->c && ibmap->reconnect_flag)
         ret = ib_tcp_client_connect(ibmap, remote_map);
-#endif
+    else if(!ibmap->c && !ibmap->reconnect_flag)
+        ret = 1; /* cannot actively connect */
+    else
+        ret = 0;
+
     return ret;
 }
@@ -1543 +1541 @@
  */
 static struct bmi_method_addr *ib_alloc_method_addr(ib_connection_t *c,
-                                                char *hostname, int port)
+                                                char *hostname, int port, 
+                                                int reconnect_flag)
 {
     struct bmi_method_addr *map;
@@ -1553 +1552 @@
     ibmap->hostname = hostname;
     ibmap->port = port;
+    ibmap->reconnect_flag = reconnect_flag;
 
     return map;
@@ -1615 +1615 @@
     else
     {
-        map = ib_alloc_method_addr(0, hostname, port);  /* alloc new one */
+        /* set reconnect flag on this addr; we will be acting as a client
+         * for this connection and will be responsible for making sure that
+         * the connection is established
+         */
+        map = ib_alloc_method_addr(0, hostname, port, 1);  /* alloc new one */
         /* but don't call bmi_method_addr_reg_callback! */
     }
@@ -1711 +1715 @@
 }
 
-#ifndef __PVFS2_SERVER__
 /*
  * Blocking connect initiated by a post_sendunexpected{,_list}, or
@@ -1759 +1762 @@
     return 0;
 }
-#endif
 
 /*
@@ -1829 +1831 @@
         }
 
-        c->remote_map = ib_alloc_method_addr(c, hostname, port);
+        /* don't set reconnect flag on this addr; we are a server in this
+         * case and the peer will be responsible for maintaining the
+         * connection
+         */
+        c->remote_map = ib_alloc_method_addr(c, hostname, port, 0);
         /* register this address with the method control layer */
         c->bmi_addr = bmi_method_addr_reg_callback(c->remote_map);