mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add socket_type to socket_init

Browse Source
This commit is contained in:
twinaphex 2016-05-01 22:25:23 +02:00
parent d2a80e26db
commit 8b9456f419
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command.c
View File

@ -130,7 +130,7 @@ static bool cmd_init_network(rarch_cmd_t *handle, uint16_t port)
RARCH_LOG("Bringing up command interface on port %hu.\n", RARCH_LOG("Bringing up command interface on port %hu.\n",
(unsigned short)port); (unsigned short)port);
if (!socket_init(res, file_desc, port, NULL)) if (!socket_init(res, file_desc, port, NULL, SOCKET_TYPE_DATAGRAM))
goto error; goto error;
if (*file_desc < 0) if (*file_desc < 0)

8
libretro-common/include/net/net_socket.h
View File

@ -31,7 +31,13 @@
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
bool socket_init(void *address, int *fd, uint16_t port, const char *server); enum socket_type
{
SOCKET_TYPE_DATAGRAM = 0,
SOCKET_TYPE_STREAM
};
bool socket_init(void *address, int *fd, uint16_t port, const char *server, enum socket_type type);
int socket_close(int fd); int socket_close(int fd);

11
libretro-common/net/net_socket.c
View File

@ -24,7 +24,7 @@
#include <net/net_compat.h> #include <net/net_compat.h>
#include <net/net_socket.h> #include <net/net_socket.h>
bool socket_init(void *address, int *fd, uint16_t port, const char *server) bool socket_init(void *address, int *fd, uint16_t port, const char *server, enum socket_type type)
{ {
char port_buf[16] = {0}; char port_buf[16] = {0};
struct addrinfo hints = {0}; struct addrinfo hints = {0};
@ -41,7 +41,16 @@ bool socket_init(void *address, int *fd, uint16_t port, const char *server)
#else #else
hints.ai_family = AF_UNSPEC; hints.ai_family = AF_UNSPEC;
#endif #endif
switch (type)
{
case SOCKET_TYPE_DATAGRAM:
hints.ai_socktype = SOCK_DGRAM; hints.ai_socktype = SOCK_DGRAM;
break;
case SOCKET_TYPE_STREAM:
hints.ai_socktype = SOCK_STREAM;
break;
}
if (!server) if (!server)
hints.ai_flags = AI_PASSIVE; hints.ai_flags = AI_PASSIVE;

2
netplay/netplay.c
View File

@ -763,7 +763,7 @@ static bool init_udp_socket(netplay_t *netplay, const char *server,
uint16_t port) uint16_t port)
{ {
int *file_desc = (int*)&netplay->udp_fd; int *file_desc = (int*)&netplay->udp_fd;
if (!socket_init(&netplay->addr, file_desc, port, server)) if (!socket_init(&netplay->addr, file_desc, port, server, SOCKET_TYPE_DATAGRAM))
return false; return false;
if (*file_desc < 0) if (*file_desc < 0)