Skip to content

Supporting dependency injection. Re-request #73

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

Open
JG-Adams wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Supporting dependency injection. Re-request #73

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae82c9c
Supporting dependency injection. Re-request
JG-Adams Feb 27, 2025
2e5c79e
Update enet.h
JG-Adams Feb 27, 2025
9c126bf
Update enet.h
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
71 changes: 52 additions & 19 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; /**< Signify whether we're using internal socket so we can avoid changing or closing custom one */
} ENetHost;

/**
Expand Down Expand Up @@ -1012,6 +1013,7 @@
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_ext(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 +4519,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
}

/** 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 +4551,13 @@
* 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) {
/* Create and use internal socket. */
return enet_host_create_ext(address, peerCount, channelLimit, incomingBandwidth, outgoingBandwidth, NULL);
} /* enet_host_create */

ENetHost * enet_host_create_ext(const ENetAddress *address, size_t peerCount, size_t channelLimit, enet_uint32 incomingBandwidth, enet_uint32 outgoingBandwidth, ENetSocket* externalUDPSocket) {

Check warning

Code scanning / CodeQL

Poorly documented large function Warning

Poorly documented function: fewer than 2% comments for a function of 108 lines.
ENetHost *host;
ENetPeer *currentPeer;

Expand All @@ -4552,28 +4577,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 +4676,9 @@
return;
}

enet_socket_destroy(host->socket);
if (host->ownsSocket){
enet_socket_destroy(host->socket);
}

for (currentPeer = host->peers; currentPeer < &host->peers[host->peerCount]; ++currentPeer) {
enet_peer_reset(currentPeer);
Expand Down
Loading