diff options
Diffstat (limited to 'ace/ATM_Stream.cpp')
| -rw-r--r-- | ace/ATM_Stream.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/ace/ATM_Stream.cpp b/ace/ATM_Stream.cpp index fbcd1db85f5..6753783bbb8 100644 --- a/ace/ATM_Stream.cpp +++ b/ace/ATM_Stream.cpp @@ -16,13 +16,13 @@ char* ACE_ATM_Stream::get_peer_name (void) const { ACE_TRACE ("ACE_ATM_Stream::get_peer_name"); -#if defined (ACE_HAS_FORE_ATM_XTI) +#if defined (ACE_HAS_FORE_ATM_XTI) // // Use t_getprotaddr for XTI/ATM - // struct t_bind *localaddr + // struct t_bind *localaddr // = (struct t_bind *) ACE_OS::t_alloc (get_handle (), // T_BIND, // T_ADDR); - // struct t_bind *peeraddr + // struct t_bind *peeraddr // = (struct t_bind *) ACE_OS::t_alloc (get_handle (), // T_BIND, // T_ADDR); @@ -52,7 +52,7 @@ ACE_ATM_Stream::get_peer_name (void) const // &name); return (name.buf); -#elif defined (ACE_HAS_FORE_ATM_WS2) +#elif defined (ACE_HAS_FORE_ATM_WS2) // Use getpeername for WinSock2. struct sockaddr_atm name; ACE_OS::memset (&name, 0, sizeof (name)); @@ -72,7 +72,7 @@ ACE_ATM_Stream::get_peer_name (void) const buffer[ (ATM_ADDR_SIZE - 1) * 3 ] = '\0'; sprintf (buffer, "%s%02x.", buffer, 0); buffer[ ATM_ADDR_SIZE * 3 - 1 ] = '\0'; - for (index = 0; index < ACE_OS::strlen (buffer); ++index) + for (index = 0; index < ACE_OS::strlen (buffer); ++index) buffer[index] = tolower (buffer[index]); ifstream atm_hosts ("C:/WINNT/atmhosts"); @@ -86,9 +86,9 @@ ACE_ATM_Stream::get_peer_name (void) const while (!atm_hosts.eof ()) { atm_hosts.getline (line, 256); // Convert the line to lower case to ease comparison - for (index = 0; index < ACE_OS::strlen (line); ++index) + for (index = 0; index < ACE_OS::strlen (line); ++index) line[index] = tolower (line[index]); - if (ACE_OS::strstr (line, buffer) != 0) + if (ACE_OS::strstr (line, buffer) != 0) { char *strtok_p; // Grab the second token which is the host name @@ -100,7 +100,7 @@ ACE_ATM_Stream::get_peer_name (void) const } return host_name; -#elif defined (ACE_HAS_LINUX_ATM) +#elif defined (ACE_HAS_LINUX_ATM) ATM_Addr name; int nameSize = sizeof (name.sockaddratmsvc); @@ -114,7 +114,7 @@ ACE_ATM_Stream::get_peer_name (void) const static ACE_TCHAR buffer[MAX_ATM_ADDR_LEN + 1]; int total_len; if ((total_len = atm2text (buffer,sizeof buffer, - (struct sockaddr *) & (name.sockaddratmsvc), + (struct sockaddr *) & (name.sockaddratmsvc), A2T_PRETTY|A2T_NAME)) < 0) { ACE_DEBUG ((LM_DEBUG,ACE_LIB_TEXT ("ACE_ATM_Stream (get_peer_name) :%d"),errno)); return 0; @@ -130,7 +130,7 @@ ACE_HANDLE ACE_ATM_Stream::get_handle (void) const { ACE_TRACE ("ACE_ATM_Stream::get_handle"); -#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) +#if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2) || defined (ACE_HAS_LINUX_ATM) return stream_.get_handle (); #else return 0; @@ -142,7 +142,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, ACE_UINT16 &vci) const { ACE_TRACE ("ACE_ATM_Stream::get_vpi_vci"); -#if defined (ACE_HAS_FORE_ATM_XTI) +#if defined (ACE_HAS_FORE_ATM_XTI) struct t_atm_conn_prop conn_prop; char* connect_opts = (char *) &conn_prop; int opt_size = sizeof (t_atm_conn_prop); @@ -150,14 +150,14 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, struct t_optmgmt opt_req, opt_ret; if (ACE_OS::t_getinfo (stream_.get_handle (), - &info) < 0) + &info) < 0) { ACE_OS::t_error ("t_getinfo"); return -1; } char *buf_req = (char *) ACE_OS::malloc (info.options); - if (buf_req == 0) + if (buf_req == 0) { ACE_OS::fprintf (stderr, "Unable to allocate %ld bytes for options\n", @@ -166,7 +166,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, } char *buf_ret = (char *) ACE_OS::malloc (info.options); - if (buf_ret == 0) + if (buf_ret == 0) { ACE_OS::fprintf (stderr, "Unable to allocate %ld bytes for options\n", @@ -215,19 +215,19 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, vpi = conn_prop.vpi; vci = conn_prop.vci; return (0); -#elif defined (ACE_HAS_FORE_ATM_WS2) +#elif defined (ACE_HAS_FORE_ATM_WS2) ATM_CONNECTION_ID connID; DWORD bytes = 0; - - if (::WSAIoctl ((int) this -> get_handle (), - SIO_GET_ATM_CONNECTION_ID, - 0, - 0, - (LPVOID) &connID, - sizeof (ATM_CONNECTION_ID), - &bytes, - 0, - 0) + + if (::WSAIoctl ((int) this -> get_handle (), + SIO_GET_ATM_CONNECTION_ID, + 0, + 0, + (LPVOID) &connID, + sizeof (ATM_CONNECTION_ID), + &bytes, + 0, + 0) == SOCKET_ERROR) { ACE_OS::printf ("Error: WSAIoctl %d\n", WSAGetLastError ()); } @@ -236,14 +236,14 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, vci = (ACE_UINT16) connID.VCI; return 0; -#elif defined (ACE_HAS_LINUX_ATM) +#elif defined (ACE_HAS_LINUX_ATM) #if defined (SO_ATMPVC) /* atm version>=0.62 */ struct sockaddr_atmpvc mypvcaddr; int addrpvclen = sizeof (mypvcaddr); if (ACE_OS::getsockopt (stream_.get_handle (), SOL_ATM, - SO_ATMPVC, - ACE_reinterpret_cast (char*,&mypvcaddr), + SO_ATMPVC, + reinterpret_cast<char*> (&mypvcaddr), &addrpvclen) < 0) { ACE_DEBUG (LM_DEBUG, ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), @@ -255,11 +255,11 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, return 0; #elif defined (SO_VCID) /* patch for atm version 0.59 */ - struct atm_vcid mypvcid; + struct atm_vcid mypvcid; int pvcidlen = sizeof (mypvcid); if (ACE_OS::getsockopt (stream_.get_handle (), SOL_ATM,SO_VCID, - ACE_reinterpret_cast (char*,&mypvcid), + reinterpret_cast<char*> (&mypvcid), &pvcidlen) < 0) { ACE_DEBUG (LM_DEBUG, ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), |