style(格式): 代码格式优化

mqttclient/RyanMqttClient.h

@@ -1,7 +1,5 @@
-
-
-#ifndef __mqttClient__
-#define __mqttClient__
+#ifndef __RyanMqttClient__
+#define __RyanMqttClient__
 
 #ifdef __cplusplus
 extern "C"
@@ -9,12 +7,13 @@ extern "C"
 #endif
 
 #include "MQTTPacket.h"
-#include "RyanList.h"
-#include "RyanMqttPublic.h"
 #include "platformTimer.h"
 #include "platformSystem.h"
 #include "platformNetwork.h"
 
+#include "RyanList.h"
+#include "RyanMqttPublic.h"
+
     // 接收到订阅消息回调函数类型，eventData用户不要进行修改否则mqtt客户端可能崩溃
     typedef void (*RyanMqttEventHandle)(void *client, RyanMqttEventId_e event, const void const *eventData);
 

mqttclient/RyanMqttPublic.h

@@ -1,168 +1,167 @@
-
-
-#ifndef __mqttClientPublic__
-#define __mqttClientPublic__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-
-#define RyanMqttMaxPacketId (0xFFFFU - 1U)  // 你允许的mqtt paketid最大值，协议标准为个非零的 16 位数
-#define RyanMqttMaxPayloadLen (268435455UL) // 你允许的mqtt可变报头和有效载荷最长长度。默认值为协议标准
-#define RyanMqttVersion ("0.0.1")
-
-    // 定义枚举类型
-    typedef enum
-    {
-        RyanMqttBit31 = 0x80000000,
-        RyanMqttBit30 = 0x40000000,
-        RyanMqttBit29 = 0x20000000,
-        RyanMqttBit28 = 0x10000000,
-        RyanMqttBit27 = 0x08000000,
-        RyanMqttBit26 = 0x04000000,
-        RyanMqttBit25 = 0x02000000,
-        RyanMqttBit24 = 0x01000000,
-        RyanMqttBit23 = 0x00800000,
-        RyanMqttBit22 = 0x00400000,
-        RyanMqttBit21 = 0x00200000,
-        RyanMqttBit20 = 0x00100000,
-        RyanMqttBit19 = 0x00080000,
-        RyanMqttBit18 = 0x00040000,
-        RyanMqttBit17 = 0x00020000,
-        RyanMqttBit16 = 0x00010000,
-        RyanMqttBit15 = 0x00008000,
-        RyanMqttBit14 = 0x00004000,
-        RyanMqttBit13 = 0x00002000,
-        RyanMqttBit12 = 0x00001000,
-        RyanMqttBit11 = 0x00000800,
-        RyanMqttBit10 = 0x00000400,
-        RyanMqttBit9 = 0x00000200,
-        RyanMqttBit8 = 0x00000100,
-        RyanMqttBit7 = 0x00000080,
-        RyanMqttBit6 = 0x00000040,
-        RyanMqttBit5 = 0x00000020,
-        RyanMqttBit4 = 0x00000010,
-        RyanMqttBit3 = 0x00000008,
-        RyanMqttBit2 = 0x00000004,
-        RyanMqttBit1 = 0x00000002,
-        RyanMqttBit0 = 0x00000001,
-
-    } RyanMqttBit_e;
-
-    typedef enum
-    {
-        RyanMqttFalse = 0,
-        RyanMqttTrue = 1
-    } RyanMqttBool_e;
-
-    typedef enum
-    {
-        RyanMqttQos0 = 0x00,
-        RyanMqttQos1 = 0x01,
-        RyanMqttQos2 = 0x02,
-        RyanMqttSubFail = 0x80
-    } RyanMqttQos_e;
-
-    typedef enum
-    {
-        RyanMqttInvalidState = -1, // 无效状态
-        RyanMqttInitState = 0,     // 初始化状态
-        RyanMqttStartState,        // 开始状态
-        RyanMqttConnectState,      // 连接状态
-        RyanMqttDisconnectState,   // 断开连接状态
-        RyanMqttReconnectState,    // 重新连接状态
-    } RyanMqttState_e;
-
-    typedef enum
-    {
-        RyanMqttEventError = RyanMqttBit0,                 // 保留事件
-        RyanMqttEventConnected = RyanMqttBit1,             // 连接成功                                                      eventData: 正数为RyanMqttConnectStatus_e*, 负数为RyanMqttError_e*
-        RyanMqttEventDisconnected = RyanMqttBit2,          // 可能由用户触发,断开连接                                        eventData: 正数为RyanMqttConnectStatus_e*, 负数为RyanMqttError_e*
-        RyanMqttEventSubscribed = RyanMqttBit3,            // 订阅成功事件,服务端可以授予比订阅者要求的低的QoS等级。            eventData: RyanMqttMsgHandler_t*
-        RyanMqttEventSubscribedFaile = RyanMqttBit4,       // 订阅失败事件,超时 / 服务器返回订阅失败                           eventData: RyanMqttMsgHandler_t*
-        RyanMqttEventUnSubscribed = RyanMqttBit5,          // 取消订阅事件                                                   eventData: RyanMqttMsgHandler_t*
-        RyanMqttEventUnSubscribedFaile = RyanMqttBit6,     // 取消订阅失败事件，超时                                          eventData: RyanMqttMsgHandler_t*
-        RyanMqttEventPublished = RyanMqttBit7,             // qos1 / qos2发送成功事件。发送没有失败,只会重发或者用户手动丢弃。   eventData: RyanMqttAckHandler_t*
-        RyanMqttEventRepeatPublishPacket = RyanMqttBit8,   // qos1 / qos2数据(或者ack)重发回调函数                            eventData: RyanMqttAckHandler_t*
-        RyanMqttEventAckRepeatCountWarning = RyanMqttBit9, // ack重发次数超过警戒值                                           eventData: RyanMqttAckHandler_t*
-        RyanMqttEventAckCountWarning = RyanMqttBit10,      // ack记数值超过警戒值                                             eventData: uint16_t* ackHandlerCount;  等待ack的记录个数
-        RyanMqttEventAckHandlerdiscard = RyanMqttBit11,    /* 用户触发,ack句柄丢弃事件,由用户手动调用RyanMqttDestroyAckHandler函数触发
-                                                            * 可能是发送qos1 / qos2消息丢弃、ack丢弃，也可能是publish报文的ack丢弃
-                                                            * eventData: RyanMqttAckHandler_t*
-                                                            */
-        RyanMqttEventReconnectBefore = RyanMqttBit12,      // 重连前事件,用户可以在此时更改connect信息                          eventData: NULL
-        RyanMqttEventDestoryBefore = RyanMqttBit13,        // 用户触发，销毁客户端前回调                                        eventData: NULL
-        RyanMqttEventData = RyanMqttBit14,                 // 接收到订阅主题数据事件,支持通配符识别，返回的主题信息是报文主题       eventData: RyanMqttMsgData_t*
-        RyanMqttEventAnyId = UINT32_MAX,
-    } RyanMqttEventId_e;
-
-    // 定义枚举类型
-    typedef enum
-    {
-        RyanMqttParamInvalidError = -0x100, // 参数无效
-        RyanMqttRecvPacketTimeOutError,     // 读取数据超时
-        RyanMqttSendPacketTimeOutError,     // 发送数据超时
-        RyanSocketFailedError,              // 套接字 FD 失败
-        RyanMqttSocketConnectFailError,     // MQTT socket连接失败
-        RyanMqttSendPacketError,            // MQTT 发送数据包错误
-        RyanMqttSerializePacketError,       // 序列化报文失败
-        RyanMqttDeserializePacketError,     // 解析报文失败
-        RyanMqttNoRescourceError,           // 没有资源
-        RyanMqttHaveRescourceError,         // 资源已存在
-        RyanMqttNotConnectError,            // MQTT 没有连接
-        RyanMqttConnectError,               // MQTT 已连接
-        RyanMqttRecvBufToShortError,        // MQTT 缓冲区太短
-        RyanMqttSendBufToShortError,        // MQTT 缓冲区太短
-        RyanMqttNotEnoughMemError,          // MQTT 内存不足
-        RyanMqttFailedError,                // 失败
-        RyanMqttSuccessError = 0x0000       // 成功
-    } RyanMqttError_e;
-
-    typedef enum
-    {
-        // mqtt标准定义
-        RyanMqttConnectAccepted = 0,               // 连接已被服务端接受
-        RyanMqttConnectRefusedProtocolVersion = 1, // 服务端不支持客户端请求的 MQTT 协议级别
-        RyanMqttConnectRefusedIdentifier = 2,      // 不合格的客户端标识符
-        RyanMqttConnectRefusedServer = 3,          // 服务端不可用
-        RyanMqttConnectRefusedUsernamePass = 4,    // 无效的用户名或密码
-        RyanMqttConnectRefusedNotAuthorized = 5,   // 连接已拒绝，未授权
-
-        // mqtt非标准定义
-        RyanMqttConnectClientInvalid = 200, // 客户端处于无效状态
-        RyanMqttConnectNetWorkFail,         // 网络错误
-        RyanMqttConnectDisconnected,        // mqtt客户端断开连接
-        RyanMqttKeepaliveTimeout,           // 心跳超时断开连接
-        RyanMqttConnectUserDisconnected,    // 用户手动断开连接
-        RyanMqttConnectTimeout              // 超时断开
-    } RyanMqttConnectStatus_e;
-
-    // 定义结构体类型
-
-    /* extern variables-----------------------------------------------------------*/
-
-    extern const char *RyanMqttStrError(RyanMqttError_e state);
-#define RyanMqttCheckCodeNoReturn(EX, ErrorCode, Ryanlevel, code) \
-    if (!(EX))                                                    \
-    {                                                             \
-                                                                  \
-        Ryanlevel("ErrorCode: %d, strError: %s",                  \
-                  ErrorCode, RyanMqttStrError(ErrorCode));        \
-        {code};                                                   \
-    }
-
-#define RyanMqttCheckCode(EX, ErrorCode, level, code) RyanMqttCheckCodeNoReturn(EX, ErrorCode, level, { {code}; return ErrorCode; });
-
-#define RyanMqttCheckNoReturn(EX, ErrorCode, level) RyanMqttCheckCodeNoReturn(EX, ErrorCode, level, {})
-#define RyanMqttCheck(EX, ErrorCode, level) RyanMqttCheckCode(EX, ErrorCode, level, {})
-#define RyanMqttCheckAssert(EX, ErrorCode, level) RyanMqttCheckCodeNoReturn(EX, ErrorCode, level, { assert(NULL); })
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+
+
+#ifndef __mqttClientPublic__
+#define __mqttClientPublic__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+#define RyanMqttMaxPacketId (0xFFFFU - 1U)  // 你允许的mqtt paketid最大值，协议标准为个非零的 16 位数
+#define RyanMqttMaxPayloadLen (268435455UL) // 你允许的mqtt可变报头和有效载荷最长长度。默认值为协议标准
+#define RyanMqttVersion ("0.0.1")
+
+    // 定义枚举类型
+    typedef enum
+    {
+        RyanMqttBit31 = 0x80000000,
+        RyanMqttBit30 = 0x40000000,
+        RyanMqttBit29 = 0x20000000,
+        RyanMqttBit28 = 0x10000000,
+        RyanMqttBit27 = 0x08000000,
+        RyanMqttBit26 = 0x04000000,
+        RyanMqttBit25 = 0x02000000,
+        RyanMqttBit24 = 0x01000000,
+        RyanMqttBit23 = 0x00800000,
+        RyanMqttBit22 = 0x00400000,
+        RyanMqttBit21 = 0x00200000,
+        RyanMqttBit20 = 0x00100000,
+        RyanMqttBit19 = 0x00080000,
+        RyanMqttBit18 = 0x00040000,
+        RyanMqttBit17 = 0x00020000,
+        RyanMqttBit16 = 0x00010000,
+        RyanMqttBit15 = 0x00008000,
+        RyanMqttBit14 = 0x00004000,
+        RyanMqttBit13 = 0x00002000,
+        RyanMqttBit12 = 0x00001000,
+        RyanMqttBit11 = 0x00000800,
+        RyanMqttBit10 = 0x00000400,
+        RyanMqttBit9 = 0x00000200,
+        RyanMqttBit8 = 0x00000100,
+        RyanMqttBit7 = 0x00000080,
+        RyanMqttBit6 = 0x00000040,
+        RyanMqttBit5 = 0x00000020,
+        RyanMqttBit4 = 0x00000010,
+        RyanMqttBit3 = 0x00000008,
+        RyanMqttBit2 = 0x00000004,
+        RyanMqttBit1 = 0x00000002,
+        RyanMqttBit0 = 0x00000001,
+
+    } RyanMqttBit_e;
+
+    typedef enum
+    {
+        RyanMqttFalse = 0,
+        RyanMqttTrue = 1
+    } RyanMqttBool_e;
+
+    typedef enum
+    {
+        RyanMqttQos0 = 0x00,
+        RyanMqttQos1 = 0x01,
+        RyanMqttQos2 = 0x02,
+        RyanMqttSubFail = 0x80
+    } RyanMqttQos_e;
+
+    typedef enum
+    {
+        RyanMqttInvalidState = -1, // 无效状态
+        RyanMqttInitState = 0,     // 初始化状态
+        RyanMqttStartState,        // 开始状态
+        RyanMqttConnectState,      // 连接状态
+        RyanMqttDisconnectState,   // 断开连接状态
+        RyanMqttReconnectState,    // 重新连接状态
+    } RyanMqttState_e;
+
+    typedef enum
+    {
+        RyanMqttEventError = RyanMqttBit0,                 // 保留事件
+        RyanMqttEventConnected = RyanMqttBit1,             // 连接成功                                                      eventData: 正数为RyanMqttConnectStatus_e*, 负数为RyanMqttError_e*
+        RyanMqttEventDisconnected = RyanMqttBit2,          // 可能由用户触发,断开连接                                        eventData: 正数为RyanMqttConnectStatus_e*, 负数为RyanMqttError_e*
+        RyanMqttEventSubscribed = RyanMqttBit3,            // 订阅成功事件,服务端可以授予比订阅者要求的低的QoS等级。            eventData: RyanMqttMsgHandler_t*
+        RyanMqttEventSubscribedFaile = RyanMqttBit4,       // 订阅失败事件,超时 / 服务器返回订阅失败                           eventData: RyanMqttMsgHandler_t*
+        RyanMqttEventUnSubscribed = RyanMqttBit5,          // 取消订阅事件                                                   eventData: RyanMqttMsgHandler_t*
+        RyanMqttEventUnSubscribedFaile = RyanMqttBit6,     // 取消订阅失败事件，超时                                          eventData: RyanMqttMsgHandler_t*
+        RyanMqttEventPublished = RyanMqttBit7,             // qos1 / qos2发送成功事件。发送没有失败,只会重发或者用户手动丢弃。   eventData: RyanMqttAckHandler_t*
+        RyanMqttEventRepeatPublishPacket = RyanMqttBit8,   // qos1 / qos2数据(或者ack)重发回调函数                            eventData: RyanMqttAckHandler_t*
+        RyanMqttEventAckRepeatCountWarning = RyanMqttBit9, // ack重发次数超过警戒值                                           eventData: RyanMqttAckHandler_t*
+        RyanMqttEventAckCountWarning = RyanMqttBit10,      // ack记数值超过警戒值                                             eventData: uint16_t* ackHandlerCount;  等待ack的记录个数
+        RyanMqttEventAckHandlerdiscard = RyanMqttBit11,    /* 用户触发,ack句柄丢弃事件,由用户手动调用RyanMqttDestroyAckHandler函数触发
+                                                            * 可能是发送qos1 / qos2消息丢弃、ack丢弃，也可能是publish报文的ack丢弃
+                                                            * eventData: RyanMqttAckHandler_t*
+                                                            */
+        RyanMqttEventReconnectBefore = RyanMqttBit12,      // 重连前事件,用户可以在此时更改connect信息                          eventData: NULL
+        RyanMqttEventDestoryBefore = RyanMqttBit13,        // 用户触发，销毁客户端前回调                                        eventData: NULL
+        RyanMqttEventData = RyanMqttBit14,                 // 接收到订阅主题数据事件,支持通配符识别，返回的主题信息是报文主题       eventData: RyanMqttMsgData_t*
+        RyanMqttEventAnyId = UINT32_MAX,
+    } RyanMqttEventId_e;
+
+    // 定义枚举类型
+    typedef enum
+    {
+        RyanMqttParamInvalidError = -0x100, // 参数无效
+        RyanMqttRecvPacketTimeOutError,     // 读取数据超时
+        RyanMqttSendPacketTimeOutError,     // 发送数据超时
+        RyanSocketFailedError,              // 套接字 FD 失败
+        RyanMqttSocketConnectFailError,     // MQTT socket连接失败
+        RyanMqttSendPacketError,            // MQTT 发送数据包错误
+        RyanMqttSerializePacketError,       // 序列化报文失败
+        RyanMqttDeserializePacketError,     // 解析报文失败
+        RyanMqttNoRescourceError,           // 没有资源
+        RyanMqttHaveRescourceError,         // 资源已存在
+        RyanMqttNotConnectError,            // MQTT 没有连接
+        RyanMqttConnectError,               // MQTT 已连接
+        RyanMqttRecvBufToShortError,        // MQTT 缓冲区太短
+        RyanMqttSendBufToShortError,        // MQTT 缓冲区太短
+        RyanMqttNotEnoughMemError,          // MQTT 内存不足
+        RyanMqttFailedError,                // 失败
+        RyanMqttSuccessError = 0x0000       // 成功
+    } RyanMqttError_e;
+
+    typedef enum
+    {
+        // mqtt标准定义
+        RyanMqttConnectAccepted = 0,               // 连接已被服务端接受
+        RyanMqttConnectRefusedProtocolVersion = 1, // 服务端不支持客户端请求的 MQTT 协议级别
+        RyanMqttConnectRefusedIdentifier = 2,      // 不合格的客户端标识符
+        RyanMqttConnectRefusedServer = 3,          // 服务端不可用
+        RyanMqttConnectRefusedUsernamePass = 4,    // 无效的用户名或密码
+        RyanMqttConnectRefusedNotAuthorized = 5,   // 连接已拒绝，未授权
+
+        // mqtt非标准定义
+        RyanMqttConnectClientInvalid = 200, // 客户端处于无效状态
+        RyanMqttConnectNetWorkFail,         // 网络错误
+        RyanMqttConnectDisconnected,        // mqtt客户端断开连接
+        RyanMqttKeepaliveTimeout,           // 心跳超时断开连接
+        RyanMqttConnectUserDisconnected,    // 用户手动断开连接
+        RyanMqttConnectTimeout              // 超时断开
+    } RyanMqttConnectStatus_e;
+
+    // 定义结构体类型
+
+    /* extern variables-----------------------------------------------------------*/
+
+    extern const char *RyanMqttStrError(RyanMqttError_e state);
+#define RyanMqttCheckCodeNoReturn(EX, ErrorCode, Ryanlevel, code) \
+    if (!(EX))                                                    \
+    {                                                             \
+                                                                  \
+        Ryanlevel("ErrorCode: %d, strError: %s",                  \
+                  ErrorCode, RyanMqttStrError(ErrorCode));        \
+        {code};                                                   \
+    }
+
+#define RyanMqttCheckCode(EX, ErrorCode, level, code) RyanMqttCheckCodeNoReturn(EX, ErrorCode, level, { {code}; return ErrorCode; });
+
+#define RyanMqttCheckNoReturn(EX, ErrorCode, level) RyanMqttCheckCodeNoReturn(EX, ErrorCode, level, {})
+#define RyanMqttCheck(EX, ErrorCode, level) RyanMqttCheckCode(EX, ErrorCode, level, {})
+#define RyanMqttCheckAssert(EX, ErrorCode, level) RyanMqttCheckCodeNoReturn(EX, ErrorCode, level, { assert(NULL); })
+#ifdef __cplusplus
+}
+#endif
+
+#endif

mqttclient/RyanMqttThread.c

@@ -3,10 +3,6 @@
 #define rlogLevel (rlogLvlError) // 日志打印等级
 #define rlogTag "RyanMqttThread" // 日志tag
 
-#include "RyanMqttLog.h"
-#include "MQTTPacket.h"
-#include "RyanMqttClient.h"
-#include "RyanMqttUtile.h"
 #include "RyanMqttThread.h"
 
 void RyanMqttRefreshKeepaliveTime(RyanMqttClient_t *client)

mqttclient/RyanMqttThread.h

@@ -1,24 +1,26 @@
-
-#ifndef __mqttClientTask__
-#define __mqttClientTask__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-#include "RyanMqttClient.h"
-    // 定义枚举类型
-
-    // 定义结构体类型
-
-    /* extern variables-----------------------------------------------------------*/
-
-    extern void RyanMqttThread(void *argument);
-    extern void RyanMqttEventMachine(RyanMqttClient_t *client, RyanMqttEventId_e eventId, void *eventData);
-    extern void RyanMqttRefreshKeepaliveTime(RyanMqttClient_t *client);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#ifndef __RyanMqttThread__
+#define __RyanMqttThread__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "RyanMqttLog.h"
+#include "RyanMqttUtile.h"
+#include "RyanMqttClient.h"
+
+    // 定义枚举类型
+
+    // 定义结构体类型
+
+    /* extern variables-----------------------------------------------------------*/
+    extern void RyanMqttThread(void *argument);
+    extern void RyanMqttEventMachine(RyanMqttClient_t *client, RyanMqttEventId_e eventId, void *eventData);
+    extern void RyanMqttRefreshKeepaliveTime(RyanMqttClient_t *client);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

mqttclient/RyanMqttUtile.c

@@ -3,11 +3,7 @@
 #define rlogLevel (rlogLvlError) // 日志打印等级
 #define rlogTag "RyanMqttUtile"  // 日志tag
 
-#include "RyanMqttLog.h"
-#include "MQTTPacket.h"
-#include "RyanMqttClient.h"
 #include "RyanMqttUtile.h"
-#include "RyanMqttThread.h"
 
 /**
  * @brief 字符串拷贝，需要手动释放内存

mqttclient/RyanMqttUtile.h

@@ -1,12 +1,16 @@
 
-#ifndef __mqttGlobalFun__
-#define __mqttGlobalFun__
+#ifndef __RyanMqttUtile__
+#define __RyanMqttUtile__
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
+
+#include "RyanMqttLog.h"
 #include "RyanMqttClient.h"
+#include "RyanMqttThread.h"
+
     // 定义枚举类型
 
     // 定义结构体类型

platform/quecOpen/platformNetwork.h

@@ -1,39 +1,39 @@
-
-
-#ifndef __platformNetSocket__
-#define __platformNetSocket__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include "RyanMqttPublic.h"
-#include "platformTimer.h"
-
-#include "cmsis_os2.h"
-#include "ril.h"
-#include "ril_util.h "
-#include "ql_ps.h"
-#include "ql_socket.h"
-#include "ql_urc_register.h"
-
-
-    typedef struct
-    {
-        int socket;
-    } platformNetwork_t;
-
-    extern RyanMqttError_e platformNetworkConnect(void *userData, platformNetwork_t *platformNetwork, const char *host, const char *port);
-    extern RyanMqttError_e platformNetworkRecvAsync(void *userData, platformNetwork_t *platformNetwork, char *recvBuf, int recvLen, int timeout);
-    extern RyanMqttError_e platformNetworkSendAsync(void *userData, platformNetwork_t *platformNetwork, char *sendBuf, int sendLen, int timeout);
-    extern RyanMqttError_e platformNetworkClose(void *userData, platformNetwork_t *platformNetwork);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+
+
+#ifndef __platformNetwork__
+#define __platformNetwork__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include "RyanMqttPublic.h"
+#include "platformTimer.h"
+
+#include "cmsis_os2.h"
+#include "ril.h"
+#include "ril_util.h "
+#include "ql_ps.h"
+#include "ql_socket.h"
+#include "ql_urc_register.h"
+
+
+    typedef struct
+    {
+        int socket;
+    } platformNetwork_t;
+
+    extern RyanMqttError_e platformNetworkConnect(void *userData, platformNetwork_t *platformNetwork, const char *host, const char *port);
+    extern RyanMqttError_e platformNetworkRecvAsync(void *userData, platformNetwork_t *platformNetwork, char *recvBuf, int recvLen, int timeout);
+    extern RyanMqttError_e platformNetworkSendAsync(void *userData, platformNetwork_t *platformNetwork, char *sendBuf, int sendLen, int timeout);
+    extern RyanMqttError_e platformNetworkClose(void *userData, platformNetwork_t *platformNetwork);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

platform/rtthread/platformNetwork.h

@@ -1,47 +1,47 @@
-
-
-#ifndef __platformNetSocket__
-#define __platformNetSocket__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include "RyanMqttPublic.h"
-#include "platformTimer.h"
-
-#include <rtthread.h>
-#ifdef RT_USING_SAL
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include "sal_netdb.h"
-#include "netdb.h"
-
-#else
-#include "lwip/opt.h"
-#include "lwip/sys.h"
-#include "lwip/api.h"
-#include <lwip/sockets.h>
-#include "lwip/netdb.h"
-#endif
-
-    typedef struct
-    {
-        int socket;
-    } platformNetwork_t;
-
-    extern RyanMqttError_e platformNetworkConnect(void *userData, platformNetwork_t *platformNetwork, const char *host, const char *port);
-    extern RyanMqttError_e platformNetworkRecvAsync(void *userData, platformNetwork_t *platformNetwork, char *recvBuf, int recvLen, int timeout);
-    extern RyanMqttError_e platformNetworkSendAsync(void *userData, platformNetwork_t *platformNetwork, char *sendBuf, int sendLen, int timeout);
-    extern RyanMqttError_e platformNetworkClose(void *userData, platformNetwork_t *platformNetwork);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+
+
+#ifndef __platformNetwork__
+#define __platformNetwork__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include "RyanMqttPublic.h"
+#include "platformTimer.h"
+
+#include <rtthread.h>
+#ifdef RT_USING_SAL
+#include <sys/socket.h>
+#include <sys/errno.h>
+#include <sys/time.h>
+#include "sal_netdb.h"
+#include "netdb.h"
+
+#else
+#include "lwip/opt.h"
+#include "lwip/sys.h"
+#include "lwip/api.h"
+#include <lwip/sockets.h>
+#include "lwip/netdb.h"
+#endif
+
+    typedef struct
+    {
+        int socket;
+    } platformNetwork_t;
+
+    extern RyanMqttError_e platformNetworkConnect(void *userData, platformNetwork_t *platformNetwork, const char *host, const char *port);
+    extern RyanMqttError_e platformNetworkRecvAsync(void *userData, platformNetwork_t *platformNetwork, char *recvBuf, int recvLen, int timeout);
+    extern RyanMqttError_e platformNetworkSendAsync(void *userData, platformNetwork_t *platformNetwork, char *sendBuf, int sendLen, int timeout);
+    extern RyanMqttError_e platformNetworkClose(void *userData, platformNetwork_t *platformNetwork);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif