mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make net_ifinfo's allocation behavior simpler and clearer

Browse Source
This commit is contained in:
Gregor Richards 2016-11-30 19:57:18 -05:00
parent dd31ba3c22
commit a0ac7e6a68
4 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretro-common/net/net_ifinfo.c
View File

@ -65,7 +65,6 @@ void net_ifinfo_free(net_ifinfo_t *list)
ptr->host = NULL;
}
free(list->entries);
free(list);
}
bool net_ifinfo_new(net_ifinfo_t *list)
@ -82,6 +81,8 @@ bool net_ifinfo_new(net_ifinfo_t *list)
rv = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, adapter_addresses, &size);
memset(list, 0, sizeof(net_ifinfo_t));
if (rv != ERROR_SUCCESS)
goto error;
@ -122,6 +123,8 @@ bool net_ifinfo_new(net_ifinfo_t *list)
struct ifaddrs *ifa = NULL;
struct ifaddrs *ifaddr = NULL;
memset(list, 0, sizeof(net_ifinfo_t));
if (getifaddrs(&ifaddr) == -1)
goto error;

13
libretro-common/net/net_natt.c
View File

@ -163,7 +163,7 @@ bool natt_open_port(struct natt_status *status, struct sockaddr *addr, socklen_t
bool natt_open_port_any(struct natt_status *status, uint16_t port, enum socket_protocol proto)
{
struct net_ifinfo *list;
struct net_ifinfo list;
bool ret = false;
size_t i;
struct addrinfo hints = {0}, *addr;
@ -172,15 +172,13 @@ bool natt_open_port_any(struct natt_status *status, uint16_t port, enum socket_p
sprintf(port_str, "%hu", port);
/* get our interfaces */
if ((list = (struct net_ifinfo *) calloc(1, sizeof(struct net_ifinfo))) == NULL)
return false;
if (!net_ifinfo_new(list))
if (!net_ifinfo_new(&list))
return false;
/* loop through them */
for (i = 0; i < list->size; i++)
for (i = 0; i < list.size; i++)
{
struct net_ifinfo_entry *entry = list->entries + i;
struct net_ifinfo_entry *entry = list.entries + i;
/* ignore localhost */
if (!strcmp(entry->host, "127.0.0.1") || !strcmp(entry->host, "::1"))
@ -194,8 +192,7 @@ bool natt_open_port_any(struct natt_status *status, uint16_t port, enum socket_p
}
}
/* This really shouldn't free list, but does */
net_ifinfo_free(list);
net_ifinfo_free(&list);
return ret;
}

14
libretro-common/samples/net/net_ifinfo_test.c
View File

@ -29,21 +29,17 @@
int main(int argc, const char *argv[])
{
unsigned k = 0;
net_ifinfo_t *list =
(net_ifinfo_t*)calloc(1, sizeof(*list));
net_ifinfo_t list;
if (!list)
if (!net_ifinfo_new(&list))
return -1;
if (!net_ifinfo_new(list))
return -1;
for (k = 0; k < list->size; k++)
for (k = 0; k < list.size; k++)
{
printf("%s:%s\n", list->entries[k].name, list->entries[k].host);
printf("%s:%s\n", list.entries[k].name, list.entries[k].host);
}
net_ifinfo_free(list);
net_ifinfo_free(&list);
return 0;
}

14
menu/menu_displaylist.c
View File

@ -430,16 +430,12 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
static int menu_displaylist_parse_network_info(menu_displaylist_info_t *info)
{
unsigned k = 0;
net_ifinfo_t *list =
(net_ifinfo_t*)calloc(1, sizeof(*list));
net_ifinfo_t list;
if (!list)
if (!net_ifinfo_new(&list))
return -1;
if (!net_ifinfo_new(list))
return -1;
for (k = 0; k < list->size; k++)
for (k = 0; k < list.size; k++)
{
char tmp[255];
@ -447,12 +443,12 @@ static int menu_displaylist_parse_network_info(menu_displaylist_info_t *info)
snprintf(tmp, sizeof(tmp), "%s (%s) : %s\n",
msg_hash_to_str(MSG_INTERFACE),
list->entries[k].name, list->entries[k].host);
list.entries[k].name, list.entries[k].host);
menu_entries_append_enum(info->list, tmp, "",
MENU_ENUM_LABEL_NETWORK_INFO_ENTRY, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
}
net_ifinfo_free(list);
net_ifinfo_free(&list);
return 0;
}
#endif