MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed udp server issue using PacketSend to verify the server was working, currently the UDP server only sends to itself, still to do is a from/recv concept from data packets (possibly split TCP/UDP send/recv functions)

Browse Source
This commit is contained in:
Jak Barnes 2019-03-16 18:00:50 +00:00
parent 0ea6d1543d
commit 867e29b6a4
3 changed files with 68 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/network/network_udp_client.c
View File

@ -64,7 +64,7 @@ int main()
int screenWidth = 800; int screenWidth = 800;
int screenHeight = 450; int screenHeight = 450;
InitWindow( InitWindow(
screenWidth, screenHeight, "raylib [network] example - ping pong"); screenWidth, screenHeight, "raylib [network] example - udp client");
SetTargetFPS(60); SetTargetFPS(60);
SetTraceLogLevel(LOG_DEBUG); SetTraceLogLevel(LOG_DEBUG);
@ -82,12 +82,6 @@ int main()
if (!SocketCreate(&client_cfg, client_res)) { if (!SocketCreate(&client_cfg, client_res)) {
TraceLog(LOG_WARNING, "Failed to open client: status %d, errno %d", TraceLog(LOG_WARNING, "Failed to open client: status %d, errno %d",
client_res->status, client_res->socket->status); client_res->status, client_res->socket->status);
} else {
if (!SocketConnect(&client_cfg, client_res)) {
TraceLog(LOG_WARNING,
"Failed to connect to server: status %d, errno %d",
client_res->status, client_res->socket->status);
}
} }
// Create & Add sockets to the socket set // Create & Add sockets to the socket set

11
examples/network/network_udp_server.c
View File

@ -33,10 +33,11 @@ void NetworkUpdate()
// IsSocketReady // IsSocketReady
// //
// If the socket is ready, attempt to receive data from the socket // If the socket is ready, attempt to receive data from the socket
int bytesRecv = 0; // int bytesRecv = 0;
if (IsSocketReady(server_res->socket)) { // if (IsSocketReady(server_res->socket)) {
bytesRecv = SocketReceive(server_res->socket, recvBuffer, msglen, 0); // bytesRecv = SocketReceive(server_res->socket, recvBuffer, msglen, 0);
} // }
int bytesRecv = SocketReceive(server_res->socket, recvBuffer, msglen, 0);
// If we received data, was that data a "Ping!" or a "Pong!" // If we received data, was that data a "Ping!" or a "Pong!"
if (bytesRecv > 0) { if (bytesRecv > 0) {
@ -64,7 +65,7 @@ int main()
int screenWidth = 800; int screenWidth = 800;
int screenHeight = 450; int screenHeight = 450;
InitWindow( InitWindow(
screenWidth, screenHeight, "raylib [network] example - ping pong"); screenWidth, screenHeight, "raylib [network] example - udp server");
SetTargetFPS(60); SetTargetFPS(60);
SetTraceLogLevel(LOG_DEBUG); SetTraceLogLevel(LOG_DEBUG);

91
src/rnet.c
View File

@ -266,8 +266,20 @@ static bool SocketSetDefaults(SocketConfig *config)
static bool InitSocket(Socket *sock, struct addrinfo *addr) static bool InitSocket(Socket *sock, struct addrinfo *addr)
{ {
switch (sock->type) { switch (sock->type) {
case SOCKET_TCP: sock->channel = socket(AF_INET, SOCK_STREAM, 0); break; case SOCKET_TCP:
case SOCKET_UDP: sock->channel = socket(AF_INET, SOCK_DGRAM, 0); break; if (addr->ai_family == AF_INET) {
sock->channel = socket(AF_INET, SOCK_STREAM, 0);
} else {
sock->channel = socket(AF_INET6, SOCK_STREAM, 0);
}
break;
case SOCKET_UDP:
if (addr->ai_family == AF_INET) {
sock->channel = socket(AF_INET, SOCK_DGRAM, 0);
} else {
sock->channel = socket(AF_INET6, SOCK_DGRAM, 0);
}
break;
default: break; default: break;
} }
return IsSocketValid(sock); return IsSocketValid(sock);
@ -331,8 +343,11 @@ static bool CreateSocket(SocketConfig *config, SocketResult *outresult)
SocketGetLastErrorString()); SocketGetLastErrorString());
return (success = false); return (success = false);
} else { } else {
TraceLog( char hoststr[NI_MAXHOST];
LOG_INFO, "Successfully resolved host %s:%s", config->host, config->port); char portstr[NI_MAXSERV];
socklen_t client_len = sizeof(struct sockaddr_storage);
int rc = getnameinfo((struct sockaddr *) res->ai_addr, client_len, hoststr, sizeof(hoststr), portstr, sizeof(portstr), NI_NUMERICHOST | NI_NUMERICSERV);
TraceLog(LOG_INFO, "Successfully resolved host %s:%s", hoststr, portstr);
} }
// Walk the address information linked-list // Walk the address information linked-list
@ -387,6 +402,12 @@ static bool CreateSocket(SocketConfig *config, SocketResult *outresult)
memcpy(&outresult->socket->addripv4->address, memcpy(&outresult->socket->addripv4->address,
(struct sockaddr_in *) res->ai_addr, sizeof(struct sockaddr_in)); (struct sockaddr_in *) res->ai_addr, sizeof(struct sockaddr_in));
outresult->socket->isIPv6 = false; outresult->socket->isIPv6 = false;
char hoststr[NI_MAXHOST];
char portstr[NI_MAXSERV];
socklen_t client_len = sizeof(struct sockaddr_storage);
int rc = getnameinfo(
(struct sockaddr *) &outresult->socket->addripv4->address, client_len, hoststr, sizeof(hoststr), portstr, sizeof(portstr), NI_NUMERICHOST | NI_NUMERICSERV);
TraceLog(LOG_INFO, "Socket address set to %s:%s", hoststr, portstr);
} break; } break;
case AF_INET6: { case AF_INET6: {
outresult->socket->addripv6 = (struct _SocketAddressIPv6 *) malloc( outresult->socket->addripv6 = (struct _SocketAddressIPv6 *) malloc(
@ -398,6 +419,12 @@ static bool CreateSocket(SocketConfig *config, SocketResult *outresult)
memcpy(&outresult->socket->addripv6->address, memcpy(&outresult->socket->addripv6->address,
(struct sockaddr_in6 *) res->ai_addr, sizeof(struct sockaddr_in6)); (struct sockaddr_in6 *) res->ai_addr, sizeof(struct sockaddr_in6));
outresult->socket->isIPv6 = true; outresult->socket->isIPv6 = true;
char hoststr[NI_MAXHOST];
char portstr[NI_MAXSERV];
socklen_t client_len = sizeof(struct sockaddr_storage);
int rc = getnameinfo(
(struct sockaddr *) &outresult->socket->addripv6->address, client_len, hoststr, sizeof(hoststr), portstr, sizeof(portstr), NI_NUMERICHOST | NI_NUMERICSERV);
TraceLog(LOG_INFO, "Socket address set to %s:%s", hoststr, portstr);
} break; } break;
} }
} }
@ -748,9 +775,9 @@ bool SocketCreate(SocketConfig *config, SocketResult *result)
// Note: The bind function is required on an unconnected socket before subsequent calls to the listen function. // Note: The bind function is required on an unconnected socket before subsequent calls to the listen function.
bool SocketBind(SocketConfig *config, SocketResult *result) bool SocketBind(SocketConfig *config, SocketResult *result)
{ {
bool success = false; bool success = false;
result->status = RESULT_FAILURE; result->status = RESULT_FAILURE;
struct sockaddr_storage *sock_addr = NULL; struct sockaddr *sock_addr = NULL;
// Don't bind to a socket that isn't configured as a server // Don't bind to a socket that isn't configured as a server
if (!IsSocketValid(result->socket) || !config->server) { if (!IsSocketValid(result->socket) || !config->server) {
@ -758,30 +785,22 @@ bool SocketBind(SocketConfig *config, SocketResult *result)
"Cannot bind to socket marked as \"Client\" in SocketConfig."); "Cannot bind to socket marked as \"Client\" in SocketConfig.");
success = false; success = false;
} else { } else {
if (IsIPv4Address(config->host)) { if (result->socket->isIPv6) {
struct sockaddr_in ipv4addr; sock_addr = (struct sockaddr *) &result->socket->addripv6->address;
ipv4addr.sin_family = AF_INET;
ipv4addr.sin_port = config->port;
inet_pton(AF_INET, config->host, &ipv4addr.sin_addr);
sock_addr = (struct sockaddr_storage *) &ipv4addr;
} else { } else {
if (IsIPv6Address(config->host)) { sock_addr = (struct sockaddr *) &result->socket->addripv4->address;
struct sockaddr_in6 ipv6addr;
ipv6addr.sin6_family = AF_INET6;
ipv6addr.sin6_port = config->port;
inet_pton(AF_INET6, config->host, &ipv6addr.sin6_addr);
sock_addr = (struct sockaddr_storage *) &ipv6addr;
}
} }
if (bind(result->socket->channel, (struct sockaddr *) sock_addr, sizeof(*sock_addr)) != SOCKET_ERROR) { if (sock_addr != NULL) {
TraceLog(LOG_INFO, "Successfully bound socket."); if (bind(result->socket->channel, (struct sockaddr *) sock_addr, sizeof(*sock_addr)) != SOCKET_ERROR) {
success = true; TraceLog(LOG_INFO, "Successfully bound socket.");
} else { success = true;
result->socket->status = SocketGetLastError(); } else {
TraceLog(LOG_WARNING, "Socket Error: %s", result->socket->status = SocketGetLastError();
SocketErrorCodeToString(result->socket->status)); TraceLog(LOG_WARNING, "Socket Error: %s",
SocketSetLastError(0); SocketErrorCodeToString(result->socket->status));
success = false; SocketSetLastError(0);
success = false;
}
} }
} }
// Was the bind a success? // Was the bind a success?
@ -1104,8 +1123,9 @@ int SocketSend(Socket *sock, const void *datap, int length)
sizeof(sock->addripv4->address)); sizeof(sock->addripv4->address));
} }
if (sent >= 0) { if (sent >= 0) {
sock->status = status; sock->status = 0;
++numsent; ++numsent;
TraceLog(LOG_DEBUG, "Successfully sent \"%s\" (%d bytes)", datap, status);
} else { } else {
sock->status = SocketGetLastError(); sock->status = SocketGetLastError();
TraceLog(LOG_DEBUG, "Socket Error: %s", SocketGetLastErrorString(sock->status)); TraceLog(LOG_DEBUG, "Socket Error: %s", SocketGetLastErrorString(sock->status));
@ -1176,12 +1196,21 @@ int SocketReceive(Socket *sock, void *data, int maxlen, int timeout)
++numrecv; ++numrecv;
} else { } else {
sock->status = SocketGetLastError(); sock->status = SocketGetLastError();
TraceLog(LOG_DEBUG, "Socket Error: %s", SocketGetLastErrorString(sock->status)); switch (sock->status) {
case WSAEWOULDBLOCK: {
break;
}
default: {
TraceLog(LOG_WARNING, "Socket Error: %s", SocketErrorCodeToString(sock->status));
break;
}
}
SocketSetLastError(0); SocketSetLastError(0);
return 0; return 0;
} }
sock->ready = 0; sock->ready = 0;
return numrecv; return numrecv;
} break; } break;
} }
return -1; return -1;