GitHub/zTC1
1
0
Fork 0
mirror of https://github.com/oopuuu/zTC1.git synced 2025-12-12 13:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

去除 mqtt ssl

Browse Source
This commit is contained in:
zogodo
2020-02-17 13:20:16 +08:00
parent 61c349f26e
commit a4111dedfa
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
TC1/mqtt_server/user_mqtt_client.c
View File

@@ -31,31 +31,6 @@
#include "user_mqtt_client.h" #include "user_mqtt_client.h"
#include "c_json/c_json.h" #include "c_json/c_json.h"
//char MQTT_SERVER[64] = "192.168.33.219";
//int MQTT_SERVER_PORT = 1883;
#ifdef MQTT_CLIENT_SSL_ENABLE
char* mqtt_server_ssl_cert_str =
"-----BEGIN CERTIFICATE-----\r\n\
MIIC8DCCAlmgAwIBAgIJAOD63PlXjJi8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD\r\n\
VQQGEwJHQjEXMBUGA1UECAwOVW5pdGVkIEtpbmdkb20xDjAMBgNVBAcMBURlcmJ5\r\n\
MRIwEAYDVQQKDAlNb3NxdWl0dG8xCzAJBgNVBAsMAkNBMRYwFAYDVQQDDA1tb3Nx\r\n\
dWl0dG8ub3JnMR8wHQYJKoZIhvcNAQkBFhByb2dlckBhdGNob28ub3JnMB4XDTEy\r\n\
MDYyOTIyMTE1OVoXDTIyMDYyNzIyMTE1OVowgZAxCzAJBgNVBAYTAkdCMRcwFQYD\r\n\
VQQIDA5Vbml0ZWQgS2luZ2RvbTEOMAwGA1UEBwwFRGVyYnkxEjAQBgNVBAoMCU1v\r\n\
c3F1aXR0bzELMAkGA1UECwwCQ0ExFjAUBgNVBAMMDW1vc3F1aXR0by5vcmcxHzAd\r\n\
BgkqhkiG9w0BCQEWEHJvZ2VyQGF0Y2hvby5vcmcwgZ8wDQYJKoZIhvcNAQEBBQAD\r\n\
gY0AMIGJAoGBAMYkLmX7SqOT/jJCZoQ1NWdCrr/pq47m3xxyXcI+FLEmwbE3R9vM\r\n\
rE6sRbP2S89pfrCt7iuITXPKycpUcIU0mtcT1OqxGBV2lb6RaOT2gC5pxyGaFJ+h\r\n\
A+GIbdYKO3JprPxSBoRponZJvDGEZuM3N7p3S/lRoi7G5wG5mvUmaE5RAgMBAAGj\r\n\
UDBOMB0GA1UdDgQWBBTad2QneVztIPQzRRGj6ZHKqJTv5jAfBgNVHSMEGDAWgBTa\r\n\
d2QneVztIPQzRRGj6ZHKqJTv5jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA\r\n\
A4GBAAqw1rK4NlRUCUBLhEFUQasjP7xfFqlVbE2cRy0Rs4o3KS0JwzQVBwG85xge\r\n\
REyPOFdGdhBY2P1FNRy0MDr6xr+D2ZOwxs63dG1nnAnWZg7qwoLgpZ4fESPD3PkA\r\n\
1ZgKJc2zbSQ9fCPxt2W3mdVav66c6fsb7els2W2Iz7gERJSX\r\n\
-----END CERTIFICATE-----";
#endif // MQTT_CLIENT_SSL_ENABLE
typedef struct typedef struct
{ {
char topic[MAX_MQTT_TOPIC_SIZE]; char topic[MAX_MQTT_TOPIC_SIZE];
@@ -165,13 +140,8 @@ OSStatus UserMqttInit(void)
sprintf(topic_set, MQTT_CLIENT_SUB_TOPIC1); sprintf(topic_set, MQTT_CLIENT_SUB_TOPIC1);
sprintf(topic_state, MQTT_CLIENT_PUB_TOPIC, str_mac); sprintf(topic_state, MQTT_CLIENT_PUB_TOPIC, str_mac);
#ifdef MQTT_CLIENT_SSL_ENABLE
int mqtt_thread_stack_size = 0x3000;
#else
//TODO size:0x800 //TODO size:0x800
int mqtt_thread_stack_size = 0x2000; int mqtt_thread_stack_size = 0x2000;
#endif
uint32_t mqtt_lib_version = MQTTClientLibVersion(); uint32_t mqtt_lib_version = MQTTClientLibVersion();
app_log("MQTT client version: [%ld.%ld.%ld]", app_log("MQTT client version: [%ld.%ld.%ld]",
0xFF & (mqtt_lib_version >> 16), 0xFF & (mqtt_lib_version >> 8), 0xFF & mqtt_lib_version); 0xFF & (mqtt_lib_version >> 16), 0xFF & (mqtt_lib_version >> 8), 0xFF & mqtt_lib_version);
@@ -274,15 +244,7 @@ void MqttClientThread(mico_thread_arg_t arg)
isconnect = false; isconnect = false;
/* 1. create network connection */ /* 1. create network connection */
#ifdef MQTT_CLIENT_SSL_ENABLE
ssl_settings.ssl_enable = true;
ssl_settings.ssl_debug_enable = false; // ssl debug log
ssl_settings.ssl_version = TLS_V1_2_MODE;
ssl_settings.ca_str_len = strlen(mqtt_server_ssl_cert_str);
ssl_settings.ca_str = mqtt_server_ssl_cert_str;
#else
ssl_settings.ssl_enable = false; ssl_settings.ssl_enable = false;
#endif
LinkStatusTypeDef LinkStatus; LinkStatusTypeDef LinkStatus;
while (1) while (1)
{ {

1
TC1/mqtt_server/user_mqtt_client.h
View File

@@ -10,7 +10,6 @@
#define MQTT_CMD_TIMEOUT 5000 // 5s #define MQTT_CMD_TIMEOUT 5000 // 5s
#define MQTT_YIELD_TMIE 5000 // 5s #define MQTT_YIELD_TMIE 5000 // 5s
//#define MQTT_CLIENT_SSL_ENABLE // ssl
#define MAX_MQTT_TOPIC_SIZE (256) #define MAX_MQTT_TOPIC_SIZE (256)
#define MAX_MQTT_DATA_SIZE (1024) #define MAX_MQTT_DATA_SIZE (1024)
#define MAX_MQTT_SEND_QUEUE_SIZE (10) #define MAX_MQTT_SEND_QUEUE_SIZE (10)