Skip to content

Commit 8161640

Browse files
f-michautf-michaut
committed
Implement TLS for Windows
1 parent 7a0bd91 commit 8161640

9 files changed

+123
-90
lines changed

‎CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
1515
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1616

1717
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
18+
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
1819

1920
project(LibCppSockets VERSION 0.1.0 LANGUAGES C CXX)
2021
configure_file(include/CppSockets/Version.hpp.in include/CppSockets/Version.hpp)
@@ -23,12 +24,16 @@ add_library(cppsockets
2324
source/Address.cpp
2425
source/IPv4.cpp
2526
source/Socket.cpp
27+
source/SocketInit.cpp
2628
source/TlsSocket.cpp
2729
)
2830
target_include_directories(cppsockets PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
2931

3032
find_package(OpenSSL 3.0 COMPONENTS SSL)
3133
target_link_libraries(cppsockets OpenSSL::SSL)
34+
if(WIN32)
35+
target_link_libraries(cppsockets wsock32 ws2_32)
36+
endif()
3237

3338
option(CPPSOCKETS_TESTS "TRUE to build the libcppsockets tests" FALSE)
3439
if(CPPSOCKETS_TESTS)

‎include/CppSockets/Socket.hpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@
1212
#pragma once
1313

1414
#include "CppSockets/OSDetection.hpp"
15+
#include "CppSockets/SocketInit.hpp"
1516

1617
// TODO: move the RawSocketType in CppSockets namespace
1718
#ifdef OS_WINDOWS
1819
#define NOMINMAX
1920
#include <winsock2.h>
2021
using RawSocketType=SOCKET;
2122
using socklen_t=int;
23+
using SockOptType=char;
2224
#else
2325
#include <sys/socket.h>
2426
using RawSocketType=int;
27+
using SockOptType=void;
2528
#endif
2629

2730
#include <memory>
2831

2932
#include "CppSockets/Address.hpp"
3033

3134
namespace CppSockets {
32-
void init(bool init_ssl = true, bool init_wsa = true);
33-
void deinit(bool deinit_ssl = true, bool deinit_wsa = true);
34-
35-
class Socket {
35+
class Socket : SocketInit {
3636
public:
3737
Socket();
3838
Socket(int domain, int type, int protocol);
@@ -51,8 +51,8 @@ namespace CppSockets {
5151
std::size_t write(const char *buff, std::size_t len);
5252

5353
int set_reuseaddr(bool value);
54-
int getsockopt(int level, int optname, void *optval, socklen_t *optlen);
55-
int setsockopt(int level, int optname, const void *optval, socklen_t optlen);
54+
int getsockopt(int level, int optname, SockOptType *optval, socklen_t *optlen);
55+
int setsockopt(int level, int optname, const SockOptType *optval, socklen_t optlen);
5656

5757
void close();
5858
int connect(const IEndpoint &endpoint);
@@ -84,7 +84,7 @@ namespace CppSockets {
8484
static char *strerror();
8585

8686
protected:
87-
static int getsockopt(int fd, int level, int optname, void *optval, socklen_t *optlen);
87+
static int getsockopt(int fd, int level, int optname, SockOptType *optval, socklen_t *optlen);
8888
int bind(std::uint32_t addr, uint16_t port);
8989

9090
int m_domain = 0;

‎include/CppSockets/SocketInit.hpp

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
** Project CppSockets, 2022
3+
**
4+
** Author Francois Michaut
5+
**
6+
** Started on Sat Jan 15 01:17:42 2022 Francois Michaut
7+
** Last update Tue Nov 14 19:37:59 2023 Francois Michaut
8+
**
9+
** SocketInit.hpp : Socket class automatic initialization and teardown
10+
*/
11+
12+
// Inspired from https://stackoverflow.com/questions/64753466/how-do-i-automatically-implicitly-create-a-instance-of-a-class-at-program-launch/64754436#64754436
13+
14+
namespace CppSockets
15+
{
16+
class SocketInit {
17+
struct Cleanup {
18+
~Cleanup();
19+
};
20+
21+
static bool init;
22+
static Cleanup cleanup;
23+
};
24+
}

‎include/CppSockets/TlsSocket.hpp

-5
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313

1414
#include "CppSockets/OSDetection.hpp"
1515

16-
#ifdef OS_WINDOWS
17-
// TODO Currently disabling TlsSocket for windows
18-
#else
19-
2016
#include "CppSockets/IPv4.hpp"
2117
#include "CppSockets/Socket.hpp"
2218

@@ -107,4 +103,3 @@ namespace CppSockets {
107103
return m_peer_cert;
108104
}
109105
}
110-
#endif

‎source/IPv4.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "CppSockets/IPv4.hpp"
1313
#include "CppSockets/Socket.hpp"
1414

15+
#include <array>
1516
#include <stdexcept>
1617

1718
#ifdef OS_WINDOWS
@@ -24,9 +25,10 @@ namespace CppSockets {
2425
IPv4::IPv4(std::uint32_t addr) :
2526
addr(htonl(addr))
2627
{
27-
struct in_addr tmp {.s_addr = this->addr};
28+
std::array<char, 17> buff = {0};
2829

29-
str = inet_ntoa(tmp);
30+
inet_ntop(AF_INET, &this->addr, buff.data(), buff.size());
31+
str = buff.data();
3032
}
3133

3234
IPv4::IPv4(const char *addr) :

‎source/Socket.cpp

+18-10
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
// To match windows's constants
2626
static constexpr int INVALID_SOCKET = -1;
2727
static constexpr int SOCKET_ERROR = -1;
28+
29+
#include <arpa/inet.h>
30+
#include <unistd.h>
2831
#endif
2932

3033
static constexpr int BUFF_SIZE = 4096;
@@ -35,7 +38,6 @@ static constexpr int BUFF_SIZE = 4096;
3538
#include <sstream>
3639
#include <stdexcept>
3740

38-
3941
// TODO add exceptions on error retunrs
4042
// TODO throw custom exceptions on invalid status (eg: socket already connected)
4143
namespace CppSockets {
@@ -44,8 +46,8 @@ namespace CppSockets {
4446
{
4547
socklen_t len = sizeof(int);
4648

47-
Socket::getsockopt(sockfd, SOL_SOCKET, SO_TYPE, &m_type, &len);
48-
#if !defined (OS_APPLE) && !defined (OS_WINDOWS)
49+
Socket::getsockopt(sockfd, SOL_SOCKET, SO_TYPE, (SockOptType *)&m_type, &len);
50+
#ifdef OS_LINUX
4951
Socket::getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN, &m_domain, &len);
5052
Socket::getsockopt(sockfd, SOL_SOCKET, SO_PROTOCOL, &m_protocol, &len);
5153
#endif
@@ -95,7 +97,7 @@ namespace CppSockets {
9597
close();
9698
}
9799

98-
int Socket::getsockopt(int fd, int level, int optname, void *optval, socklen_t *optlen) {
100+
int Socket::getsockopt(int fd, int level, int optname, SockOptType *optval, socklen_t *optlen) {
99101
int ret = ::getsockopt(fd, level, optname, optval, optlen);
100102

101103
if (ret == SOCKET_ERROR) {
@@ -109,14 +111,12 @@ namespace CppSockets {
109111
}
110112

111113
char *Socket::strerror(int err) {
112-
#ifdef OS_WINDOWS
113-
#else
114114
return ::strerror(err);
115-
#endif
116115
}
117116

118117
int Socket::get_errno() {
119118
#ifdef OS_WINDOWS
119+
return WSAGetLastError();
120120
#else
121121
return errno;
122122
#endif
@@ -170,14 +170,14 @@ namespace CppSockets {
170170
int Socket::set_reuseaddr(bool value) {
171171
int val = value;
172172

173-
return this->setsockopt(SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
173+
return this->setsockopt(SOL_SOCKET, SO_REUSEADDR, (SockOptType *)&val, sizeof(val));
174174
}
175175

176-
int Socket::getsockopt(int level, int optname, void *optval, socklen_t *optlen) {
176+
int Socket::getsockopt(int level, int optname, SockOptType *optval, socklen_t *optlen) {
177177
return this->getsockopt(m_sockfd, level, optname, optval, optlen);
178178
}
179179

180-
int Socket::setsockopt(int level, int optname, const void *optval, socklen_t optlen) {
180+
int Socket::setsockopt(int level, int optname, const SockOptType *optval, socklen_t optlen) {
181181
int ret = ::setsockopt(m_sockfd, level, optname, optval, optlen);
182182

183183
if (ret < 0) {
@@ -257,6 +257,13 @@ namespace CppSockets {
257257
}
258258

259259
void Socket::set_blocking(bool val) {
260+
#ifdef OS_WINDOWS
261+
u_long mode = val ? 0 : 1;
262+
int result = ioctlsocket(m_sockfd, FIONBIO, &mode);
263+
if (result != NO_ERROR) {
264+
throw std::runtime_error(std::string("Failed to change socket: ") + Socket::strerror());
265+
}
266+
#else
260267
int flags = fcntl(m_sockfd, F_GETFL, 0);
261268
int ret = flags;
262269

@@ -270,6 +277,7 @@ namespace CppSockets {
270277
if (ret < 0) {
271278
throw std::runtime_error(std::string("Failed to change socket: ") + Socket::strerror());
272279
}
280+
#endif
273281
}
274282

275283
RawSocketType Socket::get_fd() const {

‎source/SocketInit.cpp

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/*
2+
** Project LibCppSockets, 2022
3+
**
4+
** Author Francois Michaut
5+
**
6+
** Started on Thu Sep 15 14:24:25 2022 Francois Michaut
7+
** Last update Tue May 9 23:34:46 2023 Francois Michaut
8+
**
9+
** init.cpp : Startup/Cleanup functions implementation
10+
*/
11+
12+
#include "CppSockets/OSDetection.hpp"
13+
#include "CppSockets/SocketInit.hpp"
14+
15+
#include <stdexcept>
16+
#include <string>
17+
18+
#ifdef OS_WINDOWS
19+
#include <winsock2.h>
20+
#include <openssl/applink.c>
21+
#else
22+
#include <openssl/err.h>
23+
#include <openssl/ssl.h>
24+
#endif
25+
26+
namespace CppSockets {
27+
static bool init() {
28+
#ifdef OS_WINDOWS
29+
WSADATA wsa_data;
30+
31+
// TODO check value in wsa_data
32+
if (WSAStartup(MAKEWORD(2, 2), &wsa_data) != 0) {
33+
// TODO: use WSAGetLastError
34+
throw std::runtime_error(std::string("WASStartup Failed : ") + std::strerror(errno));
35+
}
36+
#else
37+
// TODO check if all of this is needed (commented out because it should not)
38+
// TODO check return values / raise errors
39+
// SSL_load_error_strings();
40+
// SSL_library_init();
41+
// OpenSSL_add_all_algorithms();
42+
#endif
43+
return true;
44+
}
45+
46+
static void deinit() {
47+
#ifdef OS_WINDOWS
48+
if (WSACleanup() == SOCKET_ERROR) {
49+
// TODO use FormatMessage to get the error string
50+
throw std::runtime_error(std::string("WSACleanup Failed : ") + std::to_string(WSAGetLastError()));
51+
}
52+
#else
53+
// TODO check return values / raise errors
54+
// ERR_free_strings();
55+
// EVP_cleanup();
56+
#endif
57+
}
58+
59+
SocketInit::Cleanup::~Cleanup() {
60+
deinit();
61+
}
62+
63+
bool SocketInit::init = CppSockets::init();
64+
SocketInit::Cleanup SocketInit::cleanup;
65+
}

‎source/TlsSocket.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
#include "CppSockets/OSDetection.hpp"
1313
#include "CppSockets/TlsSocket.hpp"
1414

15-
#ifdef OS_WINDOWS
16-
// TODO Currently disabling TlsSocket for windows
17-
#else
18-
1915
#include <openssl/err.h>
2016
#include <openssl/ssl.h>
2117

@@ -255,4 +251,3 @@ namespace CppSockets {
255251
}
256252
}
257253
}
258-
#endif

‎source/init.cpp

-61
This file was deleted.

0 commit comments

Comments
 (0)