sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the linux compile error

This commit is contained in:
Sukchan Lee 2017-11-15 14:38:51 +00:00
parent 068d049a9f
commit 221fd81bb2
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/core/include/core_sock.h
View File

@ -16,14 +16,12 @@ extern "C" {
#define SOCK_F_CONNECT (1 << 1)
#define SOCK_NTOP(__aDDR, __bUF) \
__aDDR ? \
((struct sockaddr_in *)__aDDR)->sin_family == AF_INET ? \
inet_ntop(AF_INET, &(((struct sockaddr_in *)__aDDR)->sin_addr), \
__bUF, INET_ADDRSTRLEN) : \
((struct sockaddr_in6 *)__aDDR)->sin6_family == AF_INET6 ? \
inet_ntop(AF_INET6, &(((struct sockaddr_in6 *)__aDDR)->sin6_addr), \
__bUF, INET6_ADDRSTRLEN) : "Unknown Family" : \
"Null Address"
((struct sockaddr_in *)__aDDR)->sin_family == AF_INET ? \
inet_ntop(AF_INET, &(((struct sockaddr_in *)__aDDR)->sin_addr), \
__bUF, INET_ADDRSTRLEN) : \
((struct sockaddr_in6 *)__aDDR)->sin6_family == AF_INET6 ? \
inet_ntop(AF_INET6, &(((struct sockaddr_in6 *)__aDDR)->sin6_addr), \
__bUF, INET6_ADDRSTRLEN) : "Unknown Family"
/**
* @defgroup core_sockopt Socket option definitions

2
lib/core/src/unix/sock.c
View File

@ -33,7 +33,7 @@ status_t sock_init(void)
max_fd = 0;
list_init(&fd_list);
memset(&read_fds, 0, sizeof(struct fd_set));
memset(&read_fds, 0, sizeof(fd_set));
return CORE_OK;
}

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

@ -67,7 +67,7 @@ static void sock_test2(abts_case *tc, void *data)
rv = tcp_create(&tcp, AF_INET6, NULL, SRV_PORT, NULL, 0, SOCK_F_BIND);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = thread_create(&recv_thread, NULL, recv_main, NULL);
rv = thread_create(&recv_thread, NULL, recv_main, tc);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = sock_accept(&tcp2, tcp);
@ -125,7 +125,7 @@ static void sock_test3(abts_case *tc, void *data)
rv = udp_create(&udp, AF_INET, NULL, SRV_PORT, NULL, 0, SOCK_F_BIND);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = thread_create(&send_thread, NULL, send_main, NULL);
rv = thread_create(&send_thread, NULL, send_main, tc);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
size = sock_recv(udp, buf, STRLEN, 0, &src_addr, &addrlen);