miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added BoringSSL - replacement for OpenSSL, updated libcurl to use boringssl

Browse Source
This commit is contained in:
Sergii Pylypenko
2016-04-04 21:09:43 +03:00
parent 3f4f642d9f
commit 9fba98e5ab
364 changed files with 91224 additions and 29310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
project/jni/curl/lib/select.h
View File

@@ -1,5 +1,5 @@
#ifndef __SELECT_H
#define __SELECT_H
#ifndef HEADER_CURL_SELECT_H
#define HEADER_CURL_SELECT_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -7,11 +7,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
* are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -22,7 +22,7 @@
*
***************************************************************************/
#include "setup.h"
#include "curl_setup.h"
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
@@ -30,24 +30,6 @@
#include <poll.h>
#endif
/*
* poll() function on Windows Vista and later is called WSAPoll()
*/
#if defined(USE_WINSOCK) && (USE_WINSOCK > 1) && \
defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
# undef HAVE_POLL
# define HAVE_POLL 1
# undef HAVE_POLL_FINE
# define HAVE_POLL_FINE 1
# define poll(x,y,z) WSAPoll((x),(y),(z))
# if defined(_MSC_VER) && defined(POLLRDNORM)
# undef POLLPRI
# define POLLPRI POLLRDBAND
# define HAVE_STRUCT_POLLFD 1
# endif
#endif
/*
* Definition of pollfd struct and constants for platforms lacking them.
*/
@@ -84,14 +66,49 @@ struct pollfd
#define POLLRDBAND POLLPRI
#endif
int Curl_socket_ready(curl_socket_t readfd, curl_socket_t writefd,
int timeout_ms);
/* there are three CSELECT defines that are defined in the public header that
are exposed to users, but this *IN2 bit is only ever used internally and
therefore defined here */
#define CURL_CSELECT_IN2 (CURL_CSELECT_ERR << 1)
int Curl_socket_check(curl_socket_t readfd, curl_socket_t readfd2,
curl_socket_t writefd,
long timeout_ms);
/* provide the former API internally */
#define Curl_socket_ready(x,y,z) \
Curl_socket_check(x, CURL_SOCKET_BAD, y, z)
int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms);
/* On non-DOS and non-Winsock platforms, when Curl_ack_eintr is set,
* EINTR condition is honored and function might exit early without
* awaiting full timeout. Otherwise EINTR will be ignored and full
* timeout will elapse. */
extern int Curl_ack_eintr;
int Curl_wait_ms(int timeout_ms);
#ifdef TPF
int tpf_select_libcurl(int maxfds, fd_set* reads, fd_set* writes,
fd_set* excepts, struct timeval* tv);
#endif
#endif /* __SELECT_H */
/* Winsock and TPF sockets are not in range [0..FD_SETSIZE-1], which
unfortunately makes it impossible for us to easily check if they're valid
*/
#if defined(USE_WINSOCK) || defined(TPF)
#define VALID_SOCK(x) 1
#define VERIFY_SOCK(x) Curl_nop_stmt
#else
#define VALID_SOCK(s) (((s) >= 0) && ((s) < FD_SETSIZE))
#define VERIFY_SOCK(x) do { \
if(!VALID_SOCK(x)) { \
SET_SOCKERRNO(EINVAL); \
return -1; \
} \
} WHILE_FALSE
#endif
#endif /* HEADER_CURL_SELECT_H */