Skip to content

Commit 9bab40b

Browse files
committed
issue: 4583806 Build fixes in socket redirect and TCP modules
Fix build errors in src/core/sock/sock-redirect.h and src/core/sock/sockinfo_tcp.cpp by updating declarations and adjusting dependencies to restore successful compilation. Signed-off-by: Omri Ritblat <[email protected]>
1 parent 1f5fcfa commit 9bab40b

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/core/sock/sock-redirect.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@
7272
#else
7373
#define XLIO_SYMBOL(_func) _func
7474
#define VALID_SYSCALL(_func) ((orig_os_api._func) != nullptr)
75-
#define SYSCALL(_func, ...) \
76-
((VALID_SYSCALL(_func) ? (void)0 : get_orig_funcs()),
7775
/* coverity[var_deref_op] */
78-
orig_os_api._func(__VA_ARGS__))
76+
#define SYSCALL(_func, ...) \
77+
((VALID_SYSCALL(_func) ? (void)0 : get_orig_funcs()), orig_os_api._func(__VA_ARGS__)) /* coverity[var_deref_op] */
7978
#define SYSCALL_ERRNO_UNSUPPORTED(_func, ...) \
8079
(VALID_SYSCALL(_func) ? orig_os_api._func(__VA_ARGS__) : ((errno = EOPNOTSUPP), -1))
8180
#define XLIO_CALL(_func, ...) _func(__VA_ARGS__)

src/core/sock/sockinfo_tcp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2900,7 +2900,7 @@ bool sockinfo_tcp::connect_bind_any_and_check_rules()
29002900

29012901
if (bound_any_addr) {
29022902
if(unlikely(tcp_bind(&m_pcb, reinterpret_cast<const ip_addr_t *>(&m_bound.get_ip_addr()),
2903-
ntohs(m_bound.get_in_port()), m_pcb.is_ipv6)!=0)
2903+
ntohs(m_bound.get_in_port()), m_pcb.is_ipv6)!=0))
29042904
return false;
29052905
}
29062906

0 commit comments

Comments
 (0)