From f737a816ab8ae5c52426d812b86023560a12897a Mon Sep 17 00:00:00 2001 From: HuangXin Date: Fri, 10 Aug 2018 10:22:55 +0800 Subject: [PATCH] Add boardlink iot sdk support --- 3partys/boardlink/blsdk.h | 212 ++++++++++++++++++++++++ 3partys/boardlink/blsdk_errno.h | 19 +++ 3partys/boardlink/libfastcon.a | Bin 0 -> 24018 bytes Example/main.c | 117 ++++++++++--- Framework/IoT/Boardlink/boardlink_iot.c | 54 +++++- Modules/Alarm/assistant.c | 5 + Modules/OTA/ota.c | 7 +- build/Makefile.def.cross | 2 +- build/Makefile.lib.cross | 4 +- include/boardlink_iot.h | 23 ++- 10 files changed, 406 insertions(+), 37 deletions(-) create mode 100644 3partys/boardlink/blsdk.h create mode 100644 3partys/boardlink/blsdk_errno.h create mode 100644 3partys/boardlink/libfastcon.a diff --git a/3partys/boardlink/blsdk.h b/3partys/boardlink/blsdk.h new file mode 100644 index 0000000..7581557 --- /dev/null +++ b/3partys/boardlink/blsdk.h @@ -0,0 +1,212 @@ +#ifndef __SDK_H +#define __SDK_H + +/* + * 0. implement all callback's of this SDK + * 1. read wifi probe frame from driver + * 2. feed wifi probe frame to sdk_pkt_process + * 3. this sdk depends on no thirdparty libraries, and there is no internet connection with net. + */ + + +typedef unsigned char uint8; +typedef unsigned short int uint16; +typedef unsigned int uint32; + +typedef char int8; +typedef short int int16; +typedef int int32; + +#define SDK_SUCCESS (0) +#define SDK_FAIL (1) +#define SDK_NULL (0) +#define OUI_LEN (3) +#define OUI_TYPE (0) +#define OUI_TYPE_LEN (1) +#define MAC_LEN (6) +#define SSID_MAX_LEN (32) +#define PASSWORD_MAX_LEN (32) +#define SDK_SHAREDKEY_LEN (32) +#define SDK_FRAME_MAX_LEN (1460) +#define FASTCON_MASTER_ID_LEN (4) + +#define SDK_PACKED __attribute__((packed)) + + +typedef void* (*sdk_memset_t) ( + void* ptr, + int32 value, + uint32 num); +typedef void* (*sdk_memcpy_t) ( + void* dst, + const void* src, + uint32 num); +typedef int32 (*sdk_memcmp_t) ( + const void* ptr1, + const void* ptr2, + uint32 num); +typedef int32 (*sdk_printf_t) ( + const char* format, + ...); + +typedef struct sdk_device_info_t { + uint32 vendor_id; + uint32 product_id; + uint8 mac[MAC_LEN]; + uint8 * device_info; + uint16 device_info_len; + uint8 * device_id; + uint16 device_id_len; +}sdk_product_info_t; + +//发现设备 +typedef int32 (*sdk_found_device_t) (sdk_product_info_t *product_info); +//对应2.1 云端身份校验接口请求 +typedef int32 (*sdk_challenge_post_t)( + sdk_product_info_t *product_info, + uint8 * challenge, + uint16 challenge_len); +//对应2.2 设备身份声明接口请求 +typedef int32 (*sdk_signature_post_t)( + sdk_product_info_t *product_info, + uint8 * signature, + uint16 signature_len); +//sdk将设备控制token传给上层 +typedef int32 (*sdk_device_token_post_t)( + sdk_product_info_t *product_info, + uint8 * token, + uint16 token_len); +//上报配置结果 +//目前只支持失败结果上报。 +//成功的结果是由云端推送上线通知 +//result 0:成功 -1:失败 +typedef int32 (*sdk_config_result_post_t) ( + sdk_product_info_t *product_info, + int8 result); +//发送802.11原始报文接口 +typedef int32 (*sdk_raw_pkt_send_t)( + uint8 * frame, + uint16 frame_len); + + + + +typedef struct { + sdk_memset_t memset; + sdk_memcpy_t memcpy; + sdk_memcmp_t memcmp; + sdk_printf_t printf; + + sdk_found_device_t found_device; + sdk_challenge_post_t challenge_post; + sdk_signature_post_t signature_post; + sdk_device_token_post_t device_token_post; + sdk_config_result_post_t config_result_post; + + sdk_raw_pkt_send_t send_raw_pkt; + +} sdk_config_t; + +typedef struct { + + //gateway信息 + //包括当前路由器信道，gateway mac，bssid + uint8 channel; //cur channel + + //若mac地址为00-11-22-33-44-55，则device_mac[] = {0x00,0x11,0x22,0x33,0x44,0x55}; + uint8 device_mac[MAC_LEN]; + //AP的mac地址，格式等同device_mac + uint8 bssid[MAC_LEN]; + + //由dnakit后台分配，用于区分不同平台，固定4个字节 + uint8 fastcon_master_id[FASTCON_MASTER_ID_LEN]; + + //0:probe req,1:probe rsp,2:action + //报文选择，根据gateway 能力自行设置 + uint8 send_wlan_type; + //回调接口注册 + sdk_config_t sdk_config; +} SDK_PACKED sdk_user_init_t; + +typedef enum { + SDK_STATE_PROBE_DEVICE, + SDK_STATE_LOCK_CHANNEL, + SDK_STATE_CONFIG, + SDK_STATE_CONNECTING, + SDK_STATE_DONE, //Finish + SDK_STATE_FAIL, +} sdk_state_e; + +/** + * @brief 打印sdk编译时间 + * @return 0 打印成功 + * SDK_E_INIT_FAIL sdk未初始化 + */ +extern int32 sdk_version(void); +/** + * @brief 初始化sdk + * @param init + * @return 0 初始化成功 + * SDK_E_INIT_FAIL + */ +extern int32 sdk_init(sdk_user_init_t *init); +/** + * @brief 处理接收的802.11报文 + * @param frame 802.11标准报文格式 + * @param frame_len + * @return sdk_state_e + SDK_E_INIT_FAIL + */ +extern int32 sdk_pkt_process(uint8 *frame, int16 frame_len); +/** + * @brief 发送token bind成功报文 + * @return 0 成功 + * SDK_E_INIT_FAIL + * SDK_E_STATE + */ +extern int32 sdk_device_token_bind_success(void); +/** + * @brief ssid和password信息发送 + * @param sharedkey 二进制数组，云端返回的是十六进制字符串，需要进行转换 + * @param ssid + * @param ssid_len + * @param password + * @param password_len + * @return 0 成功 + * SDK_E_INIT_FAIL + * SDK_E_STATE + * @example 路由器ssid为"ssid"，password为"password" + * 代码如下： + * @code + * uint8 ssid[] = "ssid"; + * uint8 password[] = "password"; + * sdk_wlan_params_set(sharedkey,ssid,strlen(ssid),password,strlen(password)); + * @endcode + */ +extern int32 sdk_wlan_params_set(uint8 sharedkey[SDK_SHAREDKEY_LEN],uint8 *ssid,uint16 ssid_len,uint8 *password,uint16 password_len); +/** + * @brief challenge和signature信息发送 + * @param challenge 二进制数组，云端返回的是十六进制字符串，需要进行转换 + * @param challenge_len + * @param signature 二进制数组，云端返回的是十六进制字符串，需要进行转换 + * @param signature_len + * @return 0 成功 + * SDK_E_INIT_FAIL + * SDK_E_STATE + */ +extern int32 sdk_challenge_and_signature_set(uint8 *challenge,uint16 challenge_len, uint8 *signature, uint16 signature_len); +/** + * @brief 用户确认开始配网 + * @return 0 成功 + * SDK_E_INIT_FAIL + * SDK_E_STATE + */ +extern int32 sdk_user_auth_to_start_config(void); +/** + * @brief 清除sdk状态 + * @return 0 成功 + * SDK_E_INIT_FAIL + */ +extern int32 sdk_deinit(void); + +#endif diff --git a/3partys/boardlink/blsdk_errno.h b/3partys/boardlink/blsdk_errno.h new file mode 100644 index 0000000..369b797 --- /dev/null +++ b/3partys/boardlink/blsdk_errno.h @@ -0,0 +1,19 @@ + +#ifndef __SDK_ERRNO_H +#define __SDK_ERRNO_H + + +#define SDK_E_INIT_FAIL (-1) //SDK初始化失败 +#define SDK_E_INVPARAMS (-2) //参数异常 +#define SDK_E_STATE (-3) //sdk状态异常 + +//only use by sdk_config_result_post_t +#define SDK_E_CONNECT_AP_TIMEOUT (-101) //连接ap超时 +#define SDK_E_PKT_SEND (-102) //发送数据包失败 +#define SDK_E_OVER_RETRY_COUNT (-103) //超过最大重试次数 +#define SDK_E_VERIFY_SIGNATURE (-104) //校验网关端身份失败 +#define SDK_E_SSID_PWD (-105) //ssid和pwd解析异常 +#define SDK_E_MSG_NOT_SUPPORT (-106) //接收到不支持的消息类型 +#define SDK_E_CONFIG_TIMEOUT (-107) //配置超时，超过10分钟配置时间 + +#endif diff --git a/3partys/boardlink/libfastcon.a b/3partys/boardlink/libfastcon.a new file mode 100644 index 0000000000000000000000000000000000000000..a479fd75459a238f8006e325ff64e9c05b407483 GIT binary patch literal 24018 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 X2iXqVLhPsP{Ek>c #include #include +#include +#include #include "log.h" #include "libuv_dbus.h" @@ -1594,15 +1596,16 @@ static void __dlThreadRuntimeCb(void *pParams) static void __uvThreadTest(void *pParams) { +#ifndef PLATFORM_CPU for(int i = 0; i < 100; i++) { char buf[256]; memset(buf, 0, 256); sprintf(buf, "Send %d times\n", i); - BL_SendMessage(buf, strlen(buf)); + //BL_SendMessage(buf, strlen(buf)); sleep(1); } - +#endif #if 0 for(int i = 0; i < 100000; i++) { @@ -1797,25 +1800,97 @@ void test_netlink(void) } else { - LOG_EX(LOG_Debug, "Received message: %s\n",(char *) NLMSG_DATA(nlh)); + //LOG_EX(LOG_Debug, "Received message: %s\n",(char *) NLMSG_DATA(nlh)); + print_hex_dump_bytes("Msg", 0, NLMSG_DATA(nlh), retval); } } close(sock_fd); } +#ifndef PLATFORM_CPU static void __uvThreadNetlinkSend(void *pParams) { + char* pData = "0123456789abcdef"; + int lastSt = MSG_IN_DISCOVERY_MODE; + for(int i = 0; i < 100; i++) { - char buf[256]; - memset(buf, 0, 256); - sprintf(buf, "Send %d times", i); - //LOG_EX(LOG_Debug, "Send [%s] ret = %d\n", buf, BL_SendMessage(buf, strlen(buf))); - BL_SendMessage(buf, strlen(buf)); + BL_IOT_MSG blMsg; + + memset(&blMsg, 0, sizeof(BL_IOT_MSG)); + strcpy(blMsg.msgTags, BL_IOT_MSG_TAGS); + memcpy(blMsg.msgData, pData, strlen(pData)); + blMsg.msglen = strlen(pData); + blMsg.msgType = MSG_BYPASS_MODE; + LOG_EX(LOG_Debug, "Send Message : %d\n", i); + BL_SendBLMsg(MSG_GET_WLAN_INFO, NULL, 0); + + if(i % 10 == 0) + { + BL_SendBLMsg(lastSt, NULL, 0); + + if(lastSt == MSG_IN_DISCOVERY_MODE) + { + lastSt = MSG_OUT_DISCOVERY_MODE; + } + else + { + lastSt = MSG_IN_DISCOVERY_MODE; + } + } + + //BL_SendMessage((unsigned char*)&blMsg, BL_IOT_MSG_LEN(blMsg.msglen)); + sleep(1); } } +#endif + +static int expectedId; + +static int nlCallback(void* msg, void* arg) +{ + struct ucred * p = (struct ucred *)msg; + LOG_EX(LOG_Debug, "receive message\n"); +} +#if 0 +void test_nl80211(void) +{ + int ret; + //allocate socket + nl_sock* sk = nl_socket_alloc(); + + //connect to generic netlink + genl_connect(sk); + + //find the nl80211 driver ID + expectedId = genl_ctrl_resolve(sk, "nl80211"); + + //attach a callback + nl_socket_modify_cb(sk, NL_CB_VALID, NL_CB_CUSTOM, + nlCallback, NULL); + + //allocate a message + nl_msg* msg = nlmsg_alloc(); + + nl80211_commands cmd = NL80211_CMD_GET_INTERFACE; + int ifIndex = if_nametoindex("wlan0"); + int flags = 0; + + // setup the message + genlmsg_put(msg, 0, 0, expectedId, 0, flags, cmd, 0); + + //add message attributes + NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifIndex); + + //send the messge (this frees it) + ret = nl_send_auto_complete(sk, msg); + + //block for message to return + nl_recvmsgs_default(sk); +} +#endif int main(int argc, char **argv) { @@ -1825,7 +1900,7 @@ int main(int argc, char **argv) uv_loop_t* pLoop = GetDBusDefaultLoop(); int modIdx = -1; char buf[256]; - BL_IOT_MSG blMsg; + #if 0 i = GetServerModeFromCC(PUBLISH_MODE, &ret); @@ -1901,28 +1976,16 @@ int main(int argc, char **argv) } //test_netlink(); - - BL_Init(); - - memset(&blMsg, 0, sizeof(BL_IOT_MSG)); - - strcpy(blMsg.msgTags, BL_IOT_MSG_TAGS); - - if(modIdx % 2 == 0) - { - blMsg.msgType = MSG_IN_DISCOVERY_MODE; - } - else - { - blMsg.msgType = MSG_OUT_DISCOVERY_MODE; - } +#ifndef PLATFORM_CPU + BL_Init(NULL); - BL_SendMessage((unsigned char*)&blMsg, sizeof(BL_IOT_MSG)); + //L_SendMessage((unsigned char*)&blMsg, sizeof(BL_IOT_MSG)); //test_netlink(); //__uvThreadTimerV2(pLoop); - //test_task_new(__uvThreadNetlinkSend, NULL); - + test_task_new(__uvThreadNetlinkSend, NULL); +#endif + //DumpCurServerAddr("Default"); #if 0 diff --git a/Framework/IoT/Boardlink/boardlink_iot.c b/Framework/IoT/Boardlink/boardlink_iot.c index c28c4ad..820cc52 100644 --- a/Framework/IoT/Boardlink/boardlink_iot.c +++ b/Framework/IoT/Boardlink/boardlink_iot.c @@ -1,3 +1,4 @@ +#ifndef PLATFORM_CPU #include #include #include @@ -11,6 +12,8 @@ #include "log.h" #include "libuv_dbus.h" #include "boardlink_iot.h" +#include "blsdk.h" +#include "blsdk_errno.h" #else #include #include @@ -22,6 +25,7 @@ static int g_nlSock = -1; static unsigned char g_MsgSendBuf[BL_MSG_BUF_MAX]; +static BlMsgCb g_blMsgCb = NULL; static void __recvMsgThread(void *pParam) { @@ -56,7 +60,13 @@ static void __recvMsgThread(void *pParam) } else { - LOG_EX(LOG_Debug, "Recv Message: %s\n", NLMSG_DATA(pMsgHdr)); + PBL_IOT_MSG pMsg = (PBL_IOT_MSG)NLMSG_DATA(pMsgHdr); + //LOG_EX(LOG_Debug, "Recv Message: %s\n", NLMSG_DATA(pMsgHdr)); + print_hex_dump_bytes("Msg", 0, pMsg, BL_IOT_MSG_LEN(pMsg->msglen)); + if(g_blMsgCb) + { + g_blMsgCb(pMsg); + } } } } @@ -93,7 +103,7 @@ static int __nlCreateSocket(void) return 0; } -int BL_SendMessage(unsigned char* pData, unsigned int len) +static int __sendMessage(unsigned char* pData, unsigned int len) { struct iovec iov; struct sockaddr_nl dstAddr; @@ -117,7 +127,42 @@ int BL_SendMessage(unsigned char* pData, unsigned int len) return sendmsg(g_nlSock, &msgHdr, 0); } -int BL_Init(void) +int BL_SendBLMsg(BL_IOT_MSG_TYPE msgType, unsigned char* pData, unsigned int len) +{ + BL_IOT_MSG blMsg; + + memset(&blMsg, 0, sizeof(BL_IOT_MSG)); + blMsg.msgType = msgType; + blMsg.msglen = len; + strcpy(blMsg.msgTags, BL_IOT_MSG_TAGS); + + if(pData && len > 0) + { + memcpy(blMsg.msgData, pData, len); + } + + return __sendMessage((unsigned char*)&blMsg, BL_IOT_MSG_LEN(len)); +} + +int BL_SendBLMsgTo(BL_IOT_MSG_TYPE msgType, unsigned char* pData, unsigned int len, unsigned char dstMac[ETH_ALEN]) +{ + BL_IOT_MSG blMsg; + + memset(&blMsg, 0, sizeof(BL_IOT_MSG)); + blMsg.msgType = msgType; + blMsg.msglen = len; + memcpy(blMsg.dstMac, dstMac, ETH_ALEN); + strcpy(blMsg.msgTags, BL_IOT_MSG_TAGS); + + if(pData && len > 0) + { + memcpy(blMsg.msgData, pData, len); + } + + return __sendMessage((unsigned char*)&blMsg, BL_IOT_MSG_LEN(len)); +} + +int BL_Init(BlMsgCb cbOnMsg) { int ret = 0; uv_thread_t uvRecvThread; @@ -129,7 +174,10 @@ int BL_Init(void) return ret; } + g_blMsgCb = cbOnMsg; + uv_thread_create(&uvRecvThread, __recvMsgThread, NULL); return 0; } +#endif diff --git a/Modules/Alarm/assistant.c b/Modules/Alarm/assistant.c index e086684..c44c000 100644 --- a/Modules/Alarm/assistant.c +++ b/Modules/Alarm/assistant.c @@ -724,6 +724,7 @@ static void __dBusDeameonCb(MODULE_NAME modName, int status) static void __assistantSyncThread(void *pParam) { int ret, i = 0, isSynced = -1; + struct tm* pTmNextYear; LOG_EX(LOG_Debug, "Beging Sync holiday Database\n"); while(TRUE) @@ -826,6 +827,9 @@ static void __assistantSyncThread(void *pParam) LOG_EX(LOG_Debug, "Send CMD_REMAIND_SYNC_REQ Command: %d\n", ret); #endif + while(TRUE) + { + } pthread_detach(pthread_self()); } @@ -852,6 +856,7 @@ int main(int argc, char **argv) AlarmTimerInit(pLoop); uv_thread_create(&uvSyncThread, __assistantSyncThread, NULL); + RunUVLoop(pLoop); while(TRUE) diff --git a/Modules/OTA/ota.c b/Modules/OTA/ota.c index eeaf2ef..028389f 100644 --- a/Modules/OTA/ota.c +++ b/Modules/OTA/ota.c @@ -1041,6 +1041,7 @@ static void __otaDownloadImageCb(void *pParams) pthread_detach(pthread_self()); } +#if 0 static void __dBusDeameonCb(MODULE_NAME modName, int status) { if(status) @@ -1059,6 +1060,7 @@ static void __dBusDeameonCb(MODULE_NAME modName, int status) __otaRspStatus(OTA_CURRENT_REBOOT_TIME, g_iplInfo.setupStatus); } } +#endif static PDBUS_MSG_PACK __dBusOnMessage(uv_loop_t* pLoop, DBusConnection* pConn, PDBUS_MSG_PACK pMsg) { @@ -1112,6 +1114,9 @@ static PDBUS_MSG_PACK __dBusOnMessage(uv_loop_t* pLoop, DBusConnection* pConn, P { __otaRspStatus(OTA_SUCCESED, 1); } + __otaRspStatus(OTA_CURRENT_VERSION, g_iplInfo.curVersion); + __otaRspStatus(OTA_CURRENT_SETUP_MODE, g_iplInfo.setupMode); + __otaRspStatus(OTA_CURRENT_REBOOT_TIME, g_iplInfo.setupStatus); break; case CMD_SYSTEM_STANDBY: @@ -1276,7 +1281,7 @@ int main(int argc, char **argv) pBus = DBusWithLibuvInit(g_pMainLoop, g_pModInfoTable[MODULE_OTA].modAliase, __dBusOnMessage, - __dBusDeameonCb, + NULL, NULL, &ret); diff --git a/build/Makefile.def.cross b/build/Makefile.def.cross index f99a8ac..e7a46f4 100644 --- a/build/Makefile.def.cross +++ b/build/Makefile.def.cross @@ -1,2 +1,2 @@ -COMMON_R16_LIBS := -ldbus-1 -luv -lcrypto -lcjson -ls2json -lsqlite3 -lnghttp2 -lquickmail -lz -luuid -lconfig -lcurl -lssl -lpthread +COMMON_R16_LIBS := -ldbus-1 -luv -lcrypto -lcjson -ls2json -lsqlite3 -lnghttp2 -lquickmail -lz -luuid -lconfig -lcurl -lssl -lpthread ../3partys/boardlink/libfastcon.a COMMON_LINUX_LIBS := -ldbus-1 -luv -lcrypto -lcurl -lm -lnghttp2 -lsqlite3 -lquickmail -lz -luuid -lconfig -lssl -lpthread diff --git a/build/Makefile.lib.cross b/build/Makefile.lib.cross index d56abe5..8bb4843 100644 --- a/build/Makefile.lib.cross +++ b/build/Makefile.lib.cross @@ -58,14 +58,14 @@ PLAT_LINUX_SRCS := $(PLAT_R16_SRCS) \ # gcc CFLAGS -PLAT_R16_CFLAGS := -I../include -fPIC +PLAT_R16_CFLAGS := -I../include -fPIC -I../3partys/boardlink/ PLAT_LINUX_CFLAGS := $(PLAT_R16_CFLAGS) -I/usr/include/dbus-1.0/ -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include/ -I../linux32/inc/ -I../linux32/inc/cjson/ PLAT_LINUX_CFLAGS += -I../linux32/inc/uthash/ PLAT_R16_LDFLAGS := -shared -fPIC PLAT_LINUX_LDFLAGS := $(PLAT_R16_LDFLAGS) -R16_LIBS := $(COMMON_R16_LIBS) +R16_LIBS := $(COMMON_R16_LIBS) LINUX_LIBS := $(COMMON_LINUX_LIBS) # this line must be at below of thus, because of... diff --git a/include/boardlink_iot.h b/include/boardlink_iot.h index 61aacb3..65dd47a 100644 --- a/include/boardlink_iot.h +++ b/include/boardlink_iot.h @@ -1,13 +1,15 @@ #ifndef BOARDLINK_IOT_H #define BOARDLINK_IOT_H - +#ifndef PLATFORM_CPU #define BL_IOT_MSG_TAGS ("BLNLINK") #define BL_MAX_MSG (1024) +#define ETH_ALEN (6) typedef enum { MSG_IN_DISCOVERY_MODE = 0, MSG_OUT_DISCOVERY_MODE, + MSG_GET_WLAN_INFO, MSG_BYPASS_MODE, } BL_IOT_MSG_TYPE; @@ -16,12 +18,27 @@ typedef enum typedef struct { unsigned char msgTags[8]; + unsigned char dstMac[ETH_ALEN]; unsigned char msgType; unsigned int msglen; unsigned char msgData[BL_MAX_MSG]; } BL_IOT_MSG, *PBL_IOT_MSG; + +typedef struct +{ + unsigned char channel; + unsigned char dev_mac[ETH_ALEN]; + unsigned char bssid[ETH_ALEN]; + unsigned char ssid[32]; +} WL_INFO, *PWL_INFO; #pragma pack (pop) -int BL_Init(void); -int BL_SendMessage(unsigned char* pData, unsigned int len); +#define BL_IOT_MSG_LEN(len) (sizeof(BL_IOT_MSG) - BL_MAX_MSG + len) + +typedef void (*BlMsgCb)(PBL_IOT_MSG pMsg); + +int BL_Init(BlMsgCb cbOnMsg); +int BL_SendBLMsg(BL_IOT_MSG_TYPE msgType, unsigned char* pData, unsigned int len); +int BL_SendBLMsgTo(BL_IOT_MSG_TYPE msgType, unsigned char* pData, unsigned int len, unsigned char dstMac[ETH_ALEN]); +#endif #endif