lmoskala/SSLClient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix incorrect cast from bool to int, and an invalid return value

Browse source
This commit is contained in:
Noah Laptop 2019-12-30 08:00:00 -08:00
parent c2eca312f4
commit f9e4d2574c
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/SSLClient.cpp
View file

@ -89,7 +89,7 @@ int SSLClient::connect(IPAddress ip, uint16_t port) {
// connection check // connection check
if (get_arduino_client().connected()) { if (get_arduino_client().connected()) {
m_error("Cannot have two connections at the same time! Please create another SSLClient instance.", func_name); m_error("Cannot have two connections at the same time! Please create another SSLClient instance.", func_name);
return -1; return 0;
} }
// reset indexs for saftey // reset indexs for saftey
m_write_idx = 0; m_write_idx = 0;
@ -112,16 +112,13 @@ int SSLClient::connect(const char *host, uint16_t port) {
// connection check // connection check
if (get_arduino_client().connected()) { if (get_arduino_client().connected()) {
m_error("Cannot have two connections at the same time! Please create another SSLClient instance.", func_name); m_error("Cannot have two connections at the same time! Please create another SSLClient instance.", func_name);
return -1; return 0;
} }
// reset indexs for saftey // reset indexs for saftey
m_write_idx = 0; m_write_idx = 0;
// first, if we have a session, check if we're trying to resolve the same host
// as before
const bool connect_ok = get_arduino_client().connect(host, port);
// first we need our hidden client member to negotiate the socket for us, // first we need our hidden client member to negotiate the socket for us,
// since most times socket functionality is implemented in hardeware. // since most times socket functionality is implemented in hardeware.
if (!connect_ok) { if (!get_arduino_client().connect(host, port)) {
m_error("Failed to connect using m_client. Are you connected to the internet?", func_name); m_error("Failed to connect using m_client. Are you connected to the internet?", func_name);
setWriteError(SSL_CLIENT_CONNECT_FAIL); setWriteError(SSL_CLIENT_CONNECT_FAIL);
return 0; return 0;

2
src/SSLClient.h
View file

@ -165,7 +165,7 @@ public:
* *
* The implementation for this function can be found in SSLClientImpl::connect_impl(const char*, uint16_t) * The implementation for this function can be found in SSLClientImpl::connect_impl(const char*, uint16_t)
* *
* @pre The underlying client object (passed in through the constructor) is in a non- * @pre The underlying client object (passed in through the constructor) is in a non-
* error state, and must be able to access the IP. * error state, and must be able to access the IP.
* @pre SSLClient can only have one connection at a time, so the client * @pre SSLClient can only have one connection at a time, so the client
* object must not already be connected. * object must not already be connected.