Merge pull request #2250 from rhc54/topic/attrs

rhc54 · web-flow · commit cf79874bd1be · 2021-07-26T17:58:01.000-07:00
Update attribute support tables
diff --git a/src/client/pmix_client.c b/src/client/pmix_client.c
@@ -863,7 +863,8 @@ PMIX_EXPORT pmix_status_t PMIx_Init(pmix_proc_t *proc, pmix_info_t info[], size_
     }
 
     /* store our server's ID */
-    if (NULL != pmix_client_globals.myserver && NULL != pmix_client_globals.myserver->info) {
+    if (NULL != pmix_client_globals.myserver &&
+        NULL != pmix_client_globals.myserver->info) {
         kptr = PMIX_NEW(pmix_kval_t);
         kptr->key = strdup(PMIX_SERVER_NSPACE);
         PMIX_VALUE_CREATE(kptr->value, 1);
diff --git a/src/common/pmix_attributes.c b/src/common/pmix_attributes.c
@@ -137,8 +137,37 @@ PMIX_EXPORT void pmix_release_registered_attrs(void)
  * manually maintain the list */
 static pmix_attr_init_t client_fns[] = {
     {.function = "PMIx_Init",
-     .attrs = (char *[]){"PMIX_GDS_MODULE", "PMIX_EVENT_BASE", "PMIX_HOSTNAME", "PMIX_NODEID",
-                         "PMIX_DEBUG_STOP_IN_INIT", NULL}},
+     .attrs = (char *[]){"PMIX_GDS_MODULE",
+                         "PMIX_EVENT_BASE",
+                         "PMIX_HOSTNAME",
+                         "PMIX_NODEID",
+                         "PMIX_PROGRAMMING_MODEL",
+                         "PMIX_MODEL_LIBRARY_NAME",
+                         "PMIX_MODEL_LIBRARY_VERSION",
+                         "PMIX_THREADING_MODEL",
+                         "PMIX_NODE_INFO_ARRAY",
+                         "PMIX_EXTERNAL_PROGRESS",
+                         "PMIX_HOSTNAME_KEEP_FQDN",
+                         "PMIX_TOPOLOGY2",
+                         "PMIX_SERVER_URI",
+                         "PMIX_DEBUG_STOP_IN_INIT",
+                         "PMIX_IOF_TAG_OUTPUT",
+                         "PMIX_TAG_OUTPUT",
+                         "PMIX_IOF_RANK_OUTPUT",
+                         "PMIX_IOF_TIMESTAMP_OUTPUT",
+                         "PMIX_TIMESTAMP_OUTPUT",
+                         "PMIX_IOF_XML_OUTPUT",
+                         "PMIX_IOF_OUTPUT_TO_FILE",
+                         "PMIX_OUTPUT_TO_FILE",
+                         "PMIX_IOF_OUTPUT_TO_DIRECTORY",
+                         "PMIX_OUTPUT_TO_DIRECTORY",
+                         "PMIX_IOF_FILE_ONLY",
+                         "PMIX_OUTPUT_NOCOPY",
+                         "PMIX_IOF_MERGE_STDERR_STDOUT",
+                         "PMIX_MERGE_STDERR_STDOUT",
+                         "PMIX_IOF_LOCAL_OUTPUT",
+                         "PMIX_IOF_FILE_PATTERN",
+                         NULL}},
     {.function = "PMIx_Finalize", .attrs = (char *[]){"PMIX_EMBED_BARRIER", NULL}},
     {.function = "PMIx_Initialized", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_Abort", .attrs = (char *[]){"N/A", NULL}},
@@ -148,11 +177,27 @@ static pmix_attr_init_t client_fns[] = {
     {.function = "PMIx_Fence", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_Fence_nb", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_Get",
-     .attrs = (char *[]){"PMIX_NODE_INFO", "PMIX_HOSTNAME", "PMIX_NODEID", "PMIX_APP_INFO",
-                         "PMIX_APPNUM", "PMIX_SESSION_INFO", "PMIX_GET_REFRESH_CACHE", NULL}},
+     .attrs = (char *[]){"PMIX_NODE_INFO",
+                         "PMIX_HOSTNAME",
+                         "PMIX_NODEID",
+                         "PMIX_APP_INFO",
+                         "PMIX_APPNUM",
+                         "PMIX_SESSION_INFO",
+                         "PMIX_GET_REFRESH_CACHE",
+                         "PMIX_OPTIONAL",
+                         "PMIX_DATA_SCOPE",
+                         NULL}},
     {.function = "PMIx_Get_nb",
-     .attrs = (char *[]){"PMIX_NODE_INFO", "PMIX_HOSTNAME", "PMIX_NODEID", "PMIX_APP_INFO",
-                         "PMIX_APPNUM", "PMIX_SESSION_INFO", "PMIX_GET_REFRESH_CACHE", NULL}},
+     .attrs = (char *[]){"PMIX_NODE_INFO",
+                         "PMIX_HOSTNAME",
+                         "PMIX_NODEID",
+                         "PMIX_APP_INFO",
+                         "PMIX_APPNUM",
+                         "PMIX_SESSION_INFO",
+                         "PMIX_GET_REFRESH_CACHE",
+                         "PMIX_OPTIONAL",
+                         "PMIX_DATA_SCOPE",
+                         NULL}},
     {.function = "PMIx_Publish", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_Publish_nb", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_Lookup", .attrs = (char *[]){"NONE", NULL}},
@@ -168,15 +213,19 @@ static pmix_attr_init_t client_fns[] = {
     {.function = "PMIx_Resolve_peers", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_Resolve_nodes", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_Query_info",
-     .attrs = (char *[]){"PMIX_QUERY_SUPPORTED_KEYS", "PMIX_QUERY_NAMESPACES",
-                         "PMIX_QUERY_ATTRIBUTE_SUPPORT", "PMIX_QUERY_AVAIL_SERVERS",
-                         "PMIX_QUERY_REFRESH_CACHE", "PMIX_QUERY_SUPPORTED_KEYS",
-                         "PMIX_QUERY_SUPPORTED_QUALIFIERS", "PMIX_TIME_REMAINING", NULL}},
+     .attrs = (char *[]){"PMIX_QUERY_ATTRIBUTE_SUPPORT",
+                         "PMIX_QUERY_AVAIL_SERVERS",
+                         "PMIX_QUERY_REFRESH_CACHE",
+                         "PMIX_QUERY_SUPPORTED_KEYS",
+                         "PMIX_QUERY_SUPPORTED_QUALIFIERS",
+                         NULL}},
     {.function = "PMIx_Query_info_nb",
-     .attrs = (char *[]){"PMIX_QUERY_SUPPORTED_KEYS", "PMIX_QUERY_NAMESPACES",
-                         "PMIX_QUERY_ATTRIBUTE_SUPPORT", "PMIX_QUERY_AVAIL_SERVERS",
-                         "PMIX_QUERY_REFRESH_CACHE", "PMIX_QUERY_SUPPORTED_KEYS",
-                         "PMIX_QUERY_SUPPORTED_QUALIFIERS", "PMIX_TIME_REMAINING", NULL}},
+     .attrs = (char *[]){"PMIX_QUERY_ATTRIBUTE_SUPPORT",
+                         "PMIX_QUERY_AVAIL_SERVERS",
+                         "PMIX_QUERY_REFRESH_CACHE",
+                         "PMIX_QUERY_SUPPORTED_KEYS",
+                         "PMIX_QUERY_SUPPORTED_QUALIFIERS",
+                         NULL}},
     {.function = "PMIx_Log",
      .attrs = (char *[]){"PMIX_LOG_GENERATE_TIMESTAMP", "PMIX_LOG_SOURCE", NULL}},
     {.function = "PMIx_Log_nb",
@@ -202,16 +251,28 @@ static pmix_attr_init_t client_fns[] = {
     {.function = "PMIx_Group_destruct", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_Group_destruct_nb", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_Register_event_handler",
-     .attrs = (char *[]){"PMIX_EVENT_HDLR_FIRST", "PMIX_EVENT_HDLR_LAST", "PMIX_EVENT_HDLR_PREPEND",
-                         "PMIX_EVENT_HDLR_APPEND", "PMIX_EVENT_HDLR_NAME",
-                         "PMIX_EVENT_RETURN_OBJECT", "PMIX_EVENT_HDLR_FIRST_IN_CATEGORY",
-                         "PMIX_EVENT_HDLR_LAST_IN_CATEGORY", "PMIX_EVENT_HDLR_BEFORE",
-                         "PMIX_EVENT_HDLR_AFTER", "PMIX_RANGE", "PMIX_EVENT_CUSTOM_RANGE",
-                         "PMIX_EVENT_AFFECTED_PROC", "PMIX_EVENT_AFFECTED_PROCS", NULL}},
+     .attrs = (char *[]){"PMIX_EVENT_HDLR_FIRST",
+                         "PMIX_EVENT_HDLR_LAST",
+                         "PMIX_EVENT_HDLR_PREPEND",
+                         "PMIX_EVENT_HDLR_APPEND",
+                         "PMIX_EVENT_HDLR_NAME",
+                         "PMIX_EVENT_RETURN_OBJECT",
+                         "PMIX_EVENT_HDLR_FIRST_IN_CATEGORY",
+                         "PMIX_EVENT_HDLR_LAST_IN_CATEGORY",
+                         "PMIX_EVENT_HDLR_BEFORE",
+                         "PMIX_EVENT_HDLR_AFTER",
+                         "PMIX_RANGE",
+                         "PMIX_EVENT_CUSTOM_RANGE",
+                         "PMIX_EVENT_AFFECTED_PROC",
+                         "PMIX_EVENT_AFFECTED_PROCS",
+                         NULL}},
     {.function = "PMIx_Deregister_event_handler", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_Notify_event",
-     .attrs = (char *[]){"PMIX_EVENT_NON_DEFAULT", "PMIX_EVENT_CUSTOM_RANGE",
-                         "PMIX_EVENT_AFFECTED_PROC", "PMIX_EVENT_AFFECTED_PROCS", NULL}},
+     .attrs = (char *[]){"PMIX_EVENT_NON_DEFAULT",
+                         "PMIX_EVENT_CUSTOM_RANGE",
+                         "PMIX_EVENT_AFFECTED_PROC",
+                         "PMIX_EVENT_AFFECTED_PROCS",
+                         NULL}},
     {.function = "PMIx_Error_string", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_Proc_state_string", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_Scope_string", .attrs = (char *[]){"N/A", NULL}},
@@ -263,11 +324,16 @@ static pmix_attr_init_t server_fns[] = {
                          "PMIX_SYSTEM_TMPDIR",
                          "PMIX_SERVER_NSPACE",
                          "PMIX_SERVER_RANK",
+                         "PMIX_SERVER_SHARE_TOPOLOGY",
+                         "PMIX_TOPOLOGY2",
+                         "PMIX_TOPOLOGY",
+                         "PMIX_IOF_LOCAL_OUTPUT",
                          "PMIX_GDS_MODULE",
                          "PMIX_EVENT_BASE",
                          "PMIX_HOSTNAME",
                          "PMIX_NODEID",
                          "PMIX_TCP_IF_INCLUDE",
+                         "PMIX_TCP_IF_EXCLUDE",
                          "PMIX_TCP_IPV4_PORT",
                          "PMIX_TCP_IPV6_PORT",
                          "PMIX_TCP_DISABLE_IPV4",
@@ -279,7 +345,23 @@ static pmix_attr_init_t server_fns[] = {
                          "PMIX_SERVER_TOOL_SUPPORT",
                          "PMIX_LAUNCHER_RENDEZVOUS_FILE",
                          "PMIX_SERVER_ENABLE_MONITORING",
-                         NULL}},
+                         "PMIX_IOF_TAG_OUTPUT",
+                         "PMIX_TAG_OUTPUT",
+                         "PMIX_IOF_RANK_OUTPUT",
+                         "PMIX_IOF_TIMESTAMP_OUTPUT",
+                         "PMIX_TIMESTAMP_OUTPUT",
+                         "PMIX_IOF_XML_OUTPUT",
+                         "PMIX_IOF_OUTPUT_TO_FILE",
+                         "PMIX_OUTPUT_TO_FILE",
+                         "PMIX_IOF_OUTPUT_TO_DIRECTORY",
+                         "PMIX_OUTPUT_TO_DIRECTORY",
+                         "PMIX_IOF_FILE_ONLY",
+                         "PMIX_OUTPUT_NOCOPY",
+                         "PMIX_IOF_MERGE_STDERR_STDOUT",
+                         "PMIX_MERGE_STDERR_STDOUT",
+                         "PMIX_IOF_LOCAL_OUTPUT",
+                         "PMIX_IOF_FILE_PATTERN",
+                        NULL}},
     {.function = "PMIx_server_finalize", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_generate_regex", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_generate_ppn", .attrs = (char *[]){"N/A", NULL}},
@@ -290,25 +372,37 @@ static pmix_attr_init_t server_fns[] = {
     {.function = "PMIx_server_setup_fork", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_server_dmodex_request", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_server_setup_application",
-     .attrs = (char *[]){"PMIX_SETUP_APP_ENVARS", "PMIX_SETUP_APP_ALL", "PMIX_SETUP_APP_NONENVARS",
-                         "PMIX_ALLOC_FABRIC", "PMIX_ALLOC_FABRIC_SEC_KEY", "PMIX_ALLOC_FABRIC_ID",
-                         "PMIX_ALLOC_FABRIC_TYPE", "PMIX_ALLOC_FABRIC_PLANE",
-                         "PMIX_ALLOC_FABRIC_ENDPTS", NULL}},
+     .attrs = (char *[]){"PMIX_SETUP_APP_ENVARS",
+                         "PMIX_SETUP_APP_ALL",
+                         "PMIX_SETUP_APP_NONENVARS",
+                         "PMIX_ALLOC_FABRIC",
+                         "PMIX_ALLOC_FABRIC_SEC_KEY",
+                         "PMIX_ALLOC_FABRIC_ID",
+                         "PMIX_ALLOC_FABRIC_TYPE",
+                         "PMIX_ALLOC_FABRIC_PLANE",
+                         "PMIX_ALLOC_FABRIC_ENDPTS",
+                         NULL}},
     {.function = "PMIx_server_setup_local_support", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_server_IOF_deliver", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_server_collect_inventory", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_server_deliver_inventory", .attrs = (char *[]){"NONE", NULL}},
     {.function = "PMIx_Register_attributes", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_server_register_fabric",
-     .attrs = (char *[]){"PMIX_FABRIC_PLANE", "PMIX_FABRIC_IDENTIFIER", "PMIX_FABRIC_VENDOR",
+     .attrs = (char *[]){"PMIX_FABRIC_PLANE",
+                         "PMIX_FABRIC_IDENTIFIER",
+                         "PMIX_FABRIC_VENDOR",
                          NULL}},
     {.function = "PMIx_server_update_fabric", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_server_deregister_fabric", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_server_get_vertex_info", .attrs = (char *[]){"N/A", NULL}},
     {.function = "PMIx_server_get_index",
-     .attrs = (char *[]){"PMIX_HOSTNAME", "PMIX_NODEID", "PMIX_FABRIC_DEVICE_NAME",
-                         "PMIX_FABRIC_DEVICE_VENDOR", "PMIX_FABRIC_DEVICE_BUS_TYPE",
-                         "PMIX_FABRIC_DEVICE_PCI_DEVID", NULL}},
+     .attrs = (char *[]){"PMIX_HOSTNAME",
+                         "PMIX_NODEID",
+                         "PMIX_FABRIC_DEVICE_NAME",
+                         "PMIX_FABRIC_DEVICE_VENDOR",
+                         "PMIX_FABRIC_DEVICE_BUS_TYPE",
+                         "PMIX_FABRIC_DEVICE_PCI_DEVID",
+                         NULL}},
     {.function = ""}};
 
 /*****    REGISTER SERVER ATTRS    *****/
@@ -341,6 +435,7 @@ static pmix_attr_init_t tool_fns[]
                             "PMIX_HOSTNAME",
                             "PMIX_NODEID",
                             "PMIX_TOOL_DO_NOT_CONNECT",
+                            "PMIX_DEBUG_STOP_IN_INIT",
                             "PMIX_TOOL_NSPACE",
                             "PMIX_TOOL_RANK",
                             "PMIX_FWD_STDIN",
@@ -357,17 +452,47 @@ static pmix_attr_init_t tool_fns[]
                             "PMIX_SERVER_PIDINFO",
                             "PMIX_SERVER_NSPACE",
                             "PMIX_SERVER_URI",
+                            "PMIX_TCP_IF_INCLUDE",
+                            "PMIX_TCP_IF_EXCLUDE",
+                            "PMIX_TCP_IPV4_PORT",
+                            "PMIX_TCP_IPV6_PORT",
+                            "PMIX_TCP_DISABLE_IPV4",
+                            "PMIX_TCP_DISABLE_IPV6",
+                            "PMIX_IOF_TAG_OUTPUT",
+                            "PMIX_TAG_OUTPUT",
+                            "PMIX_IOF_RANK_OUTPUT",
+                            "PMIX_IOF_TIMESTAMP_OUTPUT",
+                            "PMIX_TIMESTAMP_OUTPUT",
+                            "PMIX_IOF_XML_OUTPUT",
+                            "PMIX_IOF_OUTPUT_TO_FILE",
+                            "PMIX_OUTPUT_TO_FILE",
+                            "PMIX_IOF_OUTPUT_TO_DIRECTORY",
+                            "PMIX_OUTPUT_TO_DIRECTORY",
+                            "PMIX_IOF_FILE_ONLY",
+                            "PMIX_OUTPUT_NOCOPY",
+                            "PMIX_IOF_MERGE_STDERR_STDOUT",
+                            "PMIX_MERGE_STDERR_STDOUT",
+                            "PMIX_IOF_LOCAL_OUTPUT",
+                            "PMIX_IOF_FILE_PATTERN",
                             NULL}},
        {.function = "PMIx_tool_finalize", .attrs = (char *[]){"N/A", NULL}},
        {.function = "PMIx_tool_connect_to_server",
-        .attrs = (char *[]){"PMIX_CONNECT_TO_SYSTEM", "PMIX_CONNECT_SYSTEM_FIRST",
-                            "PMIX_SERVER_PIDINFO", "PMIX_SERVER_NSPACE", "PMIX_SERVER_URI",
-                            "PMIX_CONNECT_RETRY_DELAY", "PMIX_CONNECT_MAX_RETRIES",
-                            "PMIX_RECONNECT_SERVER", "PMIX_TOOL_ATTACHMENT_FILE", NULL}},
+        .attrs = (char *[]){"PMIX_CONNECT_TO_SYSTEM",
+                            "PMIX_CONNECT_SYSTEM_FIRST",
+                            "PMIX_SERVER_PIDINFO",
+                            "PMIX_SERVER_NSPACE",
+                            "PMIX_SERVER_URI",
+                            "PMIX_CONNECT_RETRY_DELAY",
+                            "PMIX_CONNECT_MAX_RETRIES",
+                            "PMIX_RECONNECT_SERVER",
+                            "PMIX_TOOL_ATTACHMENT_FILE",
+                            NULL}},
        {.function = "PMIx_IOF_pull", .attrs = (char *[]){"NONE", NULL}},
        {.function = "PMIx_IOF_deregister", .attrs = (char *[]){"NONE", NULL}},
        {.function = "PMIx_IOF_push",
-        .attrs = (char *[]){"PMIX_IOF_PUSH_STDIN", "PMIX_IOF_COMPLETE", NULL}},
+        .attrs = (char *[]){"PMIX_IOF_PUSH_STDIN",
+                            "PMIX_IOF_COMPLETE",
+                            NULL}},
        {.function = ""}};
 
 /*****    REGISTER TOOL ATTRS    *****/
diff --git a/src/mca/ptl/client/ptl_client.c b/src/mca/ptl/client/ptl_client.c
@@ -67,7 +67,10 @@
 
 static pmix_status_t connect_to_peer(struct pmix_peer_t *peer, pmix_info_t *info, size_t ninfo);
 
-pmix_ptl_module_t pmix_ptl_client_module = {.name = "client", .connect_to_peer = connect_to_peer};
+pmix_ptl_module_t pmix_ptl_client_module = {
+    .name = "client",
+    .connect_to_peer = connect_to_peer
+};
 
 static pmix_status_t connect_to_peer(struct pmix_peer_t *pr, pmix_info_t *info, size_t ninfo)
 {
diff --git a/src/mca/ptl/server/ptl_server.c b/src/mca/ptl/server/ptl_server.c
@@ -27,6 +27,7 @@
 #include "src/include/pmix_config.h"
 #include "src/include/pmix_globals.h"
 
+#include "src/util/show_help.h"
 #include "ptl_server.h"
 #include "src/mca/ptl/base/base.h"
 
@@ -51,9 +52,27 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo)
             pmix_ptl_base.tool_support = PMIX_INFO_TRUE(&info[n]);
         } else if (PMIX_CHECK_KEY(&info[n], PMIX_SERVER_REMOTE_CONNECTIONS)) {
             pmix_ptl_base.remote_connections = PMIX_INFO_TRUE(&info[n]);
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_IF_INCLUDE)) {
+            pmix_ptl_base.if_include = strdup(info[n].value.data.string);
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_IF_EXCLUDE)) {
+            pmix_ptl_base.if_exclude = strdup(info[n].value.data.string);
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_IPV4_PORT)) {
+            pmix_ptl_base.ipv4_port = info[n].value.data.integer;
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_IPV6_PORT)) {
+            pmix_ptl_base.ipv6_port = info[n].value.data.integer;
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_DISABLE_IPV4)) {
+            pmix_ptl_base.disable_ipv4_family = PMIX_INFO_TRUE(&info[n]);
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_DISABLE_IPV6)) {
+            pmix_ptl_base.disable_ipv6_family = PMIX_INFO_TRUE(&info[n]);
         }
     }
 
+    if (NULL != pmix_ptl_base.if_include && NULL != pmix_ptl_base.if_exclude) {
+        pmix_show_help("help-ptl-base.txt", "include-exclude", true, pmix_ptl_base.if_include,
+                       pmix_ptl_base.if_exclude);
+        return PMIX_ERR_SILENT;
+    }
+
     rc = pmix_ptl_base_setup_listener();
     return rc;
 }
diff --git a/src/mca/ptl/tool/ptl_tool.c b/src/mca/ptl/tool/ptl_tool.c
@@ -27,6 +27,7 @@
 #include "src/include/pmix_config.h"
 #include "src/include/pmix_globals.h"
 
+#include "src/util/show_help.h"
 #include "ptl_tool.h"
 #include "src/mca/ptl/base/base.h"
 
@@ -42,6 +43,29 @@ static pmix_status_t setup_listener(pmix_info_t info[], size_t ninfo)
     pmix_status_t rc;
     char **clnup = NULL, *cptr = NULL;
     pmix_info_t dir;
+    size_t n;
+
+    for (n = 0; n < ninfo; n++) {
+        if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_IF_INCLUDE)) {
+            pmix_ptl_base.if_include = strdup(info[n].value.data.string);
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_IF_EXCLUDE)) {
+            pmix_ptl_base.if_exclude = strdup(info[n].value.data.string);
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_IPV4_PORT)) {
+            pmix_ptl_base.ipv4_port = info[n].value.data.integer;
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_IPV6_PORT)) {
+            pmix_ptl_base.ipv6_port = info[n].value.data.integer;
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_DISABLE_IPV4)) {
+            pmix_ptl_base.disable_ipv4_family = PMIX_INFO_TRUE(&info[n]);
+        } else if (PMIX_CHECK_KEY(&info[n], PMIX_TCP_DISABLE_IPV6)) {
+            pmix_ptl_base.disable_ipv6_family = PMIX_INFO_TRUE(&info[n]);
+        }
+    }
+
+    if (NULL != pmix_ptl_base.if_include && NULL != pmix_ptl_base.if_exclude) {
+        pmix_show_help("help-ptl-base.txt", "include-exclude", true, pmix_ptl_base.if_include,
+                       pmix_ptl_base.if_exclude);
+        return PMIX_ERR_SILENT;
+    }
 
     rc = pmix_ptl_base_setup_listener();
     if (PMIX_SUCCESS != rc) {

Original file line number	Diff line number	Diff line change
`@@ -863,7 +863,8 @@ PMIX_EXPORT pmix_status_t PMIx_Init(pmix_proc_t *proc, pmix_info_t info[], size_`
`863`	`863`	`}`
`864`	`864`
`865`	`865`	`/* store our server's ID */`
`866`		`- if (NULL != pmix_client_globals.myserver && NULL != pmix_client_globals.myserver->info) {`
	`866`	`+ if (NULL != pmix_client_globals.myserver &&`
	`867`	`+ NULL != pmix_client_globals.myserver->info) {`
`867`	`868`	`kptr = PMIX_NEW(pmix_kval_t);`
`868`	`869`	`kptr->key = strdup(PMIX_SERVER_NSPACE);`
`869`	`870`	`PMIX_VALUE_CREATE(kptr->value, 1);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,10 @@`
`67`	`67`
`68`	`68`	`static pmix_status_t connect_to_peer(struct pmix_peer_t peer, pmix_info_t info, size_t ninfo);`
`69`	`69`
`70`		`-pmix_ptl_module_t pmix_ptl_client_module = {.name = "client", .connect_to_peer = connect_to_peer};`
	`70`	`+pmix_ptl_module_t pmix_ptl_client_module = {`
	`71`	`+ .name = "client",`
	`72`	`+ .connect_to_peer = connect_to_peer`
	`73`	`+};`
`71`	`74`
`72`	`75`	`static pmix_status_t connect_to_peer(struct pmix_peer_t pr, pmix_info_t info, size_t ninfo)`
`73`	`76`	`{`