add index reset when no more connections to try; adapt test case

Signed-off-by: Tim Nielens <tim.nielens@gmail.com>

Author: tnielens

src/MQTTAsyncUtils.c

@@ -1684,6 +1684,8 @@ static void nextOrClose(MQTTAsyncs* m, int rc, char* message)
 
 	if (!more_to_try)
 	{
+		// resetting index so that if further connection attempts are made, they will start with the first URI in the list
+		m->connect.details.conn.currentURI = 0;
 		MQTTAsync_closeSession(m->c, MQTTREASONCODE_SUCCESS, NULL);
 		if (m->connect.onFailure)
 		{

test/test_serveruris_reset.c

@@ -210,38 +210,18 @@ static int test_serveruris_reset(void) {
         WAIT_TRUE(conn.connected || conn.connect_failed, 3000);
         assert("reconnected via 1886", MQTTAsync_isConnected(client), "\n");
 
-        /* take 1886 down, bring 1885 up */
+        /* take 1886 down */
         toxi("POST", "/proxies/mqtt2", "{\"enabled\":false}");
-        toxi("POST", "/proxies/mqtt1",  "{\"enabled\":true}");
         WAIT_TRUE(!MQTTAsync_isConnected(client), 3000);
         assert("disconnected after 1886 went down", !MQTTAsync_isConnected(client), "\n");
 
-         /* reconnect — expected to restart cycle from 1885, but URI index is not reset:
-             paho tries 1886 again (stuck at last index), fails, stays disconnected */
-         conn.connected = false; conn.connect_failed = false;
-         MQTTAsync_reconnect(client);
-         WAIT_TRUE(conn.connected || conn.connect_failed, 3000);
-         assert("BUG: reconnect did not restart cycle from 1885 — stayed stuck on 1886", !MQTTAsync_isConnected(client), "\n");
-
-        /* bring 1886 back, reconnect — succeeds on 1886 */
-        toxi("POST", "/proxies/mqtt2", "{\"enabled\":true}");
+        /* reconnect — restart cycle from 1885 */
         conn.connected = false; conn.connect_failed = false;
-        MQTTAsync_reconnect(client);
-        WAIT_TRUE(conn.connected || conn.connect_failed, 3000);
-        assert("reconnected via 1886 after it came back", MQTTAsync_isConnected(client), "\n");
-
-        /* disconnect + connect (not reconnect) — resets URI index to 0, connects to 1885 */
-        int disc = 0;
-        MQTTAsync_disconnectOptions dco = MQTTAsync_disconnectOptions_initializer;
-        dco.onSuccess = on_disconnect; dco.context = &disc;
-        MQTTAsync_disconnect(client, &dco);
-        WAIT_TRUE(disc, 3000);
-
-        toxi("POST", "/proxies/mqtt2", "{\"enabled\":false}"); /* only 1885 available */
+        toxi("POST", "/proxies/mqtt1",  "{\"enabled\":true}");
         conn.connected = false; conn.connect_failed = false;
-        MQTTAsync_connect(client, &co);
+        MQTTAsync_reconnect(client);
         WAIT_TRUE(conn.connected || conn.connect_failed, 3000);
-        assert("WORKAROUND: disconnect+connect resets URI cycle, reconnects to 1885", MQTTAsync_isConnected(client), "\n");
+        assert("reconnect, restart cycle from 1885", MQTTAsync_isConnected(client), "\n");
 
         MQTTAsync_destroy(&client);
         MyLog(LOGA_INFO, "TEST: test_serveruris_reset %s. %d assertions run, %d failures.", (failures == 0) ? "passed" : "failed", tests, failures);