diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-03 20:58:29 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-03 20:58:29 +0000 |
| commit | 11b21fd214b1dd22081df4bf4ee0d9b621766084 (patch) | |
| tree | 1b8aa0d1c0a5f751331ba2d89acd539e2154bab1 /ace/SOCK_Connector.cpp | |
| parent | 30e1038ea65ed5956b3bddcc00358cd713ab67e9 (diff) | |
| download | ATCD-11b21fd214b1dd22081df4bf4ee0d9b621766084.tar.gz | |
ChangeLogTag:Sat Jul 3 15:57:40 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'ace/SOCK_Connector.cpp')
| -rw-r--r-- | ace/SOCK_Connector.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp index f7334dcec0e..f5f1ab00077 100644 --- a/ace/SOCK_Connector.cpp +++ b/ace/SOCK_Connector.cpp @@ -20,19 +20,19 @@ ACE_SOCK_Connector::dump (void) const ACE_TRACE ("ACE_SOCK_Connector::dump"); } -int +int ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream, ACE_Time_Value *timeout, const ACE_Addr &local_sap, int reuse_addr, - int protocol_family, + int protocol_family, int protocol) { ACE_TRACE ("ACE_SOCK_Connector::shared_connect_start"); // Only open a new socket if we don't already have a valid handle. if (new_stream.get_handle () == ACE_INVALID_HANDLE && new_stream.open (SOCK_STREAM, - protocol_family, + protocol_family, protocol, reuse_addr) == -1) return -1; @@ -58,7 +58,7 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream, return 0; } -int +int ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, ACE_Time_Value *timeout, int result) @@ -98,14 +98,14 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, // Actively connect and produce a new ACE_SOCK_Stream if things go well... int -ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, +ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, ACE_Time_Value *timeout, const ACE_Addr &local_sap, int reuse_addr, int /* flags */, int /* perms */, - int protocol_family, + int protocol_family, int protocol) { ACE_TRACE ("ACE_SOCK_Connector::connect"); @@ -127,17 +127,17 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, } int -ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, +ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, ACE_QoS_Params qos_params, ACE_Time_Value *timeout, const ACE_Addr &local_sap, - ACE_Protocol_Info */* protocolinfo */, + ACE_Protocol_Info * /* protocolinfo */, ACE_SOCK_GROUP /* g */, u_long /* flags */, int reuse_addr, int /* perms */, - int protocol_family, + int protocol_family, int protocol) { ACE_TRACE ("ACE_SOCK_Connector::connect"); @@ -205,8 +205,8 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, return 0; } -ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, +ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, ACE_Time_Value *timeout, const ACE_Addr &local_sap, int reuse_addr, @@ -226,15 +226,15 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, perms, protocol_family, protocol) == -1 - && timeout != 0 + && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } -ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, - const ACE_Addr &remote_sap, +ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, + const ACE_Addr &remote_sap, ACE_QoS_Params qos_params, ACE_Time_Value *timeout, const ACE_Addr &local_sap, @@ -260,10 +260,9 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, perms, protocol_family, protocol) == -1 - && timeout != 0 + && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } - |