fix(server): fixed socket creation and linux includes
This commit is contained in:
parent
968321ab30
commit
b1f9b9acb2
2 changed files with 5 additions and 6 deletions
|
|
@ -9,7 +9,9 @@
|
||||||
#ifndef COSMS_CORE_SERVER
|
#ifndef COSMS_CORE_SERVER
|
||||||
#define COSMS_CORE_SERVER
|
#define COSMS_CORE_SERVER
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(__GNUC__)
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#elif defined(_WIN32)
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,6 @@
|
||||||
#include "cosms-core/networking/server.h"
|
#include "cosms-core/networking/server.h"
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#elif defined(_WIN32)
|
#elif defined(_WIN32)
|
||||||
static int cosms_core_server_initialized_winsock_instances = 0;
|
static int cosms_core_server_initialized_winsock_instances = 0;
|
||||||
|
|
@ -31,7 +28,7 @@ CosmsCoreServerError cosms_core_server_create(struct cosms_core_server *new_serv
|
||||||
address.sin_port = htons(port);
|
address.sin_port = htons(port);
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
new_server->listening_socket = socket(domain, type, port);
|
new_server->listening_socket = socket(domain, type, 0);
|
||||||
if (new_server->listening_socket == -1) {
|
if (new_server->listening_socket == -1) {
|
||||||
return COSMS_CORE_SERVER_FAILED_TO_CREATE_SOCKET;
|
return COSMS_CORE_SERVER_FAILED_TO_CREATE_SOCKET;
|
||||||
}
|
}
|
||||||
|
|
@ -50,7 +47,7 @@ CosmsCoreServerError cosms_core_server_create(struct cosms_core_server *new_serv
|
||||||
|
|
||||||
cosms_core_server_initialized_winsock_instances += 1;
|
cosms_core_server_initialized_winsock_instances += 1;
|
||||||
|
|
||||||
new_server->listening_socket = socket(domain, type, port);
|
new_server->listening_socket = socket(domain, type, 0);
|
||||||
if (new_server->listening_socket == INVALID_SOCKET) {
|
if (new_server->listening_socket == INVALID_SOCKET) {
|
||||||
return COSMS_CORE_SERVER_FAILED_TO_CREATE_SOCKET;
|
return COSMS_CORE_SERVER_FAILED_TO_CREATE_SOCKET;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue