]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Don’t use the recvmmsg dgram method on Android <5
authorYavor Georgiev <fealebenpae@gmail.com>
Tue, 5 Mar 2024 18:10:03 +0000 (19:10 +0100)
committerTomas Mraz <tomas@openssl.org>
Fri, 22 Mar 2024 16:00:01 +0000 (17:00 +0100)
recvmmsg and sendmmsg were only added to Android’s C library in version 5, starting with API Level 21.

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23754)

(cherry picked from commit 24109dca5a793d58c68a346db5b21746079ec317)

crypto/bio/bss_dgram.c

index c22860b1a40ed8077e34813ad869693bcc4b30c7..7dbdfe181a81b99b44dbe35c24b15bf5a491a422 100644 (file)
    #undef NO_RECVMSG
    #define NO_RECVMSG
 # endif
+# if defined(__ANDROID_API__) && __ANDROID_API__ < 21
+#  undef NO_RECVMMSG
+#  define NO_RECVMMSG
+# endif
 # if !defined(M_METHOD)
 #  if defined(OPENSSL_SYS_WINDOWS) && defined(BIO_HAVE_WSAMSG) && !defined(NO_WSARECVMSG)
 #   define M_METHOD  M_METHOD_WSARECVMSG