Bug fixes + tabbing

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

diff --git a/version2/src/C/CloudComm.cc b/version2/src/C/CloudComm.cc
index 9149f2d817b562cfb112d910349d98e30502425f..c20488dd268d59632d09634068961b918a9a878c 100644 (file)
--- a/version2/src/C/CloudComm.cc
+++ b/version2/src/C/CloudComm.cc
@@ -49,7 +49,7 @@ CloudComm::CloudComm(Table *_table,  IoTString *_baseurl, IoTString *_password,
        baseurl(_baseurl),
        key(NULL),
        mac(NULL),
        baseurl(_baseurl),
        key(NULL),
        mac(NULL),

-       password(_password),
+       password(new IoTString(_password)),

        random(new SecureRandom()),
        salt(NULL),
        table(_table),
        random(new SecureRandom()),
        salt(NULL),
        table(_table),


@@ -107,6 +107,7 @@ void CloudComm::initCrypt() {
        }
        try {
                key = initKey();
        }
        try {
                key = initKey();

+               delete password;

                password = NULL;// drop password
                mac = new Mac();
                mac->init(key);
                password = NULL;// drop password
                mac = new Mac();
                mac->init(key);


@@ -130,10 +131,10 @@ IoTString *CloudComm::buildRequest(bool isput, int64_t sequencenumber, int64_t m
        return urlstr;
 }
 
        return urlstr;
 }
 

-void loopWrite(int fd, char * array, int bytestowrite) {
+void loopWrite(int fd, char *array, int bytestowrite) {

        int byteswritten = 0;
        while (bytestowrite) {
        int byteswritten = 0;
        while (bytestowrite) {

-               int bytes = write(fd, & array[byteswritten], bytestowrite);
+               int bytes = write(fd, &array[byteswritten], bytestowrite);

                if (bytes >= 0) {
                        byteswritten += bytes;
                        bytestowrite -= bytes;
                if (bytes >= 0) {
                        byteswritten += bytes;
                        bytestowrite -= bytes;


@@ -144,10 +145,10 @@ void loopWrite(int fd, char * array, int bytestowrite) {
        }
 }
 
        }
 }
 

-void loopRead(int fd, char * array, int bytestoread) {
+void loopRead(int fd, char *array, int bytestoread) {

        int bytesread = 0;
        while (bytestoread) {
        int bytesread = 0;
        while (bytestoread) {

-               int bytes = read(fd, & array[bytesread], bytestoread);
+               int bytes = read(fd, &array[bytesread], bytestoread);

                if (bytes >= 0) {
                        bytesread += bytes;
                        bytestoread -= bytes;
                if (bytes >= 0) {
                        bytesread += bytes;
                        bytestoread -= bytes;


@@ -158,13 +159,13 @@ void loopRead(int fd, char * array, int bytestoread) {
        }
 }
 
        }
 }
 

-int openURL(IoTString *url) {
+WebConnection openURL(IoTString *url) {

        if (url->length() < 7 || memcmp(url->internalBytes()->internalArray(), "http://", 7)) {
                printf("BOGUS URL\n");
                exit(-1);
        }
        int i = 7;
        if (url->length() < 7 || memcmp(url->internalBytes()->internalArray(), "http://", 7)) {
                printf("BOGUS URL\n");
                exit(-1);
        }
        int i = 7;

-       for(; i < url->length(); i++)
+       for (; i < url->length(); i++)

                if (url->get(i) == '/')
                        break;
 
                if (url->get(i) == '/')
                        break;
 


@@ -172,34 +173,34 @@ int openURL(IoTString *url) {
                printf("ERROR in openURL\n");
                exit(-1);
        }
                printf("ERROR in openURL\n");
                exit(-1);
        }

-       
-       char * host = (char *) malloc(i - 6);
-       memcpy(host, &url->internalBytes()->internalArray()[7], i-7);
-       host[i-7] = 0;
+
+       char *host = (char *) malloc(i - 6);
+       memcpy(host, &url->internalBytes()->internalArray()[7], i - 7);
+       host[i - 7] = 0;

        printf("%s\n", host);
 
        printf("%s\n", host);
 

-       char * message = (char *)malloc(sizeof("POST  HTTP/1.1\r\n") + sizeof("Host: \r\n") + 2*url->length());
-       
+       char *message = (char *)malloc(sizeof("POST  HTTP/1.1\r\n") + sizeof("Host: \r\n") + 2 * url->length());
+

        /* fill in the parameters */
        int post = sprintf(message,"POST ");
        /* copy data */
        /* fill in the parameters */
        int post = sprintf(message,"POST ");
        /* copy data */

-       memcpy(&message[post], &url->internalBytes()->internalArray()[i], url->length()-i);
-       int endpost = sprintf(&message[post+url->length()-i], " 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() - i], "Host: ");
+       memcpy(&message[endpost + post + url->length() + hostlen - i], host, i - 7);
+       sprintf(&message[endpost + post + url->length() + hostlen - 7], "\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);
        if (sockfd < 0) {printf("ERROR opening socket\n"); exit(-1);}
        /* create the socket */
        int sockfd = socket(AF_INET, SOCK_STREAM, 0);
        if (sockfd < 0) {printf("ERROR opening socket\n"); exit(-1);}

-       
+

        /* lookup the ip address */
        struct hostent *server = gethostbyname(host);
        free(host);
        /* lookup the ip address */
        struct hostent *server = gethostbyname(host);
        free(host);

-       
+

        if (server == NULL) {printf("ERROR, no such host"); exit(-1);}
        if (server == NULL) {printf("ERROR, no such host"); exit(-1);}

-       
+

        /* fill in the structure */
        struct sockaddr_in serv_addr;
 
        /* fill in the structure */
        struct sockaddr_in serv_addr;
 


@@ -207,7 +208,7 @@ int openURL(IoTString *url) {
        serv_addr.sin_family = AF_INET;
        serv_addr.sin_port = htons(80);
        memcpy(&serv_addr.sin_addr.s_addr,server->h_addr,server->h_length);
        serv_addr.sin_family = AF_INET;
        serv_addr.sin_port = htons(80);
        memcpy(&serv_addr.sin_addr.s_addr,server->h_addr,server->h_length);

-       
+

        /* connect the socket */
        if (connect(sockfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0) {
                printf("ERROR connecting");
        /* connect the socket */
        if (connect(sockfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0) {
                printf("ERROR connecting");


@@ -217,26 +218,26 @@ int openURL(IoTString *url) {
        /* send the request */
        int total = strlen(message);
        loopWrite(sockfd, message, total);
        /* send the request */
        int total = strlen(message);
        loopWrite(sockfd, message, total);

-       return sockfd;
+       return (WebConnection) {sockfd, -1};

 }
 
 int createSocket(IoTString *name, int port) {
 }
 
 int createSocket(IoTString *name, int port) {

-       char * host = (char *) malloc(name->length()+1);
+       char *host = (char *) malloc(name->length() + 1);

        memcpy(host, name->internalBytes()->internalArray(), name->length());
        host[name->length()] = 0;
        printf("%s\n", host);
        /* How big is the message? */
        memcpy(host, name->internalBytes()->internalArray(), name->length());
        host[name->length()] = 0;
        printf("%s\n", host);
        /* How big is the message? */

-       
+

        /* create the socket */
        int sockfd = socket(AF_INET, SOCK_STREAM, 0);
        if (sockfd < 0) {printf("ERROR opening socket\n"); exit(-1);}
        /* create the socket */
        int sockfd = socket(AF_INET, SOCK_STREAM, 0);
        if (sockfd < 0) {printf("ERROR opening socket\n"); exit(-1);}

-       
+

        /* lookup the ip address */
        struct hostent *server = gethostbyname(host);
        free(host);
        /* lookup the ip address */
        struct hostent *server = gethostbyname(host);
        free(host);

-       
+

        if (server == NULL) {printf("ERROR, no such host"); exit(-1);}
        if (server == NULL) {printf("ERROR, no such host"); exit(-1);}

-       
+

        /* fill in the structure */
        struct sockaddr_in serv_addr;
 
        /* fill in the structure */
        struct sockaddr_in serv_addr;
 


@@ -244,13 +245,13 @@ int createSocket(IoTString *name, int port) {
        serv_addr.sin_family = AF_INET;
        serv_addr.sin_port = htons(port);
        memcpy(&serv_addr.sin_addr.s_addr,server->h_addr,server->h_length);
        serv_addr.sin_family = AF_INET;
        serv_addr.sin_port = htons(port);
        memcpy(&serv_addr.sin_addr.s_addr,server->h_addr,server->h_length);

-       
+

        /* connect the socket */
        if (connect(sockfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0) {
                printf("ERROR connecting");
                exit(-1);
        }
        /* connect the socket */
        if (connect(sockfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0) {
                printf("ERROR connecting");
                exit(-1);
        }

-       
+

        return sockfd;
 }
 
        return sockfd;
 }
 


@@ -258,31 +259,31 @@ int createSocket(int port) {
        int fd;
        struct sockaddr_in sin;
 
        int fd;
        struct sockaddr_in sin;
 

-  bzero(&sin, sizeof(sin));
-  sin.sin_family = AF_INET;
-  sin.sin_port = htons(port);
-  sin.sin_addr.s_addr = htonl(INADDR_ANY);
-  fd=socket(AF_INET, SOCK_STREAM, 0);
+       bzero(&sin, sizeof(sin));
+       sin.sin_family = AF_INET;
+       sin.sin_port = htons(port);
+       sin.sin_addr.s_addr = htonl(INADDR_ANY);
+       fd = socket(AF_INET, SOCK_STREAM, 0);

        int n = 1;
        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&n, sizeof (n)) < 0) {
        int n = 1;
        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&n, sizeof (n)) < 0) {

-    close(fd);
+               close(fd);

                printf("Create Socket Error\n");
                exit(-1);
        }
                printf("Create Socket Error\n");
                exit(-1);
        }

-       if (bind(fd, (struct sockaddr *) &sin, sizeof(sin))<0) {
-    close(fd);
+       if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
+               close(fd);

                exit(-1);
        }
                exit(-1);
        }

-  if (listen(fd, 5)<0) {
-    close(fd);
+       if (listen(fd, 5) < 0) {
+               close(fd);

                exit(-1);
        }
        return fd;
 }
 
 int acceptSocket(int socket) {
                exit(-1);
        }
        return fd;
 }
 
 int acceptSocket(int socket) {

-  struct sockaddr_in sin;
-  unsigned int sinlen=sizeof(sin);
+       struct sockaddr_in sin;
+       unsigned int sinlen = sizeof(sin);

        int newfd = accept(socket, (struct sockaddr *)&sin, &sinlen);
        int flag = 1;
        setsockopt(newfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(flag));
        int newfd = accept(socket, (struct sockaddr *)&sin, &sinlen);
        int flag = 1;
        setsockopt(newfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(flag));


@@ -302,54 +303,53 @@ void writeSocketInt(int fd, int32_t value) {
        array[0] = value >> 24;
        array[1] = (value >> 16) & 0xff;
        array[2] = (value >> 8) & 0xff;
        array[0] = value >> 24;
        array[1] = (value >> 16) & 0xff;
        array[2] = (value >> 8) & 0xff;

-       array[3] = (value >> 8) & 0xff;
+       array[3] = value & 0xff;

        loopWrite(fd, array, 4);
 }
 
 int readSocketInt(int fd) {
        char array[4];
        loopRead(fd, array, 4);
        loopWrite(fd, array, 4);
 }
 
 int readSocketInt(int fd) {
        char array[4];
        loopRead(fd, array, 4);

-       return (((int32_t) array[0]) << 24) |
-               (((int32_t) array[1]) << 16) |
-               (((int32_t) array[2]) << 8) |
-               ((int32_t) array[3]);
+       return (((int32_t)(unsigned char) array[0]) << 24) |
+                                (((int32_t)(unsigned char) array[1]) << 16) |
+                                (((int32_t)(unsigned char) array[2]) << 8) |
+                                ((int32_t)(unsigned char) array[3]);

 }
 
 void readSocketData(int fd, Array<char> *data) {
        loopRead(fd, data->internalArray(), data->length());
 }
 
 }
 
 void readSocketData(int fd, Array<char> *data) {
        loopRead(fd, data->internalArray(), data->length());
 }
 

-void writeURLDataAndClose(int fd, Array<char> *data) {
-       dprintf(fd, "Content-Length: %d\r\n\r\n", data->length());
-       loopWrite(fd, data->internalArray(), data->length());
+void writeURLDataAndClose(WebConnection *wc, Array<char> *data) {
+       dprintf(wc->fd, "Content-Length: %d\r\n\r\n", data->length());
+       loopWrite(wc->fd, data->internalArray(), data->length());

 }
 
 }
 

-void closeURLReq(int fd) {
-       dprintf(fd, "\r\n");
+void closeURLReq(WebConnection *wc) {
+       dprintf(wc->fd, "\r\n");

 }
 
 }
 

-void readURLData(int fd, Array<char> *output) {
-       loopRead(fd, output->internalArray(), output->length());
+void readURLData(WebConnection *wc, Array<char> *output) {
+       loopRead(wc->fd, output->internalArray(), output->length());

 }
 
 }
 

-int readURLInt(int fd) {
+int readURLInt(WebConnection *wc) {

        char array[4];
        char array[4];

-       loopRead(fd, array, 4);
-       return (((int32_t) array[0]) << 24) |
-               (((int32_t) array[1]) << 16) |
-               (((int32_t) array[2]) << 8) |
-               ((int32_t) array[3]);
+       loopRead(wc->fd, array, 4);
+       return (((int32_t)(unsigned char) array[0]) << 24) |
+                                (((int32_t)(unsigned char) array[1]) << 16) |
+                                (((int32_t)(unsigned char) array[2]) << 8) |
+                                ((int32_t)(unsigned char) array[3]);

 }
 
 }
 

-int getResponseCode(int fd) {
-       char response[600];
+void readLine(WebConnection *wc, char *response, int numBytes) {

        int offset = 0;
        char newchar;
        int offset = 0;
        char newchar;

-       while(true) {
-               int bytes = read(fd, &newchar, 1);
+       while (true) {
+               int bytes = read(wc->fd, &newchar, 1);

                if (bytes <= 0)
                        break;
                if (bytes <= 0)
                        break;

-               if (offset == (sizeof(response) - 1)) {
+               if (offset == (numBytes - 1)) {

                        printf("Response too long");
                        exit(-1);
                }
                        printf("Response too long");
                        exit(-1);
                }


@@ -358,49 +358,29 @@ int getResponseCode(int fd) {
                        break;
        }
        response[offset] = 0;
                        break;
        }
        response[offset] = 0;

+}
+
+int getResponseCode(WebConnection *wc) {
+       char response[600];
+       readLine(wc, response, sizeof(response));

        int ver1 = 0, ver2 = 0, respcode = 0;
        sscanf(response, "HTTP/%d.%d %d", &ver1, &ver2, &respcode);
        printf("Response code %d\n", respcode);
        return respcode;
 }
 
        int ver1 = 0, ver2 = 0, respcode = 0;
        sscanf(response, "HTTP/%d.%d %d", &ver1, &ver2, &respcode);
        printf("Response code %d\n", respcode);
        return respcode;
 }
 

-void readHeaders(int fd) {
-       int state = 2;
-       char newchar;
+void readHeaders(WebConnection *wc) {
+       char response[600];
+       int numBytes;

 
 

-       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)
+       while (true) {
+               readLine(wc, response, sizeof(response));
+               if (response[0] == '\r')

                        return;
                        return;

+               else if (memcmp(response, "Content-Length:", sizeof("Content-Length:") - 1) == 0) {
+                       sscanf(response, "Content-Length: %d", &numBytes);
+                       wc->numBytes = numBytes;
+               }

        }
 }
 
        }
 }
 


@@ -410,7 +390,7 @@ void CloudComm::setSalt() {
                return;
        }
 
                return;
        }
 

-       int fd = -1;
+       WebConnection wc = {-1, -1};

        try {
                Array<char> *saltTmp = new Array<char>(CloudComm_SALT_SIZE);
                random->nextBytes(saltTmp);
        try {
                Array<char> *saltTmp = new Array<char>(CloudComm_SALT_SIZE);
                random->nextBytes(saltTmp);


@@ -423,15 +403,15 @@ void CloudComm::setSalt() {
                free(buffer);
 
                timer->startTime();
                free(buffer);
 
                timer->startTime();

-               fd = openURL(urlstr);
-               writeURLDataAndClose(fd, saltTmp);
+               wc = openURL(urlstr);
+               writeURLDataAndClose(&wc, saltTmp);

 
 

-               int responsecode = getResponseCode(fd);
+               int responsecode = getResponseCode(&wc);

                if (responsecode != HttpURLConnection_HTTP_OK) {
                        throw new Error("Invalid response");
                }
                if (responsecode != HttpURLConnection_HTTP_OK) {
                        throw new Error("Invalid response");
                }

-               close(fd);
-               
+               close(wc.fd);
+

                timer->endTime();
                salt = saltTmp;
        } catch (Exception *e) {
                timer->endTime();
                salt = saltTmp;
        } catch (Exception *e) {


@@ -441,7 +421,7 @@ void CloudComm::setSalt() {
 }
 
 bool CloudComm::getSalt() {
 }
 
 bool CloudComm::getSalt() {

-       int fd = -1;
+       WebConnection wc = {-1, -1};

        IoTString *urlstr = NULL;
 
        try {
        IoTString *urlstr = NULL;
 
        try {


@@ -456,8 +436,8 @@ bool CloudComm::getSalt() {
        }
        try {
                timer->startTime();
        }
        try {
                timer->startTime();

-               fd = openURL(urlstr);
-               closeURLReq(fd);
+               wc = openURL(urlstr);
+               closeURLReq(&wc);

                timer->endTime();
        } catch (SocketTimeoutException *e) {
                timer->endTime();
                timer->endTime();
        } catch (SocketTimeoutException *e) {
                timer->endTime();


@@ -468,15 +448,22 @@ bool CloudComm::getSalt() {
 
        try {
                timer->startTime();
 
        try {
                timer->startTime();

-               int responsecode = getResponseCode(fd);
-               readHeaders(fd);
+               int responsecode = getResponseCode(&wc);
+               readHeaders(&wc);

                if (responsecode != HttpURLConnection_HTTP_OK) {
                        throw new Error("Invalid response");
                }
                if (responsecode != HttpURLConnection_HTTP_OK) {
                        throw new Error("Invalid response");
                }

-               int salt_length = readURLInt(fd);
+               if (wc.numBytes == 0) {
+                       timer->endTime();
+                       close(wc.fd);
+                       return false;
+               }
+
+
+               int salt_length = readURLInt(&wc);

                Array<char> *tmp = new Array<char>(salt_length);
                Array<char> *tmp = new Array<char>(salt_length);

-               readURLData(fd, tmp);
-               close(fd);
+               readURLData(&wc, tmp);
+               close(wc.fd);

 
                salt = tmp;
                timer->endTime();
 
                salt = tmp;
                timer->endTime();


@@ -498,20 +485,23 @@ Array<char> *CloudComm::createIV(int64_t machineId, int64_t localSequenceNumber)
 }
 
 Array<char> *AESEncrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
 }
 
 Array<char> *AESEncrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {

-       Array<char> * output=new Array<char>(data->length());
-       aes_encrypt_ctr((BYTE *)data->internalArray(), data->length(), (BYTE *) output->internalArray(), (WORD *)key->getKey()->internalArray(), key->getKey()->length()/(sizeof(WORD)/sizeof(BYTE)), (BYTE *)ivBytes->internalArray());
+       Array<char> *output = new Array<char>(data->length());
+       aes_encrypt_ctr((BYTE *)data->internalArray(), data->length(), (BYTE *) output->internalArray(), (WORD *)key->getKeySchedule(), key->getKey()->length() * 8, (BYTE *)ivBytes->internalArray());

        return output;
 }
 
 Array<char> *AESDecrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
        return output;
 }
 
 Array<char> *AESDecrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {

-       Array<char> * output=new Array<char>(data->length());
-       aes_decrypt_ctr((BYTE *)data->internalArray(), data->length(), (BYTE *)output->internalArray(), (WORD *)key->getKey()->internalArray(), key->getKey()->length()/(sizeof(WORD)/sizeof(BYTE)), (BYTE *)ivBytes->internalArray());
+       Array<char> *output = new Array<char>(data->length());
+       aes_decrypt_ctr((BYTE *)data->internalArray(), data->length(), (BYTE *)output->internalArray(), (WORD *)key->getKeySchedule(), key->getKey()->length() * 8, (BYTE *)ivBytes->internalArray());

        return output;
 }
 
 Array<char> *CloudComm::encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes) {
        try {
                Array<char> *encryptedBytes = AESEncrypt(ivBytes, key, rawData);
        return output;
 }
 
 Array<char> *CloudComm::encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes) {
        try {
                Array<char> *encryptedBytes = AESEncrypt(ivBytes, key, rawData);

+               Array<char> *origBytes = AESDecrypt(ivBytes, key, encryptedBytes);
+               if (!rawData->equals(origBytes))
+                       throw new Error("BAD");

                Array<char> *chars = new Array<char>(encryptedBytes->length() + CloudComm_IV_SIZE);
                System_arraycopy(ivBytes, 0, chars, 0, ivBytes->length());
                System_arraycopy(encryptedBytes, 0, chars, CloudComm_IV_SIZE, encryptedBytes->length());
                Array<char> *chars = new Array<char>(encryptedBytes->length() + CloudComm_IV_SIZE);
                System_arraycopy(ivBytes, 0, chars, 0, ivBytes->length());
                System_arraycopy(encryptedBytes, 0, chars, CloudComm_IV_SIZE, encryptedBytes->length());


@@ -540,7 +530,7 @@ Array<char> *CloudComm::stripIVAndDecryptSlot(Array<char> *rawData) {
  * numbers.
  */
 Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
  * numbers.
  */
 Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {

-       int fd = -1;
+       WebConnection wc = {-1, -1};

        try {
                if (salt == NULL) {
                        if (!getSalt()) {
        try {
                if (salt == NULL) {
                        if (!getSalt()) {


@@ -554,8 +544,8 @@ Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
                Array<char> *chars = encryptSlotAndPrependIV(slotBytes, slot->getSlotCryptIV());
                IoTString *url = buildRequest(true, sequencenumber, max);
                timer->startTime();
                Array<char> *chars = encryptSlotAndPrependIV(slotBytes, slot->getSlotCryptIV());
                IoTString *url = buildRequest(true, sequencenumber, max);
                timer->startTime();

-               fd = openURL(url);
-               writeURLDataAndClose(fd, chars);
+               wc = openURL(url);
+               writeURLDataAndClose(&wc, chars);

                timer->endTime();
        } catch (ServerException *e) {
                timer->endTime();
                timer->endTime();
        } catch (ServerException *e) {
                timer->endTime();


@@ -568,27 +558,27 @@ Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
        }
 
        try {
        }
 
        try {

-               int respcode = getResponseCode(fd);
-               readHeaders(fd);
+               int respcode = getResponseCode(&wc);
+               readHeaders(&wc);

                timer->startTime();
                Array<char> *resptype = new Array<char>(7);
                timer->startTime();
                Array<char> *resptype = new Array<char>(7);

-               readURLData(fd, resptype);
+               readURLData(&wc, resptype);

                timer->endTime();
 
                if (resptype->equals(getslot)) {
                timer->endTime();
 
                if (resptype->equals(getslot)) {

-                       Array<Slot *> * tmp =processSlots(fd);
-                       close(fd);
+                       Array<Slot *> *tmp = processSlots(&wc);
+                       close(wc.fd);

                        return tmp;
                } else if (resptype->equals(putslot)) {
                        return tmp;
                } else if (resptype->equals(putslot)) {

-                       close(fd);
+                       close(wc.fd);

                        return NULL;
                } else {
                        return NULL;
                } else {

-                       close(fd);
+                       close(wc.fd);

                        throw new Error("Bad response to putslot");
                }
        } catch (SocketTimeoutException *e) {
                timer->endTime();
                        throw new Error("Bad response to putslot");
                }
        } catch (SocketTimeoutException *e) {
                timer->endTime();

-               close(fd);
+               close(wc.fd);

                throw new ServerException("putSlot failed", ServerException_TypeInputTimeout);
        } catch (Exception *e) {
                throw new Error("putSlot failed");
                throw new ServerException("putSlot failed", ServerException_TypeInputTimeout);
        } catch (Exception *e) {
                throw new Error("putSlot failed");


@@ -600,7 +590,7 @@ Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
  * sequencenumber or newer->
  */
 Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
  * sequencenumber or newer->
  */
 Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {

-       int fd = -1;
+       WebConnection wc = {-1, -1};

        try {
                if (salt == NULL) {
                        if (!getSalt()) {
        try {
                if (salt == NULL) {
                        if (!getSalt()) {


@@ -611,8 +601,8 @@ Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
 
                IoTString *url = buildRequest(false, sequencenumber, 0);
                timer->startTime();
 
                IoTString *url = buildRequest(false, sequencenumber, 0);
                timer->startTime();

-               fd = openURL(url);
-               closeURLReq(fd);
+               wc = openURL(url);
+               closeURLReq(&wc);

                timer->endTime();
        } catch (SocketTimeoutException *e) {
                timer->endTime();
                timer->endTime();
        } catch (SocketTimeoutException *e) {
                timer->endTime();


@@ -627,20 +617,20 @@ Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
 
        try {
                timer->startTime();
 
        try {
                timer->startTime();

-               int responsecode = getResponseCode(fd);
-               readHeaders(fd);
+               int responsecode = getResponseCode(&wc);
+               readHeaders(&wc);

                Array<char> *resptype = new Array<char>(7);
                Array<char> *resptype = new Array<char>(7);

-               readURLData(fd, resptype);
+               readURLData(&wc, resptype);

                timer->endTime();
                if (!resptype->equals(getslot))
                        throw new Error("Bad Response: ");
 
                timer->endTime();
                if (!resptype->equals(getslot))
                        throw new Error("Bad Response: ");
 

-               Array<Slot*> * tmp=processSlots(fd);
-               close(fd);
+               Array<Slot *> *tmp = processSlots(&wc);
+               close(wc.fd);

                return tmp;
        } catch (SocketTimeoutException *e) {
                timer->endTime();
                return tmp;
        } catch (SocketTimeoutException *e) {
                timer->endTime();

-               close(fd);
+               close(wc.fd);

                throw new ServerException("getSlots failed", ServerException_TypeInputTimeout);
        } catch (Exception *e) {
                throw new Error("getSlots failed");
                throw new ServerException("getSlots failed", ServerException_TypeInputTimeout);
        } catch (Exception *e) {
                throw new Error("getSlots failed");


@@ -651,16 +641,16 @@ Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
  * Method that actually handles building Slot objects from the
  * server response.  Shared by both putSlot and getSlots.
  */
  * Method that actually handles building Slot objects from the
  * server response.  Shared by both putSlot and getSlots.
  */

-Array<Slot *> *CloudComm::processSlots(int fd) {
-       int numberofslots = readURLInt(fd);
+Array<Slot *> *CloudComm::processSlots(WebConnection *wc) {
+       int numberofslots = readURLInt(wc);

        Array<int> *sizesofslots = new Array<int>(numberofslots);
        Array<Slot *> *slots = new Array<Slot *>(numberofslots);
 
        for (int i = 0; i < numberofslots; i++)
        Array<int> *sizesofslots = new Array<int>(numberofslots);
        Array<Slot *> *slots = new Array<Slot *>(numberofslots);
 
        for (int i = 0; i < numberofslots; i++)

-               sizesofslots->set(i, readURLInt(fd));
+               sizesofslots->set(i, readURLInt(wc));

        for (int i = 0; i < numberofslots; i++) {
                Array<char> *rawData = new Array<char>(sizesofslots->get(i));
        for (int i = 0; i < numberofslots; i++) {
                Array<char> *rawData = new Array<char>(sizesofslots->get(i));

-               readURLData(fd, rawData);
+               readURLData(wc, rawData);

                Array<char> *data = stripIVAndDecryptSlot(rawData);
                slots->set(i, Slot_decode(table, data, mac));
        }
                Array<char> *data = stripIVAndDecryptSlot(rawData);
                slots->set(i, Slot_decode(table, data, mac));
        }