CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-06 18:30:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Flesh out socket_create some more

Browse Source
This commit is contained in:
twinaphex 2016-05-02 18:42:13 +02:00
parent 62508eca77
commit 18f8ded154
3 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,12 @@ enum socket_type
SOCKET_TYPE_SEQPACKET SOCKET_TYPE_SEQPACKET
}; };
enum socket_protocol
{
SOCKET_PROTOCOL_NONE = 0,
SOCKET_PROTOCOL_UDP
};
int socket_init(void **address, uint16_t port, const char *server, enum socket_type type); int socket_init(void **address, uint16_t port, const char *server, enum socket_type type);
int socket_close(int fd); int socket_close(int fd);
@ -63,7 +69,11 @@ bool socket_bind(int fd, void *data);
int socket_connect(int fd, void *data, bool timeout_enable); int socket_connect(int fd, void *data, bool timeout_enable);
int socket_create(const char *name, enum socket_domain domain_type, enum socket_type socket_type, int protocol); int socket_create(
const char *name,
enum socket_domain domain_type,
enum socket_type socket_type,
enum socket_protocol protocol_type);
RETRO_END_DECLS RETRO_END_DECLS

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

@ -217,13 +217,14 @@ int socket_connect(int fd, void *data, bool timeout_enable)
int socket_create( int socket_create(
const char *name, const char *name,
enum socket_domain domain_type, enum socket_domain domain_type,
enum socket_type socket_type, enum socket_type socket_type,
int protocol) enum socket_protocol protocol_type)
{ {
#ifdef VITA #ifdef VITA
int type = 0; int type = 0;
int domain = 0; int domain = 0;
int protocol = 0;
switch (domain_type) switch (domain_type)
{ {
@ -244,10 +245,22 @@ int socket_create(
/* TODO/FIXME - implement */ /* TODO/FIXME - implement */
break; break;
} }
switch (protocol_type)
{
case SOCKET_PROTOCOL_NONE:
protocol = 0;
break;
case SOCKET_PROTOCOL_UDP:
/* TODO/FIXME - implement */
break;
}
return sceNetSocket(name, domain, type, protocol); return sceNetSocket(name, domain, type, protocol);
#else #else
int type = 0; int type = 0;
int domain = 0; int domain = 0;
int protocol = 0;
switch (domain_type) switch (domain_type)
{ {
@ -268,6 +281,17 @@ int socket_create(
/* TODO/FIXME - implement */ /* TODO/FIXME - implement */
break; break;
} }
switch (protocol_type)
{
case SOCKET_PROTOCOL_NONE:
protocol = 0;
break;
case SOCKET_PROTOCOL_UDP:
/* TODO/FIXME - implement */
break;
}
return socket(domain, type, protocol); return socket(domain, type, protocol);
#endif #endif
} }

4
netlogger.c
View File

@ -67,7 +67,7 @@ static int network_interface_up(struct sockaddr_in *target, int index,
"ra_netlogger", "ra_netlogger",
SOCKET_DOMAIN_INET, SOCKET_DOMAIN_INET,
SOCKET_TYPE_DATAGRAM, SOCKET_TYPE_DATAGRAM,
0); SOCKET_PROTOCOL_NONE);
target->sin_family = PSP2_NET_AF_INET; target->sin_family = PSP2_NET_AF_INET;
target->sin_port = sceNetHtons(udp_port); target->sin_port = sceNetHtons(udp_port);
@ -108,7 +108,7 @@ static int network_interface_up(struct sockaddr_in *target, int index,
"ra_netlogger", "ra_netlogger",
SOCKET_DOMAIN_INET, SOCKET_DOMAIN_INET,
SOCKET_TYPE_DATAGRAM, SOCKET_TYPE_DATAGRAM,
0); SOCKET_PROTOCOL_NONE);
target->sin_family = AF_INET; target->sin_family = AF_INET;
target->sin_port = htons(udp_port); target->sin_port = htons(udp_port);