mirror/iodine
1
0
Fork 0
mirror of https://github.com/yarrick/iodine.git synced 2024-11-23 13:36:06 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101 from andcscott/98-get_addr-should-return-neg

Browse Source 
common: get_addr should return -1 on error
This commit is contained in:
Erik Ekman 2024-10-30 10:08:59 +01:00 committed by GitHub
commit 2b65972693
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common.c
View File

@ -142,6 +142,7 @@ get_addr(char *host, int port, int addr_family, int flags, struct sockaddr_stora
struct addrinfo hints, *addr; struct addrinfo hints, *addr;
int res; int res;
char portnum[8]; char portnum[8];
int addrlen;
memset(portnum, 0, sizeof(portnum)); memset(portnum, 0, sizeof(portnum));
snprintf(portnum, sizeof(portnum) - 1, "%d", port); snprintf(portnum, sizeof(portnum) - 1, "%d", port);
@ -158,15 +159,16 @@ get_addr(char *host, int port, int addr_family, int flags, struct sockaddr_stora
hints.ai_protocol = IPPROTO_UDP; hints.ai_protocol = IPPROTO_UDP;
res = getaddrinfo(host, portnum, &hints, &addr); res = getaddrinfo(host, portnum, &hints, &addr);
if (res == 0) { if (res != 0) {
int addrlen = addr->ai_addrlen; return -1;
}
addrlen = addr->ai_addrlen;
/* Grab first result */ /* Grab first result */
memcpy(out, addr->ai_addr, addr->ai_addrlen); memcpy(out, addr->ai_addr, addr->ai_addrlen);
freeaddrinfo(addr); freeaddrinfo(addr);
return addrlen; return addrlen;
} }
return res;
}
int int
open_dns(struct sockaddr_storage *sockaddr, size_t sockaddr_len) open_dns(struct sockaddr_storage *sockaddr, size_t sockaddr_len)

23
tests/common.c
View File

@ -280,6 +280,28 @@ START_TEST(test_parse_format_ipv4_mapped_ipv6)
} }
END_TEST END_TEST
START_TEST(test_get_addr_err)
{
char *host = "192.168.2.10";
struct sockaddr_storage addr;
int addr_len;
int flags = AI_PASSIVE;
/* Invalid host */
addr_len = get_addr(NULL, -1, flags, 0, &addr);
ck_assert(addr_len == -1);
/* Invalid port */
addr_len = get_addr(host, -1, flags, 0, &addr);
ck_assert(addr_len == -1);
/* Invalid flag */
addr_len = get_addr(host, 53, flags | 0xFFF, 0, &addr);
ck_assert(addr_len == -1);
/* Invalid addr */
addr_len = get_addr(host, 53, flags, 0, (struct sockaddr_storage *)NULL);
ck_assert(addr_len == -1);
}
END_TEST
TCase * TCase *
test_common_create_tests(void) test_common_create_tests(void)
{ {
@ -295,6 +317,7 @@ test_common_create_tests(void)
tcase_add_test(tc, test_query_datalen_wild); tcase_add_test(tc, test_query_datalen_wild);
tcase_add_test(tc, test_parse_format_ipv4); tcase_add_test(tc, test_parse_format_ipv4);
tcase_add_test(tc, test_parse_format_ipv4_listen_all); tcase_add_test(tc, test_parse_format_ipv4_listen_all);
tcase_add_test(tc, test_get_addr_err);
/* Tests require IPv6 support */ /* Tests require IPv6 support */
sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);