Skip to content

Commit 710d55f

Browse files
f-michautf-michaut
committed
Cleanup + Fix TLS shutdown
1 parent 561686f commit 710d55f

File tree

6 files changed

+88
-85
lines changed

6 files changed

+88
-85
lines changed

‎include/CppSockets/Address.hpp

+12-21
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
** Author Francois Michaut
55
**
66
** Started on Sun Feb 13 17:09:05 2022 Francois Michaut
7-
** Last update Thu Jul 20 21:17:13 2023 Francois Michaut
7+
** Last update Sat Nov 11 16:57:43 2023 Francois Michaut
88
**
99
** Address.hpp : Interface to represent network addresses
1010
*/
@@ -15,30 +15,24 @@
1515
#include <string>
1616
#include <type_traits>
1717

18+
// TODO: add parsing functions (eg: from_string()) ?
1819
// TODO: support IPv6 (uint32 for address will not support IPv6)
1920
namespace CppSockets {
2021
class IAddress {
2122
public:
22-
[[nodiscard]]
23-
virtual std::uint32_t getAddress() const = 0;
24-
[[nodiscard]]
25-
virtual int getFamily() const = 0;
26-
[[nodiscard]]
27-
virtual const std::string &toString() const = 0;
23+
[[nodiscard]] virtual std::uint32_t getAddress() const = 0;
24+
[[nodiscard]] virtual int getFamily() const = 0;
25+
[[nodiscard]] virtual const std::string &toString() const = 0;
2826
};
2927

3028
class IEndpoint {
3129
public:
32-
[[nodiscard]]
33-
virtual std::uint16_t getPort() const = 0;
34-
[[nodiscard]]
35-
virtual const IAddress &getAddr() const = 0;
36-
[[nodiscard]]
37-
virtual const std::string &toString() const = 0;
30+
[[nodiscard]] virtual std::uint16_t getPort() const = 0;
31+
[[nodiscard]] virtual const IAddress &getAddr() const = 0;
32+
[[nodiscard]] virtual const std::string &toString() const = 0;
3833

3934
protected:
40-
[[nodiscard]]
41-
std::string makeString() const;
35+
[[nodiscard]] std::string makeString() const;
4236
};
4337

4438
template <class T>
@@ -51,18 +45,15 @@ namespace CppSockets {
5145
addr(std::move(addr)), port(port), str(makeString())
5246
{};
5347

54-
[[nodiscard]]
55-
std::uint16_t getPort() const override {
48+
[[nodiscard]] std::uint16_t getPort() const override {
5649
return port;
5750
}
5851

59-
[[nodiscard]]
60-
const T &getAddr() const override {
52+
[[nodiscard]] const T &getAddr() const override {
6153
return addr;
6254
}
6355

64-
[[nodiscard]]
65-
const std::string &toString() const override {
56+
[[nodiscard]] const std::string &toString() const override {
6657
return str;
6758
}
6859
private:

‎include/CppSockets/IPv4.hpp

+5-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
** Author Francois Michaut
55
**
66
** Started on Sun Feb 13 17:05:02 2022 Francois Michaut
7-
** Last update Thu Jul 20 20:23:05 2023 Francois Michaut
7+
** Last update Sat Nov 11 16:58:19 2023 Francois Michaut
88
**
99
** IPv4.hpp : Class used to represent and manipulate IPv4 addresses
1010
*/
@@ -17,16 +17,12 @@ namespace CppSockets {
1717
class IPv4 : public IAddress {
1818
public:
1919
explicit IPv4(std::uint32_t addr);
20-
IPv4(const char *addr);
20+
IPv4(const char *addr); // TODO add support for string. Maybe string_view ?
2121

22-
[[nodiscard]]
23-
std::uint32_t getAddress() const override;
2422

25-
[[nodiscard]]
26-
int getFamily() const override;
27-
28-
[[nodiscard]]
29-
const std::string &toString() const override;
23+
[[nodiscard]] std::uint32_t getAddress() const override;
24+
[[nodiscard]] int getFamily() const override;
25+
[[nodiscard]] const std::string &toString() const override;
3026

3127
private:
3228
std::uint32_t addr;

‎include/CppSockets/Socket.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
** Author Francois Michaut
55
**
66
** Started on Sat Jan 15 01:17:42 2022 Francois Michaut
7-
** Last update Sat Jul 22 19:43:35 2023 Francois Michaut
7+
** Last update Tue Nov 14 19:37:59 2023 Francois Michaut
88
**
99
** Socket.hpp : Portable C++ socket class
1010
*/
@@ -87,10 +87,10 @@ namespace CppSockets {
8787
static int getsockopt(int fd, int level, int optname, void *optval, socklen_t *optlen);
8888
int bind(std::uint32_t addr, uint16_t port);
8989

90-
int domain = 0;
91-
int type = 0;
92-
int protocol = 0;
93-
RawSocketType sockfd;
94-
bool is_connected = false;
90+
int m_domain = 0;
91+
int m_type = 0;
92+
int m_protocol = 0;
93+
RawSocketType m_sockfd;
94+
bool m_is_connected = false;
9595
};
9696
}

‎include/CppSockets/TlsSocket.hpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
** Author Francois Michaut
55
**
66
** Started on Wed Sep 14 20:51:23 2022 Francois Michaut
7-
** Last update Sat Jul 22 22:45:28 2023 Francois Michaut
7+
** Last update Tue Nov 14 19:37:45 2023 Francois Michaut
88
**
99
** SecureSocket.hpp : TLS socket wrapper using openssl
1010
*/
@@ -60,6 +60,7 @@ namespace CppSockets {
6060
std::string read(std::size_t len = -1);
6161
std::size_t read(char *buff, std::size_t size);
6262
std::size_t write(const std::string &buff);
63+
std::size_t write(std::string_view buff);
6364
std::size_t write(const char *buff, std::size_t len);
6465

6566
void set_certificate(std::string cert_path, std::string pkey_path);
@@ -82,11 +83,14 @@ namespace CppSockets {
8283
X509_ptr m_peer_cert;
8384
X509_ptr m_cert;
8485
EVP_PKEY_ptr m_pkey;
85-
bool m_do_shutdown = true;
8686

8787
void check_for_error(std::string error_msg, int ret);
8888
};
8989

90+
inline std::size_t TlsSocket::write(std::string_view buff) {
91+
return write(buff.data(), buff.size());
92+
}
93+
9094
inline std::size_t TlsSocket::write(const std::string &buff) {
9195
return write(buff.c_str(), buff.size());
9296
}

‎source/Socket.cpp

+36-36
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
** Author Francois Michaut
55
**
66
** Started on Sat Jan 15 01:27:40 2022 Francois Michaut
7-
** Last update Sat Jul 22 22:09:20 2023 Francois Michaut
7+
** Last update Tue Nov 14 20:03:40 2023 Francois Michaut
88
**
99
** Socket.cpp : Protable C++ socket class implementation
1010
*/
@@ -38,29 +38,29 @@ static constexpr int BUFF_SIZE = 4096;
3838
// TODO throw custom exceptions on invalid status (eg: socket already connected)
3939
namespace CppSockets {
4040
Socket::Socket(RawSocketType sockfd, bool connected) :
41-
sockfd(sockfd), is_connected(connected)
41+
m_sockfd(sockfd), m_is_connected(connected)
4242
{
4343
socklen_t len = sizeof(int);
4444

45-
Socket::getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN, &domain, &len);
46-
Socket::getsockopt(sockfd, SOL_SOCKET, SO_TYPE, &type, &len);
47-
Socket::getsockopt(sockfd, SOL_SOCKET, SO_PROTOCOL, &protocol, &len);
45+
Socket::getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN, &m_domain, &len);
46+
Socket::getsockopt(sockfd, SOL_SOCKET, SO_TYPE, &m_type, &len);
47+
Socket::getsockopt(sockfd, SOL_SOCKET, SO_PROTOCOL, &m_protocol, &len);
4848
}
4949

5050
// TODO: more error handling arround is_connected == false and sockfd == INVALID in IO calls
5151
Socket::Socket() :
52-
sockfd(INVALID_SOCKET)
52+
m_sockfd(INVALID_SOCKET)
5353
{}
5454

5555
Socket::Socket(int domain, int type, int protocol) :
56-
domain(domain), type(type), protocol(protocol), sockfd(::socket(domain, type, protocol))
56+
m_domain(domain), m_type(type), m_protocol(protocol), m_sockfd(::socket(domain, type, protocol))
5757
{
58-
if (sockfd == INVALID_SOCKET)
58+
if (m_sockfd == INVALID_SOCKET)
5959
throw std::runtime_error(std::string("Failed to create socket : ") + std::strerror(errno));
6060
}
6161

6262
Socket::Socket(Socket &&other) noexcept :
63-
sockfd(INVALID_SOCKET)
63+
m_sockfd(INVALID_SOCKET)
6464
{
6565
*this = std::move(other);
6666
}
@@ -70,19 +70,19 @@ namespace CppSockets {
7070
return *this;
7171
this->close();
7272

73-
sockfd = other.sockfd;
74-
domain = other.domain;
75-
other.sockfd = INVALID_SOCKET;
76-
is_connected = other.is_connected;
73+
m_sockfd = other.m_sockfd;
74+
m_domain = other.m_domain;
75+
other.m_sockfd = INVALID_SOCKET;
76+
m_is_connected = other.m_is_connected;
7777
return *this;
7878
}
7979

8080
void Socket::close() {
81-
if (sockfd != INVALID_SOCKET) {
81+
if (m_sockfd != INVALID_SOCKET) {
8282
#ifdef OS_WINDOWS
8383
closesocket(raw_socket);
8484
#else
85-
::close(sockfd);
85+
::close(m_sockfd);
8686
#endif
8787
}
8888
}
@@ -136,13 +136,13 @@ namespace CppSockets {
136136
std::size_t Socket::read(char *buff, std::size_t size) {
137137
std::size_t ret;
138138

139-
if (!is_connected)
139+
if (!m_is_connected)
140140
throw std::runtime_error("Not connected");
141-
ret = ::read(sockfd, buff, size);
141+
ret = ::read(m_sockfd, buff, size);
142142
if (ret < 0) {
143143
throw std::runtime_error(std::string("Failed to read from socket: ") + Socket::strerror());
144144
} else if (ret == 0 && size > 0) {
145-
is_connected = false;
145+
m_is_connected = false;
146146
}
147147
return ret;
148148
}
@@ -154,9 +154,9 @@ namespace CppSockets {
154154
std::size_t Socket::write(const char *buff, std::size_t len) {
155155
std::size_t ret;
156156

157-
if (!is_connected)
157+
if (!m_is_connected)
158158
throw std::runtime_error("Not connected");
159-
ret = ::write(sockfd, buff, len);
159+
ret = ::write(m_sockfd, buff, len);
160160
if (ret < 0) {
161161
throw std::runtime_error(std::string("Failed to write to socket: ") + Socket::strerror());
162162
}
@@ -170,11 +170,11 @@ namespace CppSockets {
170170
}
171171

172172
int Socket::getsockopt(int level, int optname, void *optval, socklen_t *optlen) {
173-
return this->getsockopt(sockfd, level, optname, optval, optlen);
173+
return this->getsockopt(m_sockfd, level, optname, optval, optlen);
174174
}
175175

176176
int Socket::setsockopt(int level, int optname, const void *optval, socklen_t optlen) {
177-
int ret = ::setsockopt(sockfd, level, optname, optval, optlen);
177+
int ret = ::setsockopt(m_sockfd, level, optname, optval, optlen);
178178

179179
if (ret < 0) {
180180
throw std::runtime_error(std::string("Failed to set sock opt: ") + Socket::strerror());
@@ -195,10 +195,10 @@ namespace CppSockets {
195195
struct sockaddr_in addr = {};
196196
int ret = 0;
197197

198-
addr.sin_family = domain;
198+
addr.sin_family = m_domain;
199199
addr.sin_addr.s_addr = s_addr;
200200
addr.sin_port = htons(port);
201-
ret = ::bind(sockfd, (struct sockaddr *)&addr, sizeof(addr));
201+
ret = ::bind(m_sockfd, (struct sockaddr *)&addr, sizeof(addr));
202202
if (ret < 0) {
203203
throw std::runtime_error(std::string("Failed to bind socket: ") + Socket::strerror());
204204
}
@@ -216,20 +216,20 @@ namespace CppSockets {
216216
addr.sin_addr.s_addr = endpoint.getAddr().getAddress();
217217
addr.sin_port = htons(endpoint.getPort());
218218
addr.sin_family = endpoint.getAddr().getFamily();
219-
ret = ::connect(sockfd, (const struct sockaddr *)&addr, sizeof(addr));
219+
ret = ::connect(m_sockfd, (const struct sockaddr *)&addr, sizeof(addr));
220220
if (ret < 0) {
221221
throw std::runtime_error(std::string("Failed to connect socket to ") + endpoint.toString() + " : " + Socket::strerror());
222222
}
223-
is_connected = ret == 0;
223+
m_is_connected = ret == 0;
224224
return ret;
225225
}
226226

227227
bool Socket::connected() const {
228-
return is_connected;
228+
return m_is_connected;
229229
}
230230

231231
int Socket::listen(int backlog) {
232-
int ret = ::listen(sockfd, backlog);
232+
int ret = ::listen(m_sockfd, backlog);
233233

234234
if (ret < 0) {
235235
throw std::runtime_error(std::string("Failed to listen socket: ") + Socket::strerror());
@@ -238,7 +238,7 @@ namespace CppSockets {
238238
}
239239

240240
std::shared_ptr<Socket> Socket::accept(void *addr_out) {
241-
int fd = ::accept(sockfd, nullptr, nullptr);
241+
int fd = ::accept(m_sockfd, nullptr, nullptr);
242242
int domain = 0;
243243
int type = 0;
244244
int protocol = 0;
@@ -253,14 +253,14 @@ namespace CppSockets {
253253
}
254254

255255
void Socket::set_blocking(bool val) {
256-
int flags = fcntl(sockfd, F_GETFL, 0);
256+
int flags = fcntl(m_sockfd, F_GETFL, 0);
257257
int ret = flags;
258258

259259
if (ret >= 0) {
260260
if (val) {
261-
ret = fcntl(sockfd, F_SETFL, flags | O_NONBLOCK); // NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg, hicpp-signed-bitwise)
261+
ret = fcntl(m_sockfd, F_SETFL, flags | O_NONBLOCK); // NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg, hicpp-signed-bitwise)
262262
} else {
263-
ret = fcntl(sockfd, F_SETFL, (flags | O_NONBLOCK) ^ O_NONBLOCK); // NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg, hicpp-signed-bitwise)
263+
ret = fcntl(m_sockfd, F_SETFL, (flags | O_NONBLOCK) ^ O_NONBLOCK); // NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg, hicpp-signed-bitwise)
264264
}
265265
}
266266
if (ret < 0) {
@@ -269,18 +269,18 @@ namespace CppSockets {
269269
}
270270

271271
RawSocketType Socket::get_fd() const {
272-
return sockfd;
272+
return m_sockfd;
273273
}
274274

275275
int Socket::get_domain() const {
276-
return domain;
276+
return m_domain;
277277
}
278278

279279
int Socket::get_protocol() const {
280-
return protocol;
280+
return m_protocol;
281281
}
282282

283283
int Socket::get_type() const {
284-
return type;
284+
return m_type;
285285
}
286286
}

0 commit comments

Comments
 (0)