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

Timestamp:

05/17/11 15:32:56 (2 years ago)

Author:

nlmills

Message:

merge with Orange-Branch

Files:

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

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

@@ -1558 +1558 @@
     ibmap->port = port;
     ibmap->reconnect_flag = reconnect_flag;
+    ibmap->ref_count = 1;
 
     return map;
@@ -1610 +1611 @@
             if (ibmap->port == port && !strcmp(ibmap->hostname, hostname)) {
                map = c->remote_map;
+               ibmap->ref_count++;
                break;
             }
@@ -1954 +1956 @@
         struct bmi_method_addr *map = param;
         ib_method_addr_t *ibmap = map->method_data;
-        free(ibmap->hostname);
-        free(map);
+        ibmap->ref_count--;
+        if (ibmap->ref_count == 0)
+        {
+           free(ibmap->hostname);
+           free(map);
+        }
         break;
     }