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

fix C89 errors

Browse Source
This commit is contained in:
radius 2017-11-19 09:41:36 -05:00
parent 885f5e7ed7
commit 9b673152f7
3 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -34,7 +34,7 @@
- LINUX/UDEV: Fix - RetroArch reads keyboard input when not focused with the udev input driver.
- NETPLAY: Fix disconnection not fully deinitializing Netplay.
- NETPLAY: Fix lan rooms when there is more than one room
- NETPLAY: Fix lan rooms on systems were all addresses are treated as IPv6
- NETPLAY: Fix lan rooms on systems where all addresses are treated as IPv6
- COMMON: Fix clear/free loop conditionals in playlists.
- WINDOWS/GDI: Fix flickering of text.
- WINDOWS/GDI: Fix graphics corruption on Windows 98

3
menu/cbs/menu_cbs_ok.c
View File

@ -3769,7 +3769,7 @@ static void netplay_refresh_rooms_cb(void *task_data, void *user_data, const cha
for (j = 0; i < netplay_room_count + lan_room_count; i++)
{
struct netplay_host *host = NULL;
host = &lan_hosts->hosts[j];
host = &lan_hosts->hosts[j++];
strlcpy(netplay_room_list[i].nickname,
@ -3799,7 +3799,6 @@ static void netplay_refresh_rooms_cb(void *task_data, void *user_data, const cha
snprintf(s, sizeof(s),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME),
netplay_room_list[i].nickname);
j++;
}
netplay_room_count += lan_room_count;

43
network/netplay/netplay_discovery.c
View File

@ -91,7 +91,6 @@ bool init_netplay_discovery(void)
{
struct addrinfo *addr = NULL;
int fd = socket_init((void **) &addr, 0, NULL, SOCKET_TYPE_DATAGRAM);
char s[NETPLAY_HOST_STR_LEN];
if (fd < 0)
goto error;
@ -102,9 +101,6 @@ bool init_netplay_discovery(void)
goto error;
}
inet_ntop_compat(AF_INET, &((struct sockaddr_in *)addr->ai_addr)->sin_addr,
s, INET6_ADDRSTRLEN);
RARCH_WARN("[discovery] Initialized discovery on %s\n", s);
lan_ad_client_fd = fd;
freeaddrinfo_retro(addr);
return true;
@ -130,6 +126,8 @@ void deinit_netplay_discovery(void)
bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state, void *data)
{
char port_str[6];
int k = 0;
int ret;
if (lan_ad_client_fd < 0)
return false;
@ -155,22 +153,23 @@ bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state,
#if defined(SOL_SOCKET) && defined(SO_BROADCAST)
if (setsockopt(lan_ad_client_fd, SOL_SOCKET, SO_BROADCAST,
(const char *)&canBroadcast, sizeof(canBroadcast)) < 0)
RARCH_WARN("[discovery] Failed to set netplay discovery port to broadcast.\n");
RARCH_WARN("[discovery] Failed to set netplay discovery port to broadcast\n");
#endif
/* Put together the request */
memcpy((void *) &ad_packet_buffer, "RANQ", 4);
ad_packet_buffer.protocol_version = htonl(NETPLAY_PROTOCOL_VERSION);
for (int k = 0; k < interfaces.size; k++)
for (k=0; k < interfaces.size; k++)
{
strlcpy(ad_packet_buffer.address, interfaces.entries[k].host,
NETPLAY_HOST_STR_LEN);
/* And send it off */
if (sendto(lan_ad_client_fd, (const char *) &ad_packet_buffer,
2*sizeof(uint32_t) + NETPLAY_HOST_STR_LEN, 0, addr->ai_addr, addr->ai_addrlen) <
(ssize_t) (2*sizeof(uint32_t)))
RARCH_WARN("[discovery] Failed to send netplay discovery response.\n");
ret = sendto(lan_ad_client_fd, (const char *) &ad_packet_buffer,
2*sizeof(uint32_t) + NETPLAY_HOST_STR_LEN, 0, addr->ai_addr, addr->ai_addrlen);
if (ret < (ssize_t) (2*sizeof(uint32_t)))
RARCH_WARN("[discovery] Failed to send netplay discovery query (error: %d)\n", ret);
}
freeaddrinfo_retro(addr);
@ -218,7 +217,7 @@ static bool init_lan_ad_server_socket(netplay_t *netplay, uint16_t port)
error:
if (addr)
freeaddrinfo_retro(addr);
RARCH_ERR("[discovery] Failed to initialize netplay advertisement socket.\n");
RARCH_ERR("[discovery] Failed to initialize netplay advertisement socket\n");
return false;
}
@ -234,14 +233,13 @@ bool netplay_lan_ad_server(netplay_t *netplay)
struct sockaddr their_addr;
socklen_t addr_size;
rarch_system_info_t *info = NULL;
int ret;
char reply_addr[NETPLAY_HOST_STR_LEN];
char our_addr[NETPLAY_HOST_STR_LEN];
int ret, k = 0;
char reply_addr[NETPLAY_HOST_STR_LEN], port_str[6];
struct addrinfo *our_addr, hints = {0};
if (lan_ad_server_fd < 0 && !init_lan_ad_server_socket(netplay, RARCH_DEFAULT_PORT))
return false;
/* Check for any ad queries */
while (1)
{
@ -284,7 +282,7 @@ bool netplay_lan_ad_server(netplay_t *netplay)
if (!net_ifinfo_new(&interfaces))
return false;
for (int k = 0; k < interfaces.size; k++)
for (k = 0; k < interfaces.size; k++)
{
char *p;
char sub[NETPLAY_HOST_STR_LEN];
@ -293,9 +291,11 @@ bool netplay_lan_ad_server(netplay_t *netplay)
if (p)
{
strlcpy(sub, reply_addr, p - reply_addr + 1);
if (strstr(interfaces.entries[k].host, sub) && !strstr(interfaces.entries[k].host, "127.0.0.1"))
if (strstr(interfaces.entries[k].host, sub) &&
!strstr(interfaces.entries[k].host, "127.0.0.1"))
{
RARCH_LOG ("[discovery] query received on common interface: %s/%s (theirs / ours) \n", reply_addr, interfaces.entries[k].host);
RARCH_LOG ("[discovery] query received on common interface: %s/%s (theirs / ours) \n",
reply_addr, interfaces.entries[k].host);
info = runloop_get_system_info();
@ -331,17 +331,14 @@ bool netplay_lan_ad_server(netplay_t *netplay)
NETPLAY_HOST_STR_LEN);
/* Build up the destination address*/
struct addrinfo hints = {0}, *addr;
char port_str[6];
snprintf(port_str, 6, "%hu", ntohs(((struct sockaddr_in*)(&their_addr))->sin_port));
if (getaddrinfo_retro(reply_addr, port_str, &hints, &addr) < 0)
if (getaddrinfo_retro(reply_addr, port_str, &hints, &our_addr) < 0)
continue;
RARCH_LOG ("[discovery] sending reply to %s \n", reply_addr);
/* And send it */
sendto(lan_ad_server_fd, (const char*)&ad_packet_buffer,
sizeof(struct ad_packet), 0, addr->ai_addr, addr_size);
sizeof(struct ad_packet), 0, our_addr->ai_addr, our_addr->ai_addrlen);
}
else
continue;