Merge pull request #6 from springcity2016/master

删除 tests 文件夹下的文件, 修改函数 qos2_publish_delete()

Author: Lawlieta

SConscript

@@ -12,9 +12,6 @@ src += Glob('src/trans/*.c');
 if GetDepend('PKG_USING_UMQTT_EXAMPLE'):
     src += Glob('samples/*.c');
 
-if GetDepend('PKG_USING_UMQTT_TEST'):
-    src += Glob('tests/*.c');
-
 path = [cwd + '/inc']
 
 group = DefineGroup('umqtt', src, depend = ['PKG_USING_UMQTT'], CPPPATH = path)

src/pkgs/umqtt_pkgs_decode.c

@@ -55,7 +55,7 @@ static int MQTTDeserialize_publish(struct umqtt_msg *pub_msg, rt_uint8_t *buf, i
     curdata += (rc = umqtt_pkgs_decodeBuf(curdata, &mylen));
     enddata = curdata + mylen;
 
-    if (!umqtt_readlenstring(&(pub_msg->msg.publish.topic_name_len), &(pub_msg->msg.publish.topic_name), &curdata, enddata) 
+    if (!umqtt_readlenstring((int *)&(pub_msg->msg.publish.topic_name_len), &(pub_msg->msg.publish.topic_name), &curdata, enddata) 
      || (enddata - curdata < 0)) 
     {  
         LOG_E(" decode publish, topic name error!");

src/umqtt.c

@@ -215,7 +215,7 @@ static int qos2_publish_delete(struct umqtt_client *client, int packet_id)
                 LOG_D(" qos2, deliver message! topic nme: %s ", p_msg->topic_name);
                 publish_msg.topic_name_len = p_msg->topic_name_len;
                 publish_msg.payload_len = p_msg->payload_len;
-                publish_msg.packet_id = p_msg->payload;
+                publish_msg.packet_id = p_msg->packet_id;
                 publish_msg.topic_name = p_msg->topic_name;
                 publish_msg.payload = p_msg->payload;
                 umqtt_deliver_message(client, p_msg->topic_name, p_msg->topic_name_len, &publish_msg);