Skip to content

Supporting dependency injection via direct use of external socket. #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Supporting dependency injection via direct use of external socket. #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd923ae
Supporting dependency injection via direct use of external socket.
JG-Adams Feb 25, 2025
5e177ef
modified: test/build.c
JG-Adams Feb 25, 2025
9975c49
modified: include/enet.h
JG-Adams Feb 25, 2025
ee0a96a
Delete .vscode/settings.json
JG-Adams Feb 25, 2025
081bbe7
Merge branch 'zpl-c:master' into patch-7
JG-Adams Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 47 additions & 21 deletions include/enet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@
size_t duplicatePeers; /**< optional number of allowed peers from duplicate IPs, defaults to ENET_PROTOCOL_MAXIMUM_PEER_ID */
size_t maximumPacketSize; /**< the maximum allowable packet size that may be sent or received on a peer */
size_t maximumWaitingData; /**< the maximum aggregate amount of buffer space a peer may use waiting for packets to be delivered */
bool ownsSocket; /**< Whether it use internally managed socket or custom network implementation */
} ENetHost;

/**
Expand Down Expand Up @@ -1011,7 +1012,7 @@
ENET_API ENetPacket * enet_packet_create_offset(const void *, size_t, size_t, enet_uint32);
ENET_API enet_uint32 enet_crc32(const ENetBuffer *, size_t);

ENET_API ENetHost * enet_host_create(const ENetAddress *, size_t, size_t, enet_uint32, enet_uint32);
ENET_API ENetHost * enet_host_create(const ENetAddress *, size_t, size_t, enet_uint32, enet_uint32, ENetSocket* externalUDPSocket);
ENET_API void enet_host_destroy(ENetHost *);
ENET_API ENetPeer * enet_host_connect(ENetHost *, const ENetAddress *, size_t, enet_uint32);
ENET_API int enet_host_check_events(ENetHost *, ENetEvent *);
Expand Down Expand Up @@ -4517,6 +4518,23 @@
// !
// =======================================================================//

int is_udp_socket(const ENetSocket* socket) {
#ifdef _WIN32
WSAPROTOCOL_INFO info;
int len = sizeof(info);
if (getsockopt(*socket, SOL_SOCKET, SO_PROTOCOL_INFO, (char*)&info, &len) == 0) {
return (info.iSocketType == SOCK_DGRAM);
}
#else
int type;
socklen_t len = sizeof(type);
if (getsockopt(*socket, SOL_SOCKET, SO_TYPE, &type, &len) == 0) {
return (type == SOCK_DGRAM);
}
#endif
return 0; /* Error: Could not determine socket type */

Check warning

Code scanning / CodeQL

Poorly documented large function Warning

Poorly documented function: fewer than 2% comments for a function of 102 lines.
}

/** Creates a host for communicating to peers.
*
* @param address the address at which other peers may connect to this host. If NULL, then no peers may connect to the host.
Expand All @@ -4532,7 +4550,7 @@
* the window size of a connection which limits the amount of reliable packets that may be in transit
* at any given time.
*/
ENetHost * enet_host_create(const ENetAddress *address, size_t peerCount, size_t channelLimit, enet_uint32 incomingBandwidth, enet_uint32 outgoingBandwidth) {
ENetHost * enet_host_create(const ENetAddress *address, size_t peerCount, size_t channelLimit, enet_uint32 incomingBandwidth, enet_uint32 outgoingBandwidth, ENetSocket* externalUDPSocket) {
ENetHost *host;
ENetPeer *currentPeer;

Expand All @@ -4552,28 +4570,34 @@

memset(host->peers, 0, peerCount * sizeof(ENetPeer));

host->socket = enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM);
if (host->socket != ENET_SOCKET_NULL) {
enet_socket_set_option (host->socket, ENET_SOCKOPT_IPV6_V6ONLY, 0);
}

if (host->socket == ENET_SOCKET_NULL || (address != NULL && enet_socket_bind(host->socket, address) < 0)) {
if (externalUDPSocket==NULL || !is_udp_socket(externalUDPSocket)){
host->socket = enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM);
if (host->socket != ENET_SOCKET_NULL) {
enet_socket_destroy(host->socket);
enet_socket_set_option (host->socket, ENET_SOCKOPT_IPV6_V6ONLY, 0);
}

enet_free(host->peers);
enet_free(host);

return NULL;

if (host->socket == ENET_SOCKET_NULL || (address != NULL && enet_socket_bind(host->socket, address) < 0)) {
if (host->socket != ENET_SOCKET_NULL) {
enet_socket_destroy(host->socket);
}

enet_free(host->peers);
enet_free(host);

return NULL;
}

enet_socket_set_option(host->socket, ENET_SOCKOPT_NONBLOCK, 1);
enet_socket_set_option(host->socket, ENET_SOCKOPT_BROADCAST, 1);
enet_socket_set_option(host->socket, ENET_SOCKOPT_RCVBUF, ENET_HOST_RECEIVE_BUFFER_SIZE);
enet_socket_set_option(host->socket, ENET_SOCKOPT_SNDBUF, ENET_HOST_SEND_BUFFER_SIZE);
enet_socket_set_option(host->socket, ENET_SOCKOPT_IPV6_V6ONLY, 0);
host->ownsSocket = true;
}else{
host->socket = *externalUDPSocket;
host->ownsSocket = false;
}

enet_socket_set_option(host->socket, ENET_SOCKOPT_NONBLOCK, 1);
enet_socket_set_option(host->socket, ENET_SOCKOPT_BROADCAST, 1);
enet_socket_set_option(host->socket, ENET_SOCKOPT_RCVBUF, ENET_HOST_RECEIVE_BUFFER_SIZE);
enet_socket_set_option(host->socket, ENET_SOCKOPT_SNDBUF, ENET_HOST_SEND_BUFFER_SIZE);
enet_socket_set_option(host->socket, ENET_SOCKOPT_IPV6_V6ONLY, 0);

if (address != NULL && enet_socket_get_address(host->socket, &host->address) < 0) {
host->address = *address;
}
Expand Down Expand Up @@ -4645,7 +4669,9 @@
return;
}

enet_socket_destroy(host->socket);
if (host->ownsSocket){ /* Only destroy if it's internally managed. */
enet_socket_destroy(host->socket);
}

for (currentPeer = host->peers; currentPeer < &host->peers[host->peerCount]; ++currentPeer) {
enet_peer_reset(currentPeer);
Expand Down
4 changes: 2 additions & 2 deletions test/build.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int main() {

/* create a server */
printf("starting server...\n");
server = enet_host_create(&address, MAX_CLIENTS, 2, 0, 0);
server = enet_host_create(&address, MAX_CLIENTS, 2, 0, 0, NULL);
if (server == NULL) {
printf("An error occurred while trying to create an ENet server host.\n");
return 1;
Expand All @@ -83,7 +83,7 @@ int main() {
printf("starting clients...\n");
for (i = 0; i < MAX_CLIENTS; ++i) {
enet_address_set_host(&address, "127.0.0.1");
clients[i].host = enet_host_create(NULL, 1, 2, 0, 0);
clients[i].host = enet_host_create(NULL, 1, 2, 0, 0, NULL);
clients[i].peer = enet_host_connect(clients[i].host, &address, 2, 0);
if (clients[i].peer == NULL) {
printf("coundlnt connect\n");
Expand Down
4 changes: 2 additions & 2 deletions test/cli-server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void run_server() {
address.host = ENET_HOST_ANY;
address.port = 1234;

ENetHost* host = enet_host_create(&address, 4, 1, 0, 0);
ENetHost* host = enet_host_create(&address, 4, 1, 0, 0, NULL);

if (!host) {
printf("Failed to create server\n");
Expand Down Expand Up @@ -97,7 +97,7 @@ void run_client() {
address.host = ENET_HOST_ANY;
address.port = 1234;

ENetHost* host = enet_host_create(NULL, 1, 1, 0, 0);
ENetHost* host = enet_host_create(NULL, 1, 1, 0, 0, NULL);

enet_address_set_host(&address, "127.0.0.1");
address.port = 1234;
Expand Down
Loading