Changeset 8848

Timestamp:

05/30/11 13:39:49 (2 years ago)

Author:

bligon

Message:

Problem: mx address lookup failed when multiple protocols were used at the same time.
Added key_string() function to parse_peername(), which correctly strips the BMI mx address
from a string containing multiple protocols.
Modified File:

Tag: Orange-Branch

src/io/bmi/bmi_mx/mx.c

Files:

• branches/Orange-Branch/src/io/bmi/bmi_mx/mx.c (modified) (7 diffs)

branches/Orange-Branch/src/io/bmi/bmi_mx/mx.c

@@ -536 +536 @@
 bmx_parse_peername(const char *peername, char **hostname, uint32_t *board, uint32_t *ep_id)
 {
-        int             ret             = 0;
-        int             colon1_found    = 0;
-        int             colon2_found    = 0;
-        char           *s               = NULL;
-        char           *colon1          = NULL;
-        char           *colon2          = NULL;
-        char           *fs              = NULL;
-        char           *host            = NULL;
-        uint32_t        bd              = -1;
-        uint32_t        ep              = 0;
-
-        if (peername == NULL || hostname == NULL || board == NULL || ep_id == NULL) {
+        int             ret          = 0;
+        int             colon1_found = 0;
+        int             colon2_found = 0;
+        char           *tmp_peername = NULL;
+        char           *colon1       = NULL;
+        char           *colon2       = NULL;
+        char           *fs           = NULL;
+        char           *host         = NULL;
+        uint32_t        bd           = -1;
+        uint32_t        ep           = 0;
+
+        tmp_peername = string_key("mx",peername);
+        if (!tmp_peername) {
+                debug(BMX_DB_INFO, "parse_peername() called with invalid peername");
+                return -BMI_EINVAL;
+        }
+
+        if (tmp_peername == NULL || hostname == NULL || board == NULL || ep_id == NULL) {
                 debug(BMX_DB_INFO, "parse_peername() called with invalid parameter");
                 return -BMI_EINVAL;
         }
-
-        if (peername[0] != 'm' ||
-            peername[1] != 'x' ||
-            peername[2] != ':' ||
-            peername[3] != '/' ||
-            peername[4] != '/') {
-                debug(BMX_DB_INFO, "parse_peername() peername does not start with mx://");
-                return -1;
-        }
-
-        s = strdup(&peername[5]);
-        fs = strchr(s, '/');
+        fs = strchr(tmp_peername, '/');
         if (fs) {
                 *fs = '\0';
         }
-        colon1 = strchr(s, ':');
+        colon1 = strchr(tmp_peername, ':');
         if (!colon1) {
                 debug(BMX_DB_INFO, "parse_peername() strchr() failed");
         } else {
-                colon2 = strrchr(s, ':');
+                colon2 = strrchr(tmp_peername, ':');
                 if (colon1 == colon2) {
                         /* colon2_found == 0 */
@@ -604 +599 @@
                         debug(BMX_DB_INFO, "parse_peername() too many ':' (%s %s)", 
                                            colon1, colon2);
-                        free(s);
+                        free(tmp_peername);
                         return -1;
                 }
         }
 
-        host = strdup(s);
+        host = strdup(tmp_peername);
         if (!host) {
                 debug(BMX_DB_MEM, "parse_peername() malloc() failed");
-                free(s);
+                free(tmp_peername);
                 return -1;
         }
@@ -624 +619 @@
                 debug(BMX_DB_WARN, "%s is not a valid hostname", host);
                 free(host);
-                free(s);
+                free(tmp_peername);
                 return -1;
         }
@@ -632 +627 @@
                 debug(BMX_DB_INFO, "%s is not a valid hostname", host);
                 free(host);
-                free(s);
+                free(tmp_peername);
                 return -1;
         }
@@ -639 +634 @@
                 debug(BMX_DB_INFO, "%s is not a valid board ID", host);
                 free(host);
-                free(s);
+                free(tmp_peername);
                 return -1;
         }
@@ -646 +641 @@
                 debug(BMX_DB_INFO, "%s is not a valid endpoint ID", host);
                 free(host);
-                free(s);
+                free(tmp_peername);
                 return -1;
         }
@@ -654 +649 @@
         *ep_id = ep;
 
-        free(s);
+        free(tmp_peername);
 
         return 0;