Merge pull request #207 from TheThingsNetwork/fix/infinite-join

johanstokking · web-flow · commit dedd35938c55 · 2017-06-07T15:18:29.000+02:00
Fix infinite join retry
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=TheThingsNetwork
-version=2.5.2
+version=2.5.3
 author=The Things Network
 maintainer=Johan Stokking <johan@thethingsnetwork.org>
 sentence=The Things Network Arduino Library.
diff --git a/src/TheThingsNetwork.cpp b/src/TheThingsNetwork.cpp
@@ -499,10 +499,12 @@ bool TheThingsNetwork::provision(const char *appEui, const char *appKey)
 
 bool TheThingsNetwork::join(int8_t retries, uint32_t retryDelay)
 {
+  int8_t attempts = 0;
   configureChannels(fsb);
   setSF(sf);
-  while (retries == -1 || retries-- >= 0)
+  while (retries == -1 || attempts <= retries)
   {
+    attempts++;
     if (!sendJoinSet(MAC_JOIN_MODE_OTAA))
     {
       debugPrintMessage(ERR_MESSAGE, ERR_JOIN_FAILED);

Original file line number	Diff line number	Diff line change
`@@ -499,10 +499,12 @@ bool TheThingsNetwork::provision(const char appEui, const char appKey)`
`499`	`499`
`500`	`500`	`bool TheThingsNetwork::join(int8_t retries, uint32_t retryDelay)`
`501`	`501`	`{`
	`502`	`+ int8_t attempts = 0;`
`502`	`503`	`configureChannels(fsb);`
`503`	`504`	`setSF(sf);`
`504`		`- while (retries == -1 \|\| retries-- >= 0)`
	`505`	`+ while (retries == -1 \|\| attempts <= retries)`
`505`	`506`	`{`
	`507`	`+ attempts++;`
`506`	`508`	`if (!sendJoinSet(MAC_JOIN_MODE_OTAA))`
`507`	`509`	`{`
`508`	`510`	`debugPrintMessage(ERR_MESSAGE, ERR_JOIN_FAILED);`