Edit

kc3-lang/libressl/include/compat/sys/socket.h

Branch :

  • Browse

    Commit

  • Author : Sebastian Blunt
    Date : 2022-04-15 23:48:50
    Hash : fe903fb7
    Message : Fix unreachable nc portability shim This fixes nc failing to run on darwin due to it incorrectly setting the linux-specific SOCK_NONBLOCK flag on connect. nc already had a portability shim in apps/nc/compat/sys/socket.h, which kicks in if SOCK_NONBLOCK is undefined. But that header includes include/compat/sys/socket.h, which also has a portability shim that defines a default value for SOCK_NONBLOCK if it's undefined. Thus the first portability shim was unreachable. Fixes this by moving the NEED_SOCKET_FLAGS flag into the outer shim, and having the inner shim activate if NEED_SOCKET_FLAGS is defined. This closes https://github.com/libressl-portable/portable/issues/631

  • include/compat/sys/socket.h
  • /*
     * Public domain
     * sys/socket.h compatibility shim
     */
    
    #ifndef _WIN32
    #include_next <sys/socket.h>
    #else
    #include <win32netcompat.h>
    #endif
    
    #if !defined(SOCK_NONBLOCK) || !defined(SOCK_CLOEXEC)
    #define NEED_SOCKET_FLAGS
    #define SOCK_CLOEXEC            0x8000  /* set FD_CLOEXEC */
    #define SOCK_NONBLOCK           0x4000  /* set O_NONBLOCK */
    int bsd_socketpair(int domain, int type, int protocol, int socket_vector[2]);
    #define socketpair(d,t,p,sv) bsd_socketpair(d,t,p,sv)
    #endif