Signed-off-by: Anandhi S Jayakumar <[email protected]>

Sending the ethernet address only in the get_contact_info, rest will be sent through modex
	modified:   ../orte/mca/rml/ofi/rml_ofi.h
	modified:   ../orte/mca/rml/ofi/rml_ofi_component.c

Author: anandhis

orte/mca/rml/ofi/rml_ofi.h

@@ -43,8 +43,7 @@
 #define MULTI_BUF_SIZE_FACTOR 128
 #define MIN_MULTI_BUF_SIZE (1024 * 1024)
 
-#define SOCKADDR    "ofi-sockaddr"
-#define PSMXADDR    "ofi-psmxaddr"
+#define OFIADDR    "ofiaddr"
 
 #define CLOSE_FID(fd)                                                               \
     do {                                                                            \

orte/mca/rml/ofi/rml_ofi_component.c

@@ -1070,53 +1070,31 @@ static char* ofi_get_contact_info(void)
 {
     char *turi, *final=NULL, *tmp, *addrtype;
     int rc=ORTE_SUCCESS, cur_ofi_prov=0;
-    size_t len;
     struct sockaddr_in* ep_sockaddr;
 
     /* start with our process name */
     if (ORTE_SUCCESS != (rc = orte_util_convert_process_name_to_string(&final, ORTE_PROC_MY_NAME))) {
         /* [TODO] ORTE_ERROR_LOG(rc);*/
         return final;
     }
-    len = strlen(final);
 
-    /* The returned string will be of format - "<process-name>;ofi-socket:<sin_family,sin_addr,sin_port>;ofi-<provider2>:<prov2epname>" */
+    /* The returned string will be of format - "<process-name>;ofi-addr:<sin_family,sin_addr,sin_port>;" */
+    /* we are sending only the ethernet address */
     for( cur_ofi_prov=0; cur_ofi_prov < orte_rml_ofi.ofi_prov_open_num ; cur_ofi_prov++ ) {
-            switch ( orte_rml_ofi.ofi_prov[cur_ofi_prov].fabric_info->addr_format) {
-                case  FI_SOCKADDR_IN :
-                    ep_sockaddr = (struct sockaddr_in*)orte_rml_ofi.ofi_prov[cur_ofi_prov].ep_name;
-                    asprintf(&addrtype, SOCKADDR);
-                    asprintf(&turi,"%d,%s,%d",ep_sockaddr->sin_family,inet_ntoa(ep_sockaddr->sin_addr),ntohs(ep_sockaddr->sin_port));
-                    
-                    break;
-                case  FI_ADDR_PSMX :
-                    asprintf(&addrtype, PSMXADDR); 
-                    /* [TBD]  The ep_name has to be converted to PSMX specific address format struct for printing
-                    copy the endpoint name as is to length specified - this fails in sprintf as the ep_name is a
-                    binary content
-                    turi = calloc(orte_rml_ofi.ofi_prov[cur_ofi_prov].epnamelen + 1, sizeof(char));
-                    memcpy( turi, orte_rml_ofi.ofi_prov[cur_ofi_prov].ep_name, orte_rml_ofi.ofi_prov[cur_ofi_prov].epnamelen);
-                    turi[ (orte_rml_ofi.ofi_prov[cur_ofi_prov].epnamelen + 1) ] = '\0';*/
-		    asprintf(&turi, "psmx addr");
-                    break;
-                default:
-                    opal_output_verbose(1,orte_rml_base_framework.framework_output,
-                    "%s:%d ERROR: Cannot register address, Unhandled addr_format - %d",
-                     __FILE__,__LINE__,orte_rml_ofi.ofi_prov[cur_ofi_prov].fabric_info->addr_format);
-                     /*abort this current transport, but check next transport */
-                     continue;                    
-            }    
+        if ( FI_SOCKADDR_IN == orte_rml_ofi.ofi_prov[cur_ofi_prov].fabric_info->addr_format) {
+            ep_sockaddr = (struct sockaddr_in*)orte_rml_ofi.ofi_prov[cur_ofi_prov].ep_name;
+            asprintf(&addrtype, OFIADDR);
+            asprintf(&turi,"%d,%s,%d",ep_sockaddr->sin_family,inet_ntoa(ep_sockaddr->sin_addr),ntohs(ep_sockaddr->sin_port));
             opal_output_verbose(20,orte_rml_base_framework.framework_output,
-                        "%s - cur_ofi_prov = %d, addrtype = %s ", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),cur_ofi_prov,addrtype);
+                    "%s - cur_ofi_prov = %d, addrtype = %s ", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),cur_ofi_prov,addrtype);
             /* Add to the final string - the ofi addrtype and the epname   */
             asprintf(&tmp, "%s;%s:%s", final,addrtype, turi);
 
             free(addrtype);
             free(turi);
             free(final);
-            final = tmp;
-            len = strlen(final); 
-            
+            final = tmp; 
+        }          
     }
     opal_output_verbose(10,orte_rml_base_framework.framework_output,
                         "[%s] get_contact_info returns string - %s ", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),final);              
@@ -1216,22 +1194,16 @@ static void process_uri( char *uri)
                                  ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
                 continue;
             } 
-            /* Handle the specific OFI address types in the uri - SOCKADDR(ofi-socket), PSMXADDR etc */       
-            if (0 == strncmp(ofiuri, SOCKADDR, strlen(SOCKADDR)) ) {
+            /* Handle the OFI address types in the uri - OFIADDR(ofiaddr) */       
+            if (0 == strncmp(ofiuri, OFIADDR, strlen(OFIADDR)) ) {
                 /* allocate and initialise the peer object to be inserted in hashtable */
                 pr->socket_ep_len = sizeof(struct sockaddr_in);
                 ep_sockaddr = malloc( sizeof ( struct sockaddr_in) );
                 /* ofiuri for socket provider is of format - ofi-socket:<sin_family,sin_addr,sin_port> */
                 convert_to_sockaddr(ofiuri, ep_sockaddr);              
                 pr->socket_ep = (void *)ep_sockaddr;
                 tot_found++;
-            } else if ( 0 == strncmp(ofiuri, PSMXADDR, strlen(PSMXADDR)) ){
-                pr->psmx_ep_len = strlen(ofiuri) - strlen(PSMXADDR) -1;
-                pr->psmx_ep = calloc ( pr->psmx_ep_len , sizeof(char) );
-                ep_name = ofiuri + strlen(PSMXADDR) + 1;
-                memcpy( pr->psmx_ep, ep_name, pr->psmx_ep_len );
-                tot_found++;
-            }
+            } 
             free( ofiuri);
         }
         /* if atleast one OFI address is known for peer insert it */