1、support 4G tcp connect in webserver; 2、support 4G MQTT connect in webserver,using mqttx to test send/receive data。developer need to support mqtt application if the project need the webserver mqtt function; 3、fix LoRa bug in webserver
it is OK
This commit is contained in:
@@ -143,16 +143,17 @@ int Adapter4GTest(void)
|
||||
|
||||
AdapterDeviceNetstat(adapter);
|
||||
|
||||
AdapterDeviceConnect(adapter, CLIENT, server_addr, server_port, IPV4);
|
||||
/*4G TCP Connect Test*/
|
||||
// AdapterDeviceConnect(adapter, CLIENT, server_addr, server_port, IPV4);
|
||||
|
||||
while (1) {
|
||||
AdapterDeviceSend(adapter, send_msg, strlen(send_msg));
|
||||
AdapterDeviceRecv(adapter, recv_msg, 256);
|
||||
printf("4G recv msg %s\n", recv_msg);
|
||||
memset(recv_msg, 0, 256);
|
||||
}
|
||||
// while (1) {
|
||||
// AdapterDeviceSend(adapter, send_msg, strlen(send_msg));
|
||||
// AdapterDeviceRecv(adapter, recv_msg, 256);
|
||||
// printf("4G recv msg %s\n", recv_msg);
|
||||
// memset(recv_msg, 0, 256);
|
||||
// }
|
||||
|
||||
/*
|
||||
/*4G MQTT Connect Test*/
|
||||
AdapterDeviceMqttConnect(adapter, server_addr, server_port, client_id, username, password);
|
||||
|
||||
while (1) {
|
||||
@@ -161,7 +162,6 @@ int Adapter4GTest(void)
|
||||
printf("4G mqtt recv msg %s\n", recv_msg);
|
||||
memset(recv_msg, 0, 256);
|
||||
}
|
||||
*/
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -382,7 +382,7 @@ out:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void extractCarrierInfo(const char *response, struct NetworkInfo *networkInfo)
|
||||
static void extractCarrierInfo(char *response, struct NetworkInfo *networkInfo)
|
||||
{
|
||||
const char *delimiter = "\"";
|
||||
const char *token;
|
||||
|
||||
@@ -166,7 +166,7 @@ struct IpProtocolDone
|
||||
int (*mqttconnect)(struct Adapter *adapter, const char *ip, const char *port, const char *client_id, const char *username, const char *password);
|
||||
int (*mqttdisconnect)(struct Adapter *adapter);
|
||||
int (*mqttsend)(struct Adapter *adapter, const char *topic, const void *buf, size_t len);
|
||||
int (*mqttrecv)(struct Adapter *adapter, const char *topic, const void *buf, size_t len);
|
||||
int (*mqttrecv)(struct Adapter *adapter, const char *topic, void *buf, size_t len);
|
||||
};
|
||||
|
||||
struct PrivProtocolDone
|
||||
|
||||
Reference in New Issue
Block a user