diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-11 21:02:09 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-11 21:02:09 +0000 |
| commit | 19f8954844a83a5a0c370dbfb61327566e2cd11f (patch) | |
| tree | e73b71efeec669a3bb9415484815baeff6879907 | |
| parent | 3d2a18e7fe12de8f3b5cc86b3ddafca47eac3cb5 (diff) | |
| download | ATCD-19f8954844a83a5a0c370dbfb61327566e2cd11f.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-97b | 11 | ||||
| -rw-r--r-- | ace/SOCK_Connector.cpp | 2 | ||||
| -rw-r--r-- | tests/MT_SOCK_Test.cpp | 2 | ||||
| -rw-r--r-- | tests/SOCK_Connector_Test.cpp | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index fb9ad45825b..e36c239288c 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,4 +1,13 @@ -Sat Oct 11 11:14:42 1997 Douglas C. Schmidt <schmidt@mambo.cs.wustl.edu> +Sat Oct 11 14:38:16 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> + + * ace/SOCK_Connector.cpp (complete): Fixed a typo with + ACE_NON_BLOCKING_BUG_DELAY. Thanks to John Zeb Dhom" + <zeb@ibm.net> for reporting this. + + * tests/MT_SOCK_Test.cpp (client): Slightly revised the client + function so that it doesn't try to use non-blocking connects if + it's on a Win32 platform that has bugs with non-blocking + connects. * ace/SOCK_Connector.cpp: It appears that connect() can set the ETIMEDOUT errno if the connection times out (whatever that diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp index f880d45ce70..e5f9ce5d041 100644 --- a/ace/SOCK_Connector.cpp +++ b/ace/SOCK_Connector.cpp @@ -109,7 +109,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, // Win32 has a timing problem - if you check to see if the // connection has completed too fast, it will fail - so wait 1 // millisecond to let it catch up. - ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DEALY); + ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY); ACE_OS::sleep (time); #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */ ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), tv); diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp index 6f9f466b788..74c5b8dae04 100644 --- a/tests/MT_SOCK_Test.cpp +++ b/tests/MT_SOCK_Test.cpp @@ -42,7 +42,7 @@ client (void *arg) #if defined (ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS) ACE_Time_Value *timeout = 0; #else - ACE_Time_value timeout = &tv; + ACE_Time_Value *timeout = &tv; #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */ ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting timed connect\n")); diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp index 6cf3c82ab3a..a7f63acc362 100644 --- a/tests/SOCK_Connector_Test.cpp +++ b/tests/SOCK_Connector_Test.cpp @@ -98,7 +98,7 @@ fail_no_listener_nonblocking (void) "Connect which should fail didn't\n")); status = -1; } - else if (!(errno == ECONNREFUSED || errno == ENOTCONN || errno ETIMEDOUT) + else if (!(errno == ECONNREFUSED || errno == ENOTCONN || errno ETIMEDOUT)) { ACE_DEBUG ((LM_DEBUG, "%p at errno %d, but expected ECONNREFUSED or ENOTCONN\n", "Failed with", errno)); |