Mirrors/esp-link
2
0
Fork 0
mirror of https://github.com/jeelabs/esp-link.git synced 2026-03-08 02:06:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert PR #95 due to bug; revert #114 due to timing issues; fix MQTT crashes

Browse Source
This commit is contained in:
Thorsten von Eicken
2016-04-02 11:09:06 -07:00
parent 56e76c6bc4
commit 0df5264c8b
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mqtt/mqtt.c
View File

@@ -497,9 +497,11 @@ mqtt_dns_found(const char* name, ip_addr_t* ipaddr, void* arg) {
if (ipaddr == NULL) {
os_printf("MQTT: DNS lookup failed\n");
client->timeoutTick = client->reconTimeout;
if (client->reconTimeout < 128) client->reconTimeout <<= 1;
client->connState = TCP_RECONNECT_REQ; // the timer will kick-off a reconnection
if (client != NULL) {
client->timeoutTick = client->reconTimeout;
if (client->reconTimeout < 128) client->reconTimeout <<= 1;
client->connState = TCP_RECONNECT_REQ; // the timer will kick-off a reconnection
}
return;
}
DBG_MQTT("MQTT: ip %d.%d.%d.%d\n",
@@ -508,7 +510,7 @@ mqtt_dns_found(const char* name, ip_addr_t* ipaddr, void* arg) {
*((uint8 *)&ipaddr->addr + 2),
*((uint8 *)&ipaddr->addr + 3));
if (client->ip.addr == 0 && ipaddr->addr != 0) {
if (client != NULL && client->ip.addr == 0 && ipaddr->addr != 0) {
os_memcpy(client->pCon->proto.tcp->remote_ip, &ipaddr->addr, 4);
uint8_t err;
if (client->security)

5
serial/serbridge.c
View File

@@ -177,11 +177,8 @@ serbridgeRecvCb(void *arg, char *data, unsigned short len)
(len == 2 && strncmp(data, "?\n", 2) == 0) ||
(len == 3 && strncmp(data, "?\r\n", 3) == 0)) {
startPGM = true;
conn->conn_mode = cmPGM;
// Don't actually reboot the target until we've actually received
// serial data to send to the target.
conn->conn_mode = cmPGMInit;
return;
// If the connection starts with a telnet negotiation we will do telnet
}
else if (len >= 3 && strncmp(data, (char[]){IAC, WILL, ComPortOpt}, 3) == 0) {