OrgUCloud
/
ucloud-iot-sdk-arduino
mirror of https://github.com/ucloud/ucloud-iot-sdk-arduino.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wrong file in last commit

This commit is contained in:
james.liu 2020-08-26 11:50:53 +08:00
parent 34da73e1d9
commit b2ebc286fc
2 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/UCloudIoTSDK.cpp
View File

@ -46,15 +46,13 @@ const char* mqtt_ca_crt= \
"-----END CERTIFICATE-----\n"
};
WiFiClient espClient;
#ifdef ENABLE_ESP32_TLS
WiFiClientSecure espSecureClient;
#endif
#ifdef ENABLE_ESP8266_TLS
#elif defined ENABLE_ESP8266_TLS
BearSSL::WiFiClientSecure espSecureClient;
BearSSL::X509List mqttcert(mqtt_ca_crt);
#else
WiFiClient espClient;
#endif
@ -125,15 +123,6 @@ UCloudMQTT::UCloudMQTT(char *product_sn,char *device_sn,char *product_secre
{
uiot_info_st.user_callback=callback;
}
uiot_info_st.is_tls=NO_TLS;
#ifdef ENABLE_ESP32_TLS
uiot_info_st.is_tls=ESP32_TLS;
#endif
#ifdef ENABLE_ESP8266_TLS
uiot_info_st.is_tls=ESP8266_TLS;
#endif
memcpy(uiot_info_st.productSn,product_sn,20);
memcpy(uiot_info_st.deviceSn,device_sn,20);
}
@ -144,15 +133,13 @@ int UCloudMQTT::mqtt_connect(void)
int retry_time=10;
while (!client.connected()&&retry_time)
{
if(uiot_info_st.is_tls==ESP32_TLS)
{
#ifdef ENABLE_ESP32_TLS
espSecureClient.setCACert(mqtt_ca_crt);
client.setClient(espSecureClient);
client.setServer(mqtt_server, 8883);
Serial.println("support TLS connection!");
}
else if(uiot_info_st.is_tls==ESP8266_TLS)
{
#elif defined ENABLE_ESP8266_TLS
espSecureClient.setTrustAnchors(&mqttcert);
setClock();
// if no check the CA Certification
@ -160,12 +147,11 @@ int UCloudMQTT::mqtt_connect(void)
client.setClient(espSecureClient);
client.setServer(mqtt_server, 8883);
Serial.println("support TLS connection!");
}
else
{
client.setClient(espClient);
client.setServer(mqtt_server, 1883);
}
#else
client.setClient(espClient);
client.setServer(mqtt_server, 1883);
#endif
client.setKeepAlive(500);
Serial.print("MQTT connecting ...");
/* connect now */
@ -317,6 +303,7 @@ boolean UCloudMQTT::unsubscribe(const char* topic)
}
#ifdef ENABLE_ESP8266_TLS
//esp8266使用加密时同步网络时间
void UCloudMQTT::setClock()
{
configTime(3 * 3600, 0, "pool.ntp.org", "time.nist.gov");

13
src/UCloudIoTSDK.h
View File

@ -28,24 +28,14 @@
#ifdef ENABLE_ESP32_TLS
#include <WiFiClientSecure.h>
#include <ssl_client.h>
#endif
#ifdef ENABLE_ESP8266_TLS
#elif defined ENABLE_ESP8266_TLS
#include <WiFiClientSecure.h>
#include <time.h>
#endif
#define DYNAMIC_AUTH 1
#define STATIC_AUTH 0
#define ESP8266_TLS 2
#define ESP32_TLS 1
#define NO_TLS 0
#define FAILED_RET 1
#define SUCCESS_RET 0
@ -57,7 +47,6 @@ typedef struct {
char productSecret[20];
char deviceSecret[20];
int auth_mode;
int is_tls;
MQTTHandlerFun user_callback;
}Uiot_Info_st;