Blah.. we should always return after try_connect() here, not just when we have an error.
Another fix for ticket #362. This commit was SVN r11756.
Этот коммит содержится в:
родитель
ab6cbb2359
Коммит
798c19d395
@ -451,12 +451,12 @@ static void mca_oob_tcp_peer_complete_connect(mca_oob_tcp_peer_t* peer)
|
|||||||
opal_evtimer_add(&peer->peer_timer_event, &tv);
|
opal_evtimer_add(&peer->peer_timer_event, &tv);
|
||||||
return;
|
return;
|
||||||
} else if(so_error != 0) {
|
} else if(so_error != 0) {
|
||||||
/* If no interfaces could connect (the error case below), an error message has
|
/* No need to worry about the return code here - we return regardless
|
||||||
already been printed, so we can just return */
|
at this point, and if an error did occur a message has already been
|
||||||
if(ORTE_ERR_UNREACH == mca_oob_tcp_peer_try_connect(peer)) {
|
printed for the user */
|
||||||
|
mca_oob_tcp_peer_try_connect(peer);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if(mca_oob_tcp_peer_send_connect_ack(peer) == ORTE_SUCCESS) {
|
if(mca_oob_tcp_peer_send_connect_ack(peer) == ORTE_SUCCESS) {
|
||||||
peer->peer_state = MCA_OOB_TCP_CONNECT_ACK;
|
peer->peer_state = MCA_OOB_TCP_CONNECT_ACK;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user