2b2d66d409
Including string.h in base.h causes any file that includes a BoringSSL header to include string.h. Generally this wouldn't be a problem, although string.h might slow down the compile if it wasn't otherwise needed. However, it also causes problems for ipsec-tools in Android because OpenSSL didn't have this behaviour. This change removes string.h from base.h and, instead, adds it to each .c file that requires it. Change-Id: I5968e50b0e230fd3adf9b72dd2836e6f52d6fb37 Reviewed-on: https://boringssl-review.googlesource.com/3200 Reviewed-by: David Benjamin <davidben@chromium.org> Reviewed-by: Adam Langley <agl@google.com>
113 lines
2.8 KiB
C
113 lines
2.8 KiB
C
/* Copyright (c) 2014, Google Inc.
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
|
|
|
#define _POSIX_SOURCE
|
|
|
|
#include <openssl/bio.h>
|
|
#include <openssl/err.h>
|
|
|
|
#include <fcntl.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
|
|
#if !defined(OPENSSL_WINDOWS)
|
|
#include <netdb.h>
|
|
#include <unistd.h>
|
|
#else
|
|
#pragma warning(push, 3)
|
|
#include <WinSock2.h>
|
|
#include <WS2tcpip.h>
|
|
#pragma warning(pop)
|
|
#endif
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
int bio_ip_and_port_to_socket_and_addr(int *out_sock,
|
|
struct sockaddr_storage *out_addr,
|
|
socklen_t *out_addr_length,
|
|
const char *hostname,
|
|
const char *port_str) {
|
|
struct addrinfo hint, *result, *cur;
|
|
int ret;
|
|
|
|
*out_sock = -1;
|
|
|
|
memset(&hint, 0, sizeof(hint));
|
|
hint.ai_family = AF_UNSPEC;
|
|
hint.ai_socktype = SOCK_STREAM;
|
|
|
|
ret = getaddrinfo(hostname, port_str, &hint, &result);
|
|
if (ret != 0) {
|
|
OPENSSL_PUT_ERROR(SYS, getaddrinfo, 0);
|
|
ERR_add_error_data(2, gai_strerror(ret));
|
|
return 0;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
for (cur = result; cur; cur = cur->ai_next) {
|
|
if (cur->ai_addrlen > sizeof(struct sockaddr_storage)) {
|
|
continue;
|
|
}
|
|
memset(out_addr, 0, sizeof(struct sockaddr_storage));
|
|
memcpy(out_addr, cur->ai_addr, cur->ai_addrlen);
|
|
*out_addr_length = cur->ai_addrlen;
|
|
|
|
*out_sock = socket(cur->ai_family, cur->ai_socktype, cur->ai_protocol);
|
|
if (*out_sock < 0) {
|
|
OPENSSL_PUT_SYSTEM_ERROR(socket);
|
|
goto out;
|
|
}
|
|
|
|
ret = 1;
|
|
break;
|
|
}
|
|
|
|
out:
|
|
freeaddrinfo(result);
|
|
return ret;
|
|
}
|
|
|
|
int bio_socket_nbio(int sock, int on) {
|
|
#if defined(OPENSSL_WINDOWS)
|
|
u_long arg = on;
|
|
|
|
return 0 == ioctlsocket(sock, FIONBIO, &arg);
|
|
#else
|
|
int flags = fcntl(sock, F_GETFL, 0);
|
|
if (flags < 0) {
|
|
return 0;
|
|
}
|
|
if (!on) {
|
|
flags &= ~O_NONBLOCK;
|
|
} else {
|
|
flags |= O_NONBLOCK;
|
|
}
|
|
return fcntl(sock, F_SETFL, flags) == 0;
|
|
#endif
|
|
}
|
|
|
|
void bio_clear_socket_error(void) {}
|
|
|
|
int bio_sock_error(int sock) {
|
|
int error;
|
|
socklen_t error_size = sizeof(error);
|
|
|
|
if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (char *)&error, &error_size) < 0) {
|
|
return 1;
|
|
}
|
|
return error;
|
|
}
|