Improve the help messages from r20706.
This commit was SVN r21616. The following SVN revision numbers were found above: r20706 --> open-mpi/ompi@248bbb8a2f
Этот коммит содержится в:
родитель
9117785f9e
Коммит
d7d07e0720
@ -23,3 +23,15 @@ install its own signal handler for this signal by setting the
|
|||||||
|
|
||||||
Signal: %d
|
Signal: %d
|
||||||
Current opal_signal value: %s
|
Current opal_signal value: %s
|
||||||
|
*
|
||||||
|
[malformed IP address or netmask]
|
||||||
|
Open MPI has detected at least one malformed IP address or netmask in
|
||||||
|
the value of the opal_net_private_ipv4 MCA parameter. The
|
||||||
|
opal_net_private_ipv4 MCA parameter accepts a semicolon-delimited list
|
||||||
|
of Classless Inter-Domain Routing (CIDR) notation specifications, each
|
||||||
|
of the form <ipaddress>/<mask>. For example:
|
||||||
|
|
||||||
|
10.0.0.0/8;172.16.0.0/12;192.168.0.0/16;169.254.0.0/16
|
||||||
|
|
||||||
|
All malformed entries will be ignored; Open MPI will attempt to continue
|
||||||
|
your job. The first detected malformed entry was %s.
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
* Copyright (c) 2007 Los Alamos National Security, LLC. All rights
|
* Copyright (c) 2007 Los Alamos National Security, LLC. All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
|
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -72,6 +73,7 @@
|
|||||||
#include "opal/util/net.h"
|
#include "opal/util/net.h"
|
||||||
#include "opal/util/output.h"
|
#include "opal/util/output.h"
|
||||||
#include "opal/util/argv.h"
|
#include "opal/util/argv.h"
|
||||||
|
#include "opal/util/show_help.h"
|
||||||
#include "opal/constants.h"
|
#include "opal/constants.h"
|
||||||
#include "opal/threads/tsd.h"
|
#include "opal/threads/tsd.h"
|
||||||
#include "opal/mca/base/mca_base_param.h"
|
#include "opal/mca/base/mca_base_param.h"
|
||||||
@ -119,7 +121,7 @@ opal_net_init()
|
|||||||
{
|
{
|
||||||
char *string_value, **args, *arg;
|
char *string_value, **args, *arg;
|
||||||
uint32_t a, b, c, d, bits, addr;
|
uint32_t a, b, c, d, bits, addr;
|
||||||
int i, count;
|
int i, count, found_bad = 0;
|
||||||
|
|
||||||
/* RFC1918 defines
|
/* RFC1918 defines
|
||||||
- 10.0.0./8
|
- 10.0.0./8
|
||||||
@ -130,7 +132,7 @@ opal_net_init()
|
|||||||
- 169.254.0.0/16 for DHCP onlink iff there's no DHCP server
|
- 169.254.0.0/16 for DHCP onlink iff there's no DHCP server
|
||||||
*/
|
*/
|
||||||
mca_base_param_reg_string_name( "opal", "net_private_ipv4",
|
mca_base_param_reg_string_name( "opal", "net_private_ipv4",
|
||||||
"Default values for private networks (based on RFC1918 and RFC3330)",
|
"Semicolon-delimited list of CIDR notation entries specifying what networks are considered \"private\" (default value based on RFC1918 and RFC3330)",
|
||||||
false, false, "10.0.0.0/8;172.16.0.0/12;192.168.0.0/16;169.254.0.0/16",
|
false, false, "10.0.0.0/8;172.16.0.0/12;192.168.0.0/16;169.254.0.0/16",
|
||||||
&string_value );
|
&string_value );
|
||||||
|
|
||||||
@ -151,8 +153,13 @@ opal_net_init()
|
|||||||
/* TODO: A reminder to change this to OPAL SOS once this framework
|
/* TODO: A reminder to change this to OPAL SOS once this framework
|
||||||
* get added to the trunk.
|
* get added to the trunk.
|
||||||
*/
|
*/
|
||||||
opal_output( 0, "Malformed IP address or netmask. The correct format "
|
if (0 == found_bad) {
|
||||||
"is a list of [0-255].[0-255].[0-255].[0-255]/[0-32] separated by ; " );
|
opal_output(0, "FOUND BAD!\n");
|
||||||
|
opal_show_help("help-opal-util.txt",
|
||||||
|
"malformed IP address or netmask",
|
||||||
|
true, args[i]);
|
||||||
|
found_bad = 1;
|
||||||
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
addr = (a << 24) | (b << 16) | (c << 8) | d;
|
addr = (a << 24) | (b << 16) | (c << 8) | d;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user