microgear.connect() returns connection status

Author: chavee

AuthClient.cpp

@@ -35,6 +35,7 @@ bool AuthClient::connect(bool issecuremode) {
 void AuthClient::stop() {
     client->stop();
 }
+
 /**
  * [AuthClient::writeout write string to client
  * @param str     text

MicroGear.cpp

@@ -38,32 +38,30 @@ void msgCallback(char* topic, uint8_t* payload, unsigned int length) {
 
 bool MicroGear::clientReadln(Client* client, char *buffer, size_t buflen) {
     size_t pos = 0;
+
     while (true) {
-        while (true) {
-            uint8_t byte = client->read();
-            if (byte == '\n') {
-                // EOF found.
-                if (pos < buflen) {
-                    if (pos > 0 && buffer[pos - 1] == '\r')
-                    pos--;
-                    buffer[pos] = '\0';
-                }
-                else {
-                    buffer[buflen - 1] = '\0';
-                }
-                return true;
+        uint8_t byte = client->read();
+        if (byte == '\n') {
+            // EOF found.
+            if (pos < buflen) {
+                if (pos > 0 && buffer[pos - 1] == '\r')
+                pos--;
+                buffer[pos] = '\0';
             }
-
-            if (byte != 255) {
-                if (pos < buflen) buffer[pos++] = byte;
+            else {
+                buffer[buflen - 1] = '\0';
             }
-            else{
-                buffer[pos++] = '\0';
-                return true; 
-            } 
+            return true;
+        }
+
+        if (byte != 255) {
+            if (pos < buflen) buffer[pos++] = byte;
         }
+        else{
+            buffer[pos++] = '\0';
+            return false; 
+        } 
     }
-    return false;
 }
 
 int MicroGear::getHTTPReply(Client *client, char *buff, size_t buffsize) {
@@ -184,7 +182,7 @@ void MicroGear::syncTime(Client *client, unsigned long *bts) {
 
 MicroGear::MicroGear(Client& netclient ) {
     sockclient = &netclient;
-    constate = CLIENT_NOTCONNECT;
+    constate = MQTTCLIENT_NOTCONNECTED;
     authclient = NULL;
 	mqttclient = NULL;
 
@@ -282,7 +280,7 @@ void MicroGear::resetToken() {
 }
 
 
-void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecret, char *endpoint) {
+bool MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecret, char *endpoint) {
     char state[2], tstate[2];
     int authstatus = 0;
 
@@ -346,7 +344,8 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
                 #ifdef DEBUG_H
                     Serial.println("authclient is disconnected");
                 #endif
-                delay(2000);
+                //delay(2000);
+                return false;
             }    
         } while (!authstatus);
     }
@@ -431,7 +430,7 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
                 }
             }
         }while (*state == EEPROM_STATE_REQ);
-            // reset accesstoken retry counter
+        // reset accesstoken retry counter
         retry = RETRY;
         #ifdef DEBUG_H
             Serial.println(authstatus); Serial.println(token); Serial.println(tokensecret); Serial.println(endpoint);
@@ -444,24 +443,28 @@ void MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
         readEEPROM(tokensecret,EEPROM_TOKENSECRETOFFSET,TOKENSECRETSIZE);
         readEEPROM(endpoint,EEPROM_ENDPOINTSOFFSET,MAXENDPOINTLENGTH);
     }
+    
+    authclient->stop();
 
     if (*state != EEPROM_STATE_ACC) {
         #ifdef DEBUG_H
             Serial.println("Fail to get a token.");
         #endif
-        delay(2000);
+        //delay(2000);
+        return false;
     }
-    authclient->stop();
+    return true;
 }
 
-bool MicroGear::connectBroker(char* appid) {
+int MicroGear::connectBroker(char* appid) {
     char username[USERNAMESIZE+1];
     char password[PASSWORDSIZE+1];
     char buff[2*TOKENSECRETSIZE+2];
     char token[TOKENSIZE+1];
     char tokensecret[TOKENSECRETSIZE+1];
     char endpoint[MAXENDPOINTLENGTH+1];
     int gbport;
+    bool tokenOK;
 
     do {
         syncTime(sockclient, &bootts);
@@ -486,20 +489,22 @@ bool MicroGear::connectBroker(char* appid) {
     if (authclient) delete(authclient);
     authclient = new AuthClient(*sockclient);
     authclient->init(appid,scope,bootts);
-    getToken(this->gearkey,this->gearalias,token,tokensecret,endpoint);
+    
+    tokenOK = getToken(this->gearkey,this->gearalias,token,tokensecret,endpoint);
     delete(authclient);
     authclient = NULL;
+    
+    if (tokenOK && *token && *tokensecret) {
 
-    /* if endpoint is empty, request a new one */
-    initEndpoint(sockclient, endpoint);
+        /* if endpoint is empty, request a new one */
+        initEndpoint(sockclient, endpoint);
+
+        /* generate one-time user/password */
+        sprintf(username,"%s%%%s%%%lu",token,gearkey,bootts+millis()/1000);
+        sprintf(buff,"%s&%s",tokensecret,gearsecret);
+        Sha1.initHmac((uint8_t*)buff,strlen(buff));
+        Sha1.HmacBase64(password, username);
 
-    /* generate one-time user/password */
-    sprintf(username,"%s%%%s%%%lu",token,gearkey,bootts+millis()/1000);
-    sprintf(buff,"%s&%s",tokensecret,gearsecret);
-    Sha1.initHmac((uint8_t*)buff,strlen(buff));
-    Sha1.HmacBase64(password, username);
-    
-    if (*token && *tokensecret) {
         #ifdef DEBUG_H
             Serial.println("Going to connect to MQTT broker");
             Serial.println(token);
@@ -530,7 +535,7 @@ bool MicroGear::connectBroker(char* appid) {
 
         constate = this->mqttclient->connect(token,username+TOKENSIZE+1,password);
         switch (constate) {
-            case CLIENT_CONNECTED :
+            case MQTTCLIENT_CONNECTED :
                     backoff = MINBACKOFFTIME;
                     if (cb_present)
                         subscribe("/&present");
@@ -542,23 +547,24 @@ bool MicroGear::connectBroker(char* appid) {
 
                     if (cb_connected)
                         cb_connected(NULL,NULL,0);
-                    break;
-            case CLIENT_NOTCONNECT :
+
+                    return NETPIECLIENT_CONNECTED;
+
+            case MQTTCLIENT_NOTCONNECTED :
                     if (backoff < MAXBACKOFFTIME) backoff = 2*backoff;
                     delay(backoff);
-                    break;
+                    return NETPIECLIENT_NOTCONNECTED;
         }
-        return constate;
     }
-    else return false;
+    else return NETPIECLIENT_TOKENERROR;
 }
 
 void MicroGear::useTLS(bool usetls) {
     this->securemode = usetls;
 }
 
-bool MicroGear::connect(char* appid) {
-    connectBroker(appid);
+int MicroGear::connect(char* appid) {
+    return connectBroker(appid);
 }
 
 bool MicroGear::connected() {

MicroGear.h

@@ -54,8 +54,12 @@
 #define MICROGEAR_REJECTED         2
 #define RETRY                      3
 
-#define CLIENT_NOTCONNECT          0
-#define CLIENT_CONNECTED           1
+#define MQTTCLIENT_NOTCONNECTED    0
+#define MQTTCLIENT_CONNECTED       1
+
+#define NETPIECLIENT_CONNECTED     0
+#define NETPIECLIENT_NOTCONNECTED  1
+#define NETPIECLIENT_TOKENERROR    2
 
 /* Event Type */
 #define MESSAGE                    1
@@ -69,7 +73,7 @@ class MicroGear {
 	private:
         char* appid;
 		char* gearname;
-		char* gearkey;
+		char* gearkey;	
         char* gearsecret;
         char* gearalias;
         char* scope;
@@ -86,12 +90,12 @@ class MicroGear {
 		MQTTClient *mqttclient;
 		Client *sockclient;
 
-		bool connectBroker(char*);
+		int connectBroker(char*);
 		int getHTTPReply(Client*, char*, size_t);
 		bool clientReadln(Client*, char*, size_t);
 		void syncTime(Client*, unsigned long*);
 		void initEndpoint(Client*, char*);
-    void getToken(char*, char*, char*, char*, char*);
+        bool getToken(char*, char*, char*, char*, char*);
 
 	public:
 		int constate;
@@ -101,7 +105,7 @@ class MicroGear {
 		void setName(char*);
 		void setAlias(char*);
 		void useTLS(bool);
-		bool connect(char*);
+		int connect(char*);
 		bool connected();
 
 		bool publish(char*, char*);