Fix code warning.
Change-Id: Ib11fb49f528d3688351ae349d5b4e307c28b3967
diff --git a/mbtk/test/libmbtk_mqtt/mbtk_mqtt_aliyun_test.c b/mbtk/test/libmbtk_mqtt/mbtk_mqtt_aliyun_test.c
index 923b123..fc6820e 100755
--- a/mbtk/test/libmbtk_mqtt/mbtk_mqtt_aliyun_test.c
+++ b/mbtk/test/libmbtk_mqtt/mbtk_mqtt_aliyun_test.c
@@ -18,6 +18,8 @@
*/
int aliyun_xiyinyimi_connect(mbtk_mqtt_device_session_t *device, regnwl_info_t *regn);
+void iot_yield(Cloud_MQTT_t *piot_mqtt,iot_device_info_t *gateway);
+
struct opts_struct opts = {
(char *)"iot-dev", 0, (char *)"\n", QOS0, "admin", "password", (char *)"localhost", 1883, 0
@@ -40,7 +42,7 @@
return miot_mqtt;
}
-void mqtt_data_rx_cb(void *pbuf, int len)
+void mqtt_data_rx_cb(void *pbuf, int len)
{
printf("data = %s\n", (unsigned char *)pbuf); //打印接收到的数据
@@ -49,7 +51,7 @@
void MQTTMessageArrived_Cb(MessageData* md)
{
- MQTTMessage *message = md->message;
+ MQTTMessage *message = md->message;
Cloud_MQTT_t *piot_mqtt = get_mqtt_t();
@@ -63,7 +65,7 @@
{
while (gateway.iotstatus != IOT_STATUS_DROP){
printf("gateway.iotstatus is %d\n",gateway.iotstatus);
- iot_yield(arg,&gateway); //维持服务器稳定，断开重连
+ iot_yield((Cloud_MQTT_t*)arg,&gateway); //维持服务器稳定，断开重连
}
printf("gateway.iotstatus is IOT_STATUS_DROP");
// mqtt_device_disconnect(arg);
@@ -78,9 +80,9 @@
{
printf("aliyun mqtt start2\n");
- int ret, len;
+// int ret, len;
char will_msg[256] = {"hello world"}; //初始化遗嘱数据
- static int i = 0;
+// static int i = 0;
mbtk_mqtt_device_session_t mbtk_mqtt_device = {0};
memcpy(mbtk_mqtt_device.device_name, argv[1] , strlen(argv[1]));
@@ -98,8 +100,8 @@
mbtk_aliyun_mqtt_one_type_one_secret_unregin_set_info_init(Iot_mqtt, &mbtk_mqtt_device,60*1000,4,mqtt_data_rx_cb);
mqtt_will_msg_set(Iot_mqtt, will_msg, strlen(will_msg)); //设置遗嘱
- set_mqtt_t(Iot_mqtt);
- ret = mbtk_aliyun_mqtt_one_type_one_secret_unregin_device_connect(Iot_mqtt); //初始化并连接mqtt服务器
+ set_mqtt_t(Iot_mqtt);
+ mbtk_aliyun_mqtt_one_type_one_secret_unregin_device_connect(Iot_mqtt); //初始化并连接mqtt服务器
printf("connect success\n");
int rc = mbtk_MQTTSubscribe(&Iot_mqtt->Client, Iot_mqtt->sub_topic, opts.qos, MQTTMessageArrived_Cb);
@@ -124,7 +126,7 @@
int aliyun_xiyinyimi_connect(mbtk_mqtt_device_session_t *device, regnwl_info_t *regn)
{
- int ret, len;
+ int ret;
char will_msg[256] = {"hello world"}; //初始化遗嘱数据
static int retry_count = 0;
pthread_t thread_ID; //定义线程id
@@ -133,17 +135,17 @@
Cloud_MQTT_t *Iot_mqtt;
Iot_mqtt = (Cloud_MQTT_t *)malloc(sizeof(Cloud_MQTT_t));
memset(Iot_mqtt,0x0,sizeof(Cloud_MQTT_t));
-
- iot_aliyun_mqtt_one_type_one_secret_unregin_connect_init(Iot_mqtt,device, regn->clientId, regn->deviceToken, 30,3,"aaa","aaa",mqtt_data_rx_cb);
-// iot_mqtt_init(Iot_mqtt,host,port, client, user, pass,30,3,"aaa","aaa",mqtt_data_rx_cb);
+ iot_aliyun_mqtt_one_type_one_secret_unregin_connect_init(Iot_mqtt,device, regn->clientId, regn->deviceToken, 30,3,"aaa","aaa",mqtt_data_rx_cb);
+
+// iot_mqtt_init(Iot_mqtt,host,port, client, user, pass,30,3,"aaa","aaa",mqtt_data_rx_cb);
mqtt_will_msg_set(Iot_mqtt, will_msg, strlen(will_msg)); //设置遗嘱
- set_mqtt_t(Iot_mqtt);
+ set_mqtt_t(Iot_mqtt);
ret = mqtt_device_connect(Iot_mqtt); //初始化并连接mqtt服务器
-
+
while (ret < 0 && retry_count <= 5) {
printf("ret = %d\r\n", ret);
@@ -155,7 +157,7 @@
if(ret < 0 && retry_count > 5)
{
printf("reconnect times more than 5 exit\n");
- return NULL;
+ return -1;
}
retry_count = 0;
@@ -167,7 +169,7 @@
return 0;
}
gateway.iotstatus = IOT_STATUS_CONNECT;
-
+
pthread_create(&thread_ID, NULL, &mqtt_thread, (void *)Iot_mqtt); //创建一个线程执行mqtt客户端
pthread_detach(thread_ID); //设置线程结束收尸
diff --git a/mbtk/test/libmbtk_mqtt/mbtk_mqtt_test.c b/mbtk/test/libmbtk_mqtt/mbtk_mqtt_test.c
index 5d99258..684878f 100755
--- a/mbtk/test/libmbtk_mqtt/mbtk_mqtt_test.c
+++ b/mbtk/test/libmbtk_mqtt/mbtk_mqtt_test.c
@@ -11,6 +11,7 @@
#include "fcntl.h"
#include "mbtk_sock2.h"
+void iot_yield(Cloud_MQTT_t *piot_mqtt,iot_device_info_t *gateway);
struct opts_struct opts = {
(char *)"iot-dev", 0, (char *)"\n", QOS0, "admin", "password", (char *)"localhost", 1883, 0
@@ -70,7 +71,7 @@
printf("input error.\n example:./mqtt_test 192.168.1.1 8080 clientid username password\n");
return 0;
}
- int ret, len;
+ int ret ;
char will_msg[256] = {"hello world"}; //初始化遗嘱数据
static int retry_count = 0;
pthread_t thread_ID; //定义线程id
@@ -96,7 +97,7 @@
if(ret < 0 && retry_count > 5)
{
printf("reconnect times more than 5 exit\n");
- return NULL;
+ return -1;
}
retry_count = 0;