acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

remove AI_PASSIVE if hostname is NULL

This commit is contained in:
Sukchan Lee 2017-11-24 20:45:51 +09:00
parent d49404ad2d
commit 5a8d169ba1
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/include/arch/unix/core_arch_network.h
View File

@ -8,10 +8,6 @@
#include <arpa/inet.h>
#endif
#if HAVE_NETDB_H
#include <netdb.h>
#endif
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif

4
lib/core/include/core_network.h
View File

@ -4,6 +4,10 @@
#include "core_errno.h"
#include "core_time.h"
#if HAVE_NETDB_H
#include <netdb.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */

3
lib/core/src/unix/socket.c
View File

@ -488,9 +488,6 @@ status_t core_getaddrinfo(c_sockaddr_t **sa,
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = flags;
if (hostname == NULL)
hints.ai_flags |= AI_PASSIVE;
snprintf(service, sizeof(service), "%u", port);
rc = getaddrinfo(hostname, service, &hints, &ai_list);

9
lib/core/test/testsock.c
View File

@ -94,11 +94,12 @@ static void *THREAD_FUNC test3_main(thread_id id, void *data)
char str[STRLEN];
ssize_t size;
int rc;
char buf[CORE_ADDRSTRLEN];
rv = udp_socket(&udp, AF_INET);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = core_getaddrinfo(&sa, AF_UNSPEC, "127.0.0.1", PORT, 0);
rv = core_getaddrinfo(&sa, AF_INET, NULL, PORT, 0);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
size = core_sendto(udp, DATASTR, strlen(DATASTR), 0, sa);
@ -150,7 +151,7 @@ static void *THREAD_FUNC test4_main(thread_id id, void *data)
char str[STRLEN];
ssize_t size;
rv = udp_client(&udp, AF_INET, "127.0.0.1", PORT);
rv = udp_client(&udp, AF_INET, NULL, PORT);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
size = core_send(udp, DATASTR, strlen(DATASTR), 0);
@ -208,7 +209,7 @@ static void *THREAD_FUNC test5_main(thread_id id, void *data)
rv = udp_server(&udp, AF_INET6, NULL, PORT2);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = udp_connect(udp, "::1", PORT);
rv = udp_connect(udp, NULL, PORT);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
size = core_send(udp, DATASTR, strlen(DATASTR), 0);
@ -237,7 +238,7 @@ static void sock_test5(abts_case *tc, void *data)
rv = udp_server(&udp, AF_INET6, NULL, PORT);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = udp_connect(udp, "::1", PORT2);
rv = udp_connect(udp, NULL, PORT2);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = thread_create(&test5_thread, NULL, test5_main, tc);