diff options
Diffstat (limited to '')
-rw-r--r-- | src/itoserver.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/itoserver.cpp b/src/itoserver.cpp index a1d804a..ea737bf 100644 --- a/src/itoserver.cpp +++ b/src/itoserver.cpp | |||
@@ -7,9 +7,9 @@ | |||
7 | 7 | ||
8 | #include "bu/itoserver.h" | 8 | #include "bu/itoserver.h" |
9 | #include <errno.h> | 9 | #include <errno.h> |
10 | #include "bu/serversocket.h" | 10 | #include "bu/tcpserversocket.h" |
11 | #include "bu/client.h" | 11 | #include "bu/client.h" |
12 | #include "bu/socket.h" | 12 | #include "bu/tcpsocket.h" |
13 | 13 | ||
14 | #include "bu/config.h" | 14 | #include "bu/config.h" |
15 | 15 | ||
@@ -41,7 +41,7 @@ Bu::ItoServer::~ItoServer() | |||
41 | 41 | ||
42 | void Bu::ItoServer::addPort( int nPort, int nPoolSize ) | 42 | void Bu::ItoServer::addPort( int nPort, int nPoolSize ) |
43 | { | 43 | { |
44 | ServerSocket *s = new ServerSocket( nPort, nPoolSize ); | 44 | TcpServerSocket *s = new TcpServerSocket( nPort, nPoolSize ); |
45 | int nSocket = s->getSocket(); | 45 | int nSocket = s->getSocket(); |
46 | FD_SET( nSocket, &fdActive ); | 46 | FD_SET( nSocket, &fdActive ); |
47 | hServers.insert( nSocket, s ); | 47 | hServers.insert( nSocket, s ); |
@@ -49,7 +49,7 @@ void Bu::ItoServer::addPort( int nPort, int nPoolSize ) | |||
49 | 49 | ||
50 | void Bu::ItoServer::addPort( const FString &sAddr, int nPort, int nPoolSize ) | 50 | void Bu::ItoServer::addPort( const FString &sAddr, int nPort, int nPoolSize ) |
51 | { | 51 | { |
52 | ServerSocket *s = new ServerSocket( sAddr, nPort, nPoolSize ); | 52 | TcpServerSocket *s = new TcpServerSocket( sAddr, nPort, nPoolSize ); |
53 | int nSocket = s->getSocket(); | 53 | int nSocket = s->getSocket(); |
54 | FD_SET( nSocket, &fdActive ); | 54 | FD_SET( nSocket, &fdActive ); |
55 | hServers.insert( nSocket, s ); | 55 | hServers.insert( nSocket, s ); |
@@ -92,7 +92,7 @@ void Bu::ItoServer::run() | |||
92 | { | 92 | { |
93 | if( FD_ISSET( i.getKey(), &fdRead ) ) | 93 | if( FD_ISSET( i.getKey(), &fdRead ) ) |
94 | { | 94 | { |
95 | ServerSocket *pSrv = i.getValue(); | 95 | TcpServerSocket *pSrv = i.getValue(); |
96 | addClient( pSrv->accept(), pSrv->getPort() ); | 96 | addClient( pSrv->accept(), pSrv->getPort() ); |
97 | } | 97 | } |
98 | } | 98 | } |
@@ -126,7 +126,7 @@ Bu::ItoServer::ItoClient::ItoClient( ItoServer &rSrv, int iSocket, int iPort, | |||
126 | FD_SET( iSocket, &fdActive ); | 126 | FD_SET( iSocket, &fdActive ); |
127 | 127 | ||
128 | pClient = new Client( | 128 | pClient = new Client( |
129 | new Bu::Socket( iSocket ), | 129 | new Bu::TcpSocket( iSocket ), |
130 | new SrvClientLinkFactory( rSrv ) | 130 | new SrvClientLinkFactory( rSrv ) |
131 | ); | 131 | ); |
132 | } | 132 | } |