ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Always declare oob_tcp_disable_family, no matter if --disable-ipv6 is set.

Просмотр исходного кода 
This commit was SVN r18164.
Этот коммит содержится в:
Adrian Knoth 2008-04-16 09:31:15 +00:00
родитель 0ddfff4ffe
Коммит 84e4013530
2 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
orte/mca/oob/tcp/oob_tcp.c
Просмотреть файл

@ -357,6 +357,11 @@ int mca_oob_tcp_component_open(void)
false, false, false, false,
64*1024 - 1 - mca_oob_tcp_component.tcp_port_min, 64*1024 - 1 - mca_oob_tcp_component.tcp_port_min,
&mca_oob_tcp_component.tcp_port_range); &mca_oob_tcp_component.tcp_port_range);
mca_base_param_reg_int(&mca_oob_tcp_component.super.oob_base,
"disable_family", "Disable IPv4 (4) or IPv6 (6)",
false, false,
0,
&mca_oob_tcp_component.disable_family);
#if OPAL_WANT_IPV6 #if OPAL_WANT_IPV6
mca_base_param_reg_int(&mca_oob_tcp_component.super.oob_base, mca_base_param_reg_int(&mca_oob_tcp_component.super.oob_base,
"port_min_v6", "Starting port allowed (IPv6)", "port_min_v6", "Starting port allowed (IPv6)",
@ -368,11 +373,6 @@ int mca_oob_tcp_component_open(void)
false, false, false, false,
64*1024 - 1 - mca_oob_tcp_component.tcp6_port_min, 64*1024 - 1 - mca_oob_tcp_component.tcp6_port_min,
&mca_oob_tcp_component.tcp6_port_range); &mca_oob_tcp_component.tcp6_port_range);
mca_base_param_reg_int(&mca_oob_tcp_component.super.oob_base,
"disable_family", "Disable IPv4 (4) or IPv6 (6)",
false, false,
0,
&mca_oob_tcp_component.disable_family);
mca_oob_tcp_component.tcp6_listen_sd = -1; mca_oob_tcp_component.tcp6_listen_sd = -1;
#endif /* OPAL_WANT_IPV6 */ #endif /* OPAL_WANT_IPV6 */

2
orte/mca/oob/tcp/oob_tcp.h
Просмотреть файл

@ -205,13 +205,13 @@ struct mca_oob_tcp_component_t {
unsigned short tcp_listen_port; /**< IPv4 listen port */ unsigned short tcp_listen_port; /**< IPv4 listen port */
int tcp_port_min; /**< Minimum allowed port for the OOB listen socket */ int tcp_port_min; /**< Minimum allowed port for the OOB listen socket */
int tcp_port_range; /**< Range of allowed TCP ports */ int tcp_port_range; /**< Range of allowed TCP ports */
int disable_family; /**< disable AF: 0-nothing, 4-IPv4, 6-IPv6 */
#if OPAL_WANT_IPV6 #if OPAL_WANT_IPV6
opal_event_t tcp6_recv_event; /**< event structure for IPv6 recvs */ opal_event_t tcp6_recv_event; /**< event structure for IPv6 recvs */
int tcp6_listen_sd; /**< listen socket for incoming IPv6 connection requests */ int tcp6_listen_sd; /**< listen socket for incoming IPv6 connection requests */
unsigned short tcp6_listen_port; /**< IPv6 listen port */ unsigned short tcp6_listen_port; /**< IPv6 listen port */
int tcp6_port_min; /**< Minimum allowed port for the OOB listen socket */ int tcp6_port_min; /**< Minimum allowed port for the OOB listen socket */
int tcp6_port_range; /**< Range of allowed TCP ports */ int tcp6_port_range; /**< Range of allowed TCP ports */
int disable_family; /**< disable AF: 0-nothing, 4-IPv4, 6-IPv6 */
#endif /* OPAL_WANT_IPV6 */ #endif /* OPAL_WANT_IPV6 */
opal_mutex_t tcp_lock; /**< lock for accessing module state */ opal_mutex_t tcp_lock; /**< lock for accessing module state */
opal_list_t tcp_events; /**< list of pending events (accepts) */ opal_list_t tcp_events; /**< list of pending events (accepts) */