Skip to content

Removal of references to Client class since it's not used anymore. #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2020
Merged

Removal of references to Client class since it's not used anymore. #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions src/ArduinoIoTCloudTCP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,11 @@ int ArduinoIoTCloudTCP::begin(TcpIpConnectionHandler & connection, String broker
_brokerAddress = brokerAddress;
_brokerPort = brokerPort;
time_service.begin(&connection);
return begin(_connection->getClient(), _brokerAddress, _brokerPort);
return begin(_brokerAddress, _brokerPort);
}

int ArduinoIoTCloudTCP::begin(Client& net, String brokerAddress, uint16_t brokerPort) {
int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {

_net = &net;
// store the broker address as class member
_brokerAddress = brokerAddress;
_brokerPort = brokerPort;

Expand Down Expand Up @@ -126,11 +124,7 @@ int ArduinoIoTCloudTCP::begin(Client& net, String brokerAddress, uint16_t broker
}

#ifdef BOARD_HAS_ECCX08
if (_connection != NULL) {
_sslClient = new BearSSLClient(_connection->getClient(), ArduinoIoTCloudTrustAnchor, ArduinoIoTCloudTrustAnchor_NUM);
} else {
_sslClient = new BearSSLClient(*_net, ArduinoIoTCloudTrustAnchor, ArduinoIoTCloudTrustAnchor_NUM);
}
_sslClient = new BearSSLClient(_connection->getClient(), ArduinoIoTCloudTrustAnchor, ArduinoIoTCloudTrustAnchor_NUM);
_sslClient->setEccSlot(keySlot, ECCX08Cert.bytes(), ECCX08Cert.length());
#elif defined(BOARD_ESP)
_sslClient = new WiFiClientSecure();
Expand Down Expand Up @@ -246,7 +240,7 @@ void ArduinoIoTCloudTCP::sendPropertiesToCloud() {
}


int ArduinoIoTCloudTCP::reconnect(Client& /* net */) {
int ArduinoIoTCloudTCP::reconnect() {
if (_mqttClient->connected()) {
_mqttClient->stop();
}
Expand Down Expand Up @@ -382,7 +376,7 @@ void ArduinoIoTCloudTCP::connectionCheck() {
}
break;
case ArduinoIoTConnectionStatus::RECONNECTING: {
int const ret_code_reconnect = reconnect(*_net);
int const ret_code_reconnect = reconnect();
Debug.print(DBG_INFO, "ArduinoCloud.reconnect(): %d", ret_code_reconnect);
if (ret_code_reconnect == CONNECT_SUCCESS) {
_iotStatus = ArduinoIoTConnectionStatus::CONNECTED;
Expand Down
5 changes: 2 additions & 3 deletions src/ArduinoIoTCloudTCP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
#else
int begin(TcpIpConnectionHandler & connection, String brokerAddress = DEFAULT_BROKER_ADDRESS_USER_PASS_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_USER_PASS_AUTH);
#endif
int begin(Client& net, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
int begin(String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
// Class constant declaration
static const int MQTT_TRANSMIT_BUFFER_SIZE = 256;

Expand All @@ -76,7 +76,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
}

// Clean up existing Mqtt connection, create a new one and initialize it
int reconnect(Client& /* net */);
int reconnect();

protected:
friend class CloudSerialClass;
Expand Down Expand Up @@ -113,7 +113,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
String _dataTopicOut;
String _dataTopicIn;
String _otaTopic;
Client* _net;

static void onMessage(int length);

Expand Down