|
|
@ -279,6 +279,8 @@ ServerSocket_accept(ServerSocket self)
|
|
|
|
conSocket = (Socket) GLOBAL_CALLOC(1, sizeof(struct sSocket));
|
|
|
|
conSocket = (Socket) GLOBAL_CALLOC(1, sizeof(struct sSocket));
|
|
|
|
conSocket->fd = fd;
|
|
|
|
conSocket->fd = fd;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
socketCount++;
|
|
|
|
|
|
|
|
|
|
|
|
setSocketNonBlocking(conSocket);
|
|
|
|
setSocketNonBlocking(conSocket);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -305,6 +307,9 @@ TcpSocket_create()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Socket self = NULL;
|
|
|
|
Socket self = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (wsaStartUp() == false)
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
|
|
int sock = socket(AF_INET, SOCK_STREAM, 0);
|
|
|
|
int sock = socket(AF_INET, SOCK_STREAM, 0);
|
|
|
|
|
|
|
|
|
|
|
|
if (sock != INVALID_SOCKET) {
|
|
|
|
if (sock != INVALID_SOCKET) {
|
|
|
@ -405,9 +410,6 @@ Socket_connect(Socket self, const char* address, int port)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
struct sockaddr_in serverAddress;
|
|
|
|
struct sockaddr_in serverAddress;
|
|
|
|
|
|
|
|
|
|
|
|
if (wsaStartUp() == false)
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!prepareServerAddress(address, port, &serverAddress))
|
|
|
|
if (!prepareServerAddress(address, port, &serverAddress))
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
|
|