diff options
Diffstat (limited to 'ace/TLI_Connector.cpp')
| -rw-r--r-- | ace/TLI_Connector.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp index 12323b0fe1d..c4c9c33e4a8 100644 --- a/ace/TLI_Connector.cpp +++ b/ace/TLI_Connector.cpp @@ -56,7 +56,7 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream, struct t_bind *localaddr; localaddr = (struct t_bind *) - ACE_OS::t_alloc (new_stream.get_handle (), T_BIND, T_ADDR); + ::t_alloc (new_stream.get_handle (), T_BIND, T_ADDR); if (localaddr == 0) result = -1; @@ -80,12 +80,9 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream, #endif /* ACE_HAS_FORE_ATM_XTI */ { // localaddr->glen = 0; - //localaddr->addr.maxlen = local_sap.get_size (); + localaddr->addr.maxlen = local_sap.get_size (); localaddr->addr.len = local_sap.get_size (); - ACE_OS::memcpy(localaddr->addr.buf, - local_sap.get_addr (), - localaddr->addr.len); - //localaddr->addr.buf = (char *) local_sap.get_addr (); + localaddr->addr.buf = (char *) local_sap.get_addr (); if (ACE_OS::t_bind (new_stream.get_handle (), localaddr, @@ -117,12 +114,9 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream, new_stream.close (); return -1; } - //callptr->addr.maxlen = remote_sap.get_size (); + callptr->addr.maxlen = remote_sap.get_size (); callptr->addr.len = remote_sap.get_size (); - ACE_OS::memcpy(callptr->addr.buf, - remote_sap.get_addr (), - callptr->addr.len); - //callptr->addr.buf = (char *) remote_sap.get_addr (); + callptr->addr.buf = (char *) remote_sap.get_addr (); if (udata != 0) ACE_OS::memcpy ((void *) &callptr->udata, (void *) udata, sizeof *udata); @@ -130,11 +124,6 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream, ACE_OS::memcpy ((void *) &callptr->opt, (void *) opt, sizeof *opt); // Connect to remote endpoint. -#if defined (ACE_HAS_FORE_ATM_XTI) - // FORE's XTI/ATM driver has problems with ioctl/fcntl calls so (at least - // for now) always have blocking calls. - timeout = 0; -#endif /* ACE_HAS_FORE_ATM_XTI */ if (timeout != 0) // Enable non-blocking, if required. { @@ -170,7 +159,7 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream, if (new_stream.get_rwflag ()) result = ACE_OS::ioctl (new_stream.get_handle (), I_PUSH, - ACE_const_cast (char *, "tirdwr")); + "tirdwr"); #endif /* I_PUSH */ } else if (!(errno == EWOULDBLOCK || errno == ETIME)) |