wn/pubsubclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed connection lost handling

Browse Source
This commit is contained in:
Nicholas O'Leary 2010-07-20 20:05:03 +01:00
parent ad96f3e82a
commit a937a97659
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -1,3 +1,6 @@
1.4
* Fixed connection lost handling
1.3 1.3
* Fixed packet reading bug in PubSubClient.readPacket * Fixed packet reading bug in PubSubClient.readPacket

32
PubSubClient.cpp
View File

@ -21,7 +21,7 @@ int PubSubClient::connect(char *id) {
} }
int PubSubClient::connect(char *id, char* willTopic, uint8_t willQos, uint8_t willRetain, char* willMessage) { int PubSubClient::connect(char *id, char* willTopic, uint8_t willQos, uint8_t willRetain, char* willMessage) {
if (!_client.connected()) { if (!connected()) {
if (_client.connect()) { if (_client.connect()) {
nextMsgId = 1; nextMsgId = 1;
uint8_t d[9] = {0x00,0x06,0x4d,0x51,0x49,0x73,0x64,0x70,0x03}; uint8_t d[9] = {0x00,0x06,0x4d,0x51,0x49,0x73,0x64,0x70,0x03};
@ -50,23 +50,25 @@ int PubSubClient::connect(char *id, char* willTopic, uint8_t willQos, uint8_t wi
lastActivity = millis(); lastActivity = millis();
return 1; return 1;
} }
_client.stop();
} }
_client.stop();
} }
return 0; return 0;
} }
uint8_t PubSubClient::readByte() {
while(!_client.available()) {}
return _client.read();
}
uint8_t PubSubClient::readPacket() { uint8_t PubSubClient::readPacket() {
uint8_t len = 0; uint8_t len = 0;
while (!_client.available()) {} buffer[len++] = readByte();
buffer[len++] = _client.read();
uint8_t multiplier = 1; uint8_t multiplier = 1;
uint8_t length = 0; uint8_t length = 0;
uint8_t digit = 0; uint8_t digit = 0;
do { do {
while (!_client.available()) {} digit = readByte();
digit = _client.read();
buffer[len++] = digit; buffer[len++] = digit;
length += (digit & 127) * multiplier; length += (digit & 127) * multiplier;
multiplier *= 128; multiplier *= 128;
@ -75,11 +77,9 @@ uint8_t PubSubClient::readPacket() {
for (int i = 0;i<length;i++) for (int i = 0;i<length;i++)
{ {
if (len < MAX_PACKET_SIZE) { if (len < MAX_PACKET_SIZE) {
while (!_client.available()) {} buffer[len++] = readByte();
buffer[len++] = _client.read();
} else { } else {
while (!_client.available()) {} readByte();
_client.read();
len = 0; // This will cause the packet to be ignored. len = 0; // This will cause the packet to be ignored.
} }
} }
@ -88,7 +88,7 @@ uint8_t PubSubClient::readPacket() {
} }
int PubSubClient::loop() { int PubSubClient::loop() {
if (_client.connected()) { if (connected()) {
long t = millis(); long t = millis();
if (t - lastActivity > KEEPALIVE) { if (t - lastActivity > KEEPALIVE) {
_client.write(192); _client.write(192);
@ -129,7 +129,7 @@ int PubSubClient::publish(char* topic, char* payload) {
int PubSubClient::publish(char* topic, uint8_t* payload, uint8_t plength) { int PubSubClient::publish(char* topic, uint8_t* payload, uint8_t plength) {
if (_client.connected()) { if (connected()) {
uint8_t length = writeString(topic,buffer,0); uint8_t length = writeString(topic,buffer,0);
int i; int i;
for (i=0;i<plength;i++) { for (i=0;i<plength;i++) {
@ -154,7 +154,7 @@ int PubSubClient::write(uint8_t header, uint8_t* buf, uint8_t length) {
void PubSubClient::subscribe(char* topic) { void PubSubClient::subscribe(char* topic) {
if (_client.connected()) { if (connected()) {
uint8_t length = 2; uint8_t length = 2;
nextMsgId++; nextMsgId++;
buffer[0] = nextMsgId >> 8; buffer[0] = nextMsgId >> 8;
@ -187,7 +187,9 @@ uint8_t PubSubClient::writeString(char* string, uint8_t* buf, uint8_t pos) {
int PubSubClient::connected() { int PubSubClient::connected() {
return (int)_client.connected(); int rc = (int)_client.connected();
if (!rc) _client.stop();
return rc;
} }

1
PubSubClient.h
View File

@ -21,6 +21,7 @@ private:
long lastActivity; long lastActivity;
void (*callback)(char*,uint8_t*,int); void (*callback)(char*,uint8_t*,int);
uint8_t readPacket(); uint8_t readPacket();
uint8_t readByte();
int write(uint8_t header, uint8_t* buf, uint8_t length); int write(uint8_t header, uint8_t* buf, uint8_t length);
uint8_t writeString(char* string, uint8_t* buf, uint8_t pos); uint8_t writeString(char* string, uint8_t* buf, uint8_t pos);
public: public: