edits

[iotcloud.git] / version2 / src / C / CloudComm.cc

diff --git a/version2/src/C/CloudComm.cc b/version2/src/C/CloudComm.cc
index 9055d8624c0e2708decad944755a829c94681438..9149f2d817b562cfb112d910349d98e30502425f 100644 (file)
--- a/version2/src/C/CloudComm.cc
+++ b/version2/src/C/CloudComm.cc
@@ -55,12 +55,20 @@ CloudComm::CloudComm(Table *_table,  IoTString *_baseurl, IoTString *_password,
        table(_table),
        listeningPort(_listeningPort),
        doEnd(false),
-       timer(TimingSingleton_getInstance()) {
+       timer(TimingSingleton_getInstance()),
+       getslot(new Array<char>("getslot", 7)),
+       putslot(new Array<char>("putslot", 7)) {
        if (listeningPort > 0) {
                pthread_create(&localServerThread, NULL, threadWrapper, this);
        }
 }
 
+CloudComm::~CloudComm() {
+       delete random;
+       delete getslot;
+       delete putslot;
+}
+
 /**
  * Generates Key from password.
  */
@@ -113,7 +121,7 @@ void CloudComm::initCrypt() {
 IoTString *CloudComm::buildRequest(bool isput, int64_t sequencenumber, int64_t maxentries) {
        const char *reqstring = isput ? "req=putslot" : "req=getslot";
        char *buffer = (char *) malloc(baseurl->length() + 200);
-       memcpy(buffer, baseurl->internalBytes(), baseurl->length());
+       memcpy(buffer, baseurl->internalBytes()->internalArray(), baseurl->length());
        int offset = baseurl->length();
        offset += sprintf(&buffer[offset], "?%s&seq=%" PRId64, reqstring, sequencenumber);
        if (maxentries != 0)
@@ -175,12 +183,12 @@ int openURL(IoTString *url) {
        /* fill in the parameters */
        int post = sprintf(message,"POST ");
        /* copy data */
-       memcpy(&message[post], url->internalBytes()->internalArray(), url->length());
-       int endpost = sprintf(&message[post+url->length()], " HTTP/1.1\r\n");
+       memcpy(&message[post], &url->internalBytes()->internalArray()[i], url->length()-i);
+       int endpost = sprintf(&message[post+url->length()-i], " HTTP/1.1\r\n");
 
-       int hostlen = sprintf(&message[endpost + post + url->length()], "Host: ");
-       memcpy(&message[endpost + post + url->length()+hostlen], url->internalBytes()->internalArray(), url->length());
-       sprintf(&message[endpost + post + 2*url->length()+hostlen], "\r\n");
+       int hostlen = sprintf(&message[endpost + post + url->length()-i], "Host: ");
+       memcpy(&message[endpost + post + url->length()+hostlen-i], host, i-7);
+       sprintf(&message[endpost + post + url->length()+hostlen-7], "\r\n");
        
        /* create the socket */
        int sockfd = socket(AF_INET, SOCK_STREAM, 0);
@@ -209,7 +217,6 @@ int openURL(IoTString *url) {
        /* send the request */
        int total = strlen(message);
        loopWrite(sockfd, message, total);
-
        return sockfd;
 }
 
@@ -357,6 +364,46 @@ int getResponseCode(int fd) {
        return respcode;
 }
 
+void readHeaders(int fd) {
+       int state = 2;
+       char newchar;
+
+       while(true) {
+               int bytes = read(fd, &newchar, 1);
+               if (bytes <= 0)
+                       throw new Error("Headers malformed!");
+               switch (state) {
+               case 0:
+                       if (newchar == '\r')
+                               state = 1;
+                       break;
+               case 1:
+                       if (newchar == '\n')
+                               state = 2;
+                       else
+                               state = 0;
+                       break;
+               case 2:
+                       if (newchar == '\r')
+                               state = 3;
+                       else
+                               state = 0;
+                       break;
+               case 3:
+                       if (newchar == '\n')
+                               state = 4;
+                       else
+                               state = 0;
+                       break;
+               default:
+                       printf("ERROR in readHeaders\n");
+                       exit(-1);
+               }
+               if (state == 4)
+                       return;
+       }
+}
+
 void CloudComm::setSalt() {
        if (salt != NULL) {
                // Salt already sent to server so don't set it again
@@ -369,7 +416,7 @@ void CloudComm::setSalt() {
                random->nextBytes(saltTmp);
 
                char *buffer = (char *) malloc(baseurl->length() + 100);
-               memcpy(buffer, baseurl->internalBytes(), baseurl->length());
+               memcpy(buffer, baseurl->internalBytes()->internalArray(), baseurl->length());
                int offset = baseurl->length();
                offset += sprintf(&buffer[offset], "?req=setsalt");
                IoTString *urlstr = new IoTString(buffer);
@@ -383,7 +430,8 @@ void CloudComm::setSalt() {
                if (responsecode != HttpURLConnection_HTTP_OK) {
                        throw new Error("Invalid response");
                }
-
+               close(fd);
+               
                timer->endTime();
                salt = saltTmp;
        } catch (Exception *e) {
@@ -398,7 +446,7 @@ bool CloudComm::getSalt() {
 
        try {
                char *buffer = (char *) malloc(baseurl->length() + 100);
-               memcpy(buffer, baseurl->internalBytes(), baseurl->length());
+               memcpy(buffer, baseurl->internalBytes()->internalArray(), baseurl->length());
                int offset = baseurl->length();
                offset += sprintf(&buffer[offset], "?req=getsalt");
                urlstr = new IoTString(buffer);
@@ -421,12 +469,15 @@ bool CloudComm::getSalt() {
        try {
                timer->startTime();
                int responsecode = getResponseCode(fd);
+               readHeaders(fd);
                if (responsecode != HttpURLConnection_HTTP_OK) {
                        throw new Error("Invalid response");
                }
                int salt_length = readURLInt(fd);
                Array<char> *tmp = new Array<char>(salt_length);
                readURLData(fd, tmp);
+               close(fd);
+
                salt = tmp;
                timer->endTime();
                return true;
@@ -518,19 +569,26 @@ Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
 
        try {
                int respcode = getResponseCode(fd);
+               readHeaders(fd);
                timer->startTime();
                Array<char> *resptype = new Array<char>(7);
                readURLData(fd, resptype);
                timer->endTime();
 
                if (resptype->equals(getslot)) {
-                       return processSlots(fd);
+                       Array<Slot *> * tmp =processSlots(fd);
+                       close(fd);
+                       return tmp;
                } else if (resptype->equals(putslot)) {
+                       close(fd);
                        return NULL;
-               } else
+               } else {
+                       close(fd);
                        throw new Error("Bad response to putslot");
+               }
        } catch (SocketTimeoutException *e) {
                timer->endTime();
+               close(fd);
                throw new ServerException("putSlot failed", ServerException_TypeInputTimeout);
        } catch (Exception *e) {
                throw new Error("putSlot failed");
@@ -570,15 +628,19 @@ Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
        try {
                timer->startTime();
                int responsecode = getResponseCode(fd);
+               readHeaders(fd);
                Array<char> *resptype = new Array<char>(7);
                readURLData(fd, resptype);
                timer->endTime();
                if (!resptype->equals(getslot))
                        throw new Error("Bad Response: ");
 
-               return processSlots(fd);
+               Array<Slot*> * tmp=processSlots(fd);
+               close(fd);
+               return tmp;
        } catch (SocketTimeoutException *e) {
                timer->endTime();
+               close(fd);
                throw new ServerException("getSlots failed", ServerException_TypeInputTimeout);
        } catch (Exception *e) {
                throw new Error("getSlots failed");