Fix: Stop if upstream tcp server closes connection

+ unable to connect again after connection stopped.

Author: RoanBrand

src/ArduinoSerialToTCPBridgeClient.cpp

@@ -27,14 +27,7 @@ ISR(TIMER1_COMPA_vect) {
 }
 
 ArduinoSerialToTCPBridgeClient::ArduinoSerialToTCPBridgeClient() {
-	ackOutstanding = false;
-	expectedRxSeqFlag = false;
-	pubSequence = false;
-	tx_retries = 0;
-	rxBufpH = 0;
-	rxBufpT = 0;
-	rxBufisFull = false;
-	state = STATE_DISCONNECTED;
+	reset();
 	ser0 = this;
 	NeoSerial.attachInterrupt(rxISR0);
 	NeoSerial.begin(115200);
@@ -193,10 +186,9 @@ void ArduinoSerialToTCPBridgeClient::flush() {
 }
 
 void ArduinoSerialToTCPBridgeClient::stop() {
-	stopAckTimer();
 	writePacket(PROTOCOL_DISCONNECT, NULL, 0);
 	flush();
-	state = STATE_DISCONNECTED;
+	reset();
 	//NeoSerial.end();
 }
 
@@ -208,6 +200,18 @@ ArduinoSerialToTCPBridgeClient::operator bool() {
 	return 1;
 }
 
+void ArduinoSerialToTCPBridgeClient::reset() {
+	stopAckTimer();
+	state = STATE_DISCONNECTED;
+	ackOutstanding = false;
+	expectedRxSeqFlag = false;
+	pubSequence = false;
+	tx_retries = 0;
+	rxBufpH = 0;
+	rxBufpT = 0;
+	rxBufisFull = false;
+}
+
 boolean ArduinoSerialToTCPBridgeClient::writePacket(uint8_t command, uint8_t* payload, uint8_t pLength) {
 	if (pLength > 250)
 		return false;
@@ -312,6 +316,11 @@ void ArduinoSerialToTCPBridgeClient::rxCallback(uint8_t c) {
 					if (p_length == 5)
 						state = STATE_CONNECTED;
 					break;
+				// Upstream tcp connection closed.
+				case PROTOCOL_DISCONNECT:
+					if (p_length == 5 && (state == STATE_CONNECTED))
+						reset();
+					break;
 				// Incoming data.
 				case PROTOCOL_PUBLISH:
 					writePacket(PROTOCOL_ACK | (p_cmd & 0x80), NULL, 0);

src/ArduinoSerialToTCPBridgeClient.h

@@ -54,6 +54,7 @@ class ArduinoSerialToTCPBridgeClient : public Client {
 	uint8_t rxBufpH, rxBufpT;
 	boolean rxBufisFull;
 
+	void reset();
 	boolean writePacket(uint8_t command, uint8_t* payload, uint8_t pLength);
 	void rxCallback(uint8_t c);
 	void setupAckTimer();