summaryrefslogtreecommitdiff
path: root/sal/qa/osl/socket/osl_StreamSocket.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sal/qa/osl/socket/osl_StreamSocket.cxx')
-rw-r--r--sal/qa/osl/socket/osl_StreamSocket.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 1d36c3a2549f..876951bdf467 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -142,7 +142,7 @@ protected:
void SAL_CALL run( )
{
::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 );
::osl::StreamSocket ssStreamConnection;
//if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket
@@ -252,7 +252,7 @@ protected:
public:
ClientSocketThread( osl::Condition &_aCond ):
m_aCondition(_aCond),
- m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ),
+ m_saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ),
m_csConnectorSocket( )
{
m_id = getIdentifier( );
@@ -335,7 +335,7 @@ protected:
void SAL_CALL run( )
{
- ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
+ ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 );
::osl::ConnectorSocket m_aConnectorSocket;
if (! m_aTargetSocketAddr.is())
@@ -416,7 +416,7 @@ protected:
{
t_print("start WriteSocketThread\n");
::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 );
if (! saLocalSocketAddr.is())
{
t_print("LocalSocketAddr was NOT created successfully!\n");
@@ -615,7 +615,7 @@ namespace osl_StreamSocket
void send_recv2()
{
::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 );
::osl::StreamSocket ssStreamConnection;
sal_Char pReadBuffer[30] = "";
@@ -740,7 +740,7 @@ namespace osl_StreamSocket
}
public:
SendClientThread( ):
- m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ),
+ m_saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ),
m_csConnectorSocket( )
{
//t_print("# successfully creat this SendClientThread %d!\n", m_id );
@@ -772,7 +772,7 @@ namespace osl_StreamSocket
{
#if defined(LINUX)
::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) );
+ AcceptorThread myAcceptorThread( asSocket, rtl::OUString("127.0.0.1") );
myAcceptorThread.create();
thread_sleep( 1 );
@@ -789,7 +789,7 @@ namespace osl_StreamSocket
void shutdown_002()
{
::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9);
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9);
asSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True);
CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True );
@@ -842,7 +842,7 @@ namespace osl_StreamSocket
void shutdown_003()
{
::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9);
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9);
asSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True);
CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True );
@@ -1194,7 +1194,7 @@ namespace osl_StreamSocket
void send_recv()
{
rtl::OString sAddr;
- // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True )
+ // if ( ifAvailable(rtl::OUString("margritte.germany")) == sal_True )
// {
// t_print("margritte is alive ! \n");
// sAddr = "margritte.germany";
@@ -1207,21 +1207,21 @@ namespace osl_StreamSocket
}
// else
// {
-// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("192.168.7.2"))) == sal_True )
+// if ( ifAvailable(rtl::OUString("192.168.7.2")) == sal_True )
// {
// sAddr = "192.168.7.2";
// t_print("moon found ! \n");
// }
// else
// {
-// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon.linux.bogus"))) == sal_True )
+// if ( ifAvailable(rtl::OUString("moon.linux.bogus")) == sal_True )
// {
// sAddr = "moon.linux.bogus";
// t_print("moon found ! \n");
// }
// else
// {
-// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon"))) == sal_True )
+// if ( ifAvailable(rtl::OUString("moon")) == sal_True )
// {
// sAddr = "moon";
// t_print("moon found ! \n");
@@ -1230,7 +1230,7 @@ namespace osl_StreamSocket
// }
// }
- // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.64.196"))) == sal_False )
+ // if ( ifAvailable(rtl::OUString("10.16.64.196")) == sal_False )
// {
// t_print("ip 10.16.64.196 is not alive! \n");
// return;