edits

diff --git a/version2/src/C/CloudComm.cc b/version2/src/C/CloudComm.cc
index 452317f42335854743b9e95cb3d1f81bc62e8858..9a15732711360236be62ab804f7a695ed88106b3 100644 (file)
--- a/version2/src/C/CloudComm.cc
+++ b/version2/src/C/CloudComm.cc
@@ -53,11 +53,11 @@ CloudComm::CloudComm(Table *_table,  IoTString *_baseurl, IoTString *_password,
  */
 SecretKeySpec *CloudComm::initKey() {
        try {
  */
 SecretKeySpec *CloudComm::initKey() {
        try {

-               PBEKeySpec keyspec = new PBEKeySpec(password->internalBytes(),
-                                                                                                                                                               salt,
-                                                                                                                                                               65536,
-                                                                                                                                                               128);
-               SecretKey tmpkey = SecretKeyFactory_getInstance("PBKDF2WithHmacSHA256")->generateSecret(keyspec);
+               PBEKeySpec *keyspec = new PBEKeySpec(password->internalBytes(),
+                                                                                                                                                                salt,
+                                                                                                                                                                65536,
+                                                                                                                                                                128);
+               SecretKey *tmpkey = SecretKeyFactory_getInstance("PBKDF2WithHmacSHA256")->generateSecret(keyspec);

                return new SecretKeySpec(tmpkey->getEncoded(), "AES");
        } catch (Exception *e) {
                throw new Error("Failed generating key.");
                return new SecretKeySpec(tmpkey->getEncoded(), "AES");
        } catch (Exception *e) {
                throw new Error("Failed generating key.");


@@ -82,7 +82,6 @@ void CloudComm::initSecurity() {
  * Inits the HMAC generator.
  */
 void CloudComm::initCrypt() {
  * Inits the HMAC generator.
  */
 void CloudComm::initCrypt() {

-

        if (password == NULL) {
                return;
        }
        if (password == NULL) {
                return;
        }


@@ -123,19 +122,15 @@ void CloudComm::setSalt() {
                        printf("%d\n", (int)saltTmp->get(i) & 255);
                }
 
                        printf("%d\n", (int)saltTmp->get(i) & 255);
                }
 

-

                URL *url = new URL(baseurl + "?req=setsalt");
                URL *url = new URL(baseurl + "?req=setsalt");

-

                timer->startTime();
                timer->startTime();

-               URLConnection con = url->openConnection();
-               HttpURLConnection http = (HttpURLConnection) con;
+               URLConnection *con = url->openConnection();
+               HttpURLConnection *http = (HttpURLConnection *) con;

 
                http->setRequestMethod("POST");
                http->setFixedLengthStreamingMode(saltTmp->length());
                http->setDoOutput(true);
                http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
 
                http->setRequestMethod("POST");
                http->setFixedLengthStreamingMode(saltTmp->length());
                http->setDoOutput(true);
                http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);

-
-

                http->connect();
 
                OutputStream *os = http->getOutputStream();
                http->connect();
 
                OutputStream *os = http->getOutputStream();


@@ -143,18 +138,17 @@ void CloudComm::setSalt() {
                os->flush();
 
                int responsecode = http->getResponseCode();
                os->flush();
 
                int responsecode = http->getResponseCode();

-               if (responsecode != HttpURLConnection.HTTP_OK) {
+               if (responsecode != HttpURLConnection_HTTP_OK) {

                        // TODO: Remove this print
                        // TODO: Remove this print

-                       System.out.println(responsecode);
+                       printf("%d\n", responsecode);

                        throw new Error("Invalid response");
                }
 
                timer->endTime();
                        throw new Error("Invalid response");
                }
 
                timer->endTime();

-

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

-               throw new ServerException("Failed setting salt", ServerException.TypeConnectTimeout);
+               throw new ServerException("Failed setting salt", ServerException_TypeConnectTimeout);

        }
 }
 
        }
 }
 


@@ -169,36 +163,28 @@ bool CloudComm::getSalt() {
                throw new Error("getSlot failed");
        }
        try {
                throw new Error("getSlot failed");
        }
        try {

-

                timer->startTime();
                con = url->openConnection();
                timer->startTime();
                con = url->openConnection();

-               http = (HttpURLConnection) con;
+               http = (HttpURLConnection *) con;

                http->setRequestMethod("POST");
                http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
                http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
                http->setRequestMethod("POST");
                http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
                http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);

-
-

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

-               throw new ServerException("getSalt failed", ServerException.TypeConnectTimeout);
+               throw new ServerException("getSalt failed", ServerException_TypeConnectTimeout);

        } catch (Exception *e) {
                throw new Error("getSlot failed");
        }
 
        try {
        } catch (Exception *e) {
                throw new Error("getSlot failed");
        }
 
        try {

-

                timer->startTime();
                timer->startTime();

-
-               int responsecode = http.getResponseCode();
-               if (responsecode != HttpURLConnection.HTTP_OK) {
-                       // TODO: Remove this print
-                       // System.out.println(responsecode);
+               int responsecode = http->getResponseCode();
+               if (responsecode != HttpURLConnection_HTTP_OK) {

                        throw new Error("Invalid response");
                }
                        throw new Error("Invalid response");
                }

-
-               InputStream is = http->getInputStream();
+               InputStream *is = http->getInputStream();

                if (is->available() > 0) {
                        DataInputStream *dis = new DataInputStream(is);
                        int salt_length = dis->readInt();
                if (is->available() > 0) {
                        DataInputStream *dis = new DataInputStream(is);
                        int salt_length = dis->readInt();


@@ -206,24 +192,21 @@ bool CloudComm::getSalt() {
                        dis->readFully(tmp);
                        salt = tmp;
                        timer->endTime();
                        dis->readFully(tmp);
                        salt = tmp;
                        timer->endTime();

-

                        return true;
                } else {
                        timer->endTime();
                        return true;
                } else {
                        timer->endTime();

-

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

-
-               throw new ServerException("getSalt failed", ServerException.TypeInputTimeout);
+               throw new ServerException("getSalt failed", ServerException_TypeInputTimeout);

        } catch (Exception *e) {
                throw new Error("getSlot failed");
        }
 }
 
 Array<char> *CloudComm::createIV(int64_t machineId, int64_t localSequenceNumber) {
        } catch (Exception *e) {
                throw new Error("getSlot failed");
        }
 }
 
 Array<char> *CloudComm::createIV(int64_t machineId, int64_t localSequenceNumber) {

-       ByteBuffer buffer = ByteBuffer.allocate(CloudComm_IV_SIZE);
+       ByteBuffer *buffer = ByteBuffer_allocate(CloudComm_IV_SIZE);

        buffer->putLong(machineId);
        int64_t localSequenceNumberShifted = localSequenceNumber << 16;
        buffer->putLong(localSequenceNumberShifted);
        buffer->putLong(machineId);
        int64_t localSequenceNumberShifted = localSequenceNumber << 16;
        buffer->putLong(localSequenceNumberShifted);


@@ -232,24 +215,22 @@ Array<char> *CloudComm::createIV(int64_t machineId, int64_t localSequenceNumber)
 
 Array<char> *CloudComm::encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes) {
        try {
 
 Array<char> *CloudComm::encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes) {
        try {

-               IvParameterSpec ivSpec = new IvParameterSpec(ivBytes);
-               Cipher cipher = Cipher.getInstance("AES/CTR/NoPadding");
-               cipher->init(Cipher.ENCRYPT_MODE, key, ivSpec);
+               IvParameterSpec *ivSpec = new IvParameterSpec(ivBytes);
+               Cipher *cipher = Cipher_getInstance("AES/CTR/NoPadding");
+               cipher->init(Cipher_ENCRYPT_MODE, key, ivSpec);

 
                Array<char> *encryptedBytes = cipher->doFinal(rawData);
 
                Array<char> *chars = new Array<char>(encryptedBytes->length() + CloudComm_IV_SIZE);
 
                Array<char> *encryptedBytes = cipher->doFinal(rawData);
 
                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);
+               System_arraycopy(ivBytes, 0, chars, 0, ivBytes->length());
+               System_arraycopy(encryptedBytes, 0, chars, CloudComm_IV_SIZE, encryptedBytes->length());

 
                return chars;
 
                return chars;

-

        } catch (Exception *e) {
                throw new Error("Failed To Encrypt");
        }
 }
 
        } catch (Exception *e) {
                throw new Error("Failed To Encrypt");
        }
 }
 

-

 Array<char> *CloudComm::stripIVAndDecryptSlot(Array<char> *rawData) {
        try {
                Array<char> *ivBytes = new Array<char>(CloudComm_IV_SIZE);
 Array<char> *CloudComm::stripIVAndDecryptSlot(Array<char> *rawData) {
        try {
                Array<char> *ivBytes = new Array<char>(CloudComm_IV_SIZE);


@@ -258,17 +239,14 @@ Array<char> *CloudComm::stripIVAndDecryptSlot(Array<char> *rawData) {
                System_arraycopy(rawData, CloudComm_IV_SIZE, encryptedBytes, 0, encryptedBytes->length);
 
                IvParameterSpec *ivSpec = new IvParameterSpec(ivBytes);
                System_arraycopy(rawData, CloudComm_IV_SIZE, encryptedBytes, 0, encryptedBytes->length);
 
                IvParameterSpec *ivSpec = new IvParameterSpec(ivBytes);

-

                Cipher *cipher = Cipher_getInstance("AES/CTR/NoPadding");
                cipher->init(Cipher_DECRYPT_MODE, key, ivSpec);
                return cipher->doFinal(encryptedBytes);
                Cipher *cipher = Cipher_getInstance("AES/CTR/NoPadding");
                cipher->init(Cipher_DECRYPT_MODE, key, ivSpec);
                return cipher->doFinal(encryptedBytes);

-

        } catch (Exception *e) {
                throw new Error("Failed To Decrypt");
        }
 }
 
        } catch (Exception *e) {
                throw new Error("Failed To Decrypt");
        }
 }
 

-

 /*
  * API for putting a slot into the queue.  Returns NULL on success.
  * On failure, the server will send slots with newer sequence
 /*
  * API for putting a slot into the queue.  Returns NULL on success.
  * On failure, the server will send slots with newer sequence


@@ -278,53 +256,41 @@ Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
        try {
                if (salt == NULL) {
                        if (!getSalt()) {
        try {
                if (salt == NULL) {
                        if (!getSalt()) {

-                               throw new ServerException("putSlot failed", ServerException.TypeSalt);
+                               throw new ServerException("putSlot failed", ServerException_TypeSalt);

                        }
                        initCrypt();
                }
 
                int64_t sequencenumber = slot->getSequenceNumber();
                Array<char> *slotBytes = slot->encode(mac);
                        }
                        initCrypt();
                }
 
                int64_t sequencenumber = slot->getSequenceNumber();
                Array<char> *slotBytes = slot->encode(mac);

-

                Array<char> *chars = encryptSlotAndPrependIV(slotBytes, slot->getSlotCryptIV());
                Array<char> *chars = encryptSlotAndPrependIV(slotBytes, slot->getSlotCryptIV());

-

                URL *url = buildRequest(true, sequencenumber, max);
                URL *url = buildRequest(true, sequencenumber, max);

-

                timer->startTime();
                URLConnection *con = url->openConnection();
                HttpURLConnection *http = (HttpURLConnection *) con;
                timer->startTime();
                URLConnection *con = url->openConnection();
                HttpURLConnection *http = (HttpURLConnection *) con;

-

                http->setRequestMethod("POST");
                http->setFixedLengthStreamingMode(chars->length);
                http->setDoOutput(true);
                http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
                http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
                http->connect();
                http->setRequestMethod("POST");
                http->setFixedLengthStreamingMode(chars->length);
                http->setDoOutput(true);
                http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
                http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
                http->connect();

-

                OutputStream *os = http->getOutputStream();
                os->write(chars);
                os->flush();
                OutputStream *os = http->getOutputStream();
                os->write(chars);
                os->flush();

-

                timer->endTime();
                timer->endTime();

-
-

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

-

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

-
-               throw new ServerException("putSlot failed", ServerException.TypeConnectTimeout);
+               throw new ServerException("putSlot failed", ServerException_TypeConnectTimeout);

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

-
-

        try {
                timer->startTime();
        try {
                timer->startTime();

-               InputStream is = http->getInputStream();
+               InputStream *is = http->getInputStream();

                DataInputStream *dis = new DataInputStream(is);
                Array<char> *resptype = new Array<char>(7);
                dis->readFully(resptype);
                DataInputStream *dis = new DataInputStream(is);
                Array<char> *resptype = new Array<char>(7);
                dis->readFully(resptype);


@@ -336,7 +302,6 @@ Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
                        return NULL;
                } else
                        throw new Error("Bad response to putslot");
                        return NULL;
                } else
                        throw new Error("Bad response to putslot");

-

        } catch (SocketTimeoutException *e) {
                timer->endTime();
                throw new ServerException("putSlot failed", ServerException->TypeInputTimeout);
        } catch (SocketTimeoutException *e) {
                timer->endTime();
                throw new ServerException("putSlot failed", ServerException->TypeInputTimeout);


@@ -353,7 +318,7 @@ Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
        try {
                if (salt == NULL) {
                        if (!getSalt()) {
        try {
                if (salt == NULL) {
                        if (!getSalt()) {

-                               throw new ServerException("getSlots failed", ServerException.TypeSalt);
+                               throw new ServerException("getSlots failed", ServerException_TypeSalt);

                        }
                        initCrypt();
                }
                        }
                        initCrypt();
                }


@@ -361,20 +326,15 @@ Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
                URL *url = buildRequest(false, sequencenumber, 0);
                timer->startTime();
                URLConnection *con = url->openConnection();
                URL *url = buildRequest(false, sequencenumber, 0);
                timer->startTime();
                URLConnection *con = url->openConnection();

-               HttpURLConnection *http = (HttpURLConnection) con;
+               HttpURLConnection *http = (HttpURLConnection *) con;

                http->setRequestMethod("POST");
                http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
                http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
                http->setRequestMethod("POST");
                http->setConnectTimeout(CloudComm_TIMEOUT_MILLIS);
                http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);

-
-
-

                http->connect();
                timer->endTime();
                http->connect();
                timer->endTime();

-

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

-
-               throw new ServerException("getSlots failed", ServerException.TypeConnectTimeout);
+               throw new ServerException("getSlots failed", ServerException_TypeConnectTimeout);

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


@@ -384,23 +344,19 @@ Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
        }
 
        try {
        }
 
        try {

-

                timer->startTime();
                InputStream *is = http->getInputStream();
                DataInputStream *dis = new DataInputStream(is);
                Array<char> *resptype = new Array<char>(7);
                timer->startTime();
                InputStream *is = http->getInputStream();
                DataInputStream *dis = new DataInputStream(is);
                Array<char> *resptype = new Array<char>(7);

-

                dis->readFully(resptype);
                timer->endTime();
                dis->readFully(resptype);
                timer->endTime();

-
-               if (!resptype->equals("getslot".getBytes()))
+               if (!resptype->equals("getslot"->getBytes()))

                        throw new Error("Bad Response: " + new String(resptype));
 
                return processSlots(dis);
        } catch (SocketTimeoutException *e) {
                timer->endTime();
                        throw new Error("Bad Response: " + new String(resptype));
 
                return processSlots(dis);
        } catch (SocketTimeoutException *e) {
                timer->endTime();

-
-               throw new ServerException("getSlots failed", ServerException.TypeInputTimeout);
+               throw new ServerException("getSlots failed", ServerException_TypeInputTimeout);

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


@@ -413,15 +369,13 @@ Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
 Array<Slot *> *CloudComm::processSlots(DataInputStream *dis) {
        int numberofslots = dis->readInt();
        Array<int> *sizesofslots = new Array<int>(numberofslots);
 Array<Slot *> *CloudComm::processSlots(DataInputStream *dis) {
        int numberofslots = dis->readInt();
        Array<int> *sizesofslots = new Array<int>(numberofslots);

-

        Array<Slot *> *slots = new Array<Slot *>(numberofslots);
        Array<Slot *> *slots = new Array<Slot *>(numberofslots);

+

        for (int i = 0; i < numberofslots; i++)
                sizesofslots->set(i, dis->readInt());
        for (int i = 0; i < numberofslots; i++)
                sizesofslots->set(i, dis->readInt());

-

        for (int i = 0; i < numberofslots; i++) {
                Array<char> *rawData = new Array<char>(sizesofslots->get(i));
                dis->readFully(rawData);
        for (int i = 0; i < numberofslots; i++) {
                Array<char> *rawData = new Array<char>(sizesofslots->get(i));
                dis->readFully(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));
        }


@@ -430,17 +384,15 @@ Array<Slot *> *CloudComm::processSlots(DataInputStream *dis) {
 }
 
 Array<char> *sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, String host, int port) {
 }
 
 Array<char> *sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, String host, int port) {

-       if (salt == NULL) {
+       if (salt == NULL)

                return NULL;
                return NULL;

-       }

        try {
                printf("Passing Locally\n");
        try {
                printf("Passing Locally\n");

-

                mac->update(sendData);
                Array<char> *genmac = mac->doFinal();
                Array<char> *totalData = new Array<char>(sendData->length() + genmac->length());
                mac->update(sendData);
                Array<char> *genmac = mac->doFinal();
                Array<char> *totalData = new Array<char>(sendData->length() + genmac->length());

-               System_arraycopy(sendData, 0, totalData, 0, sendData.length());
-               System - arraycopy(genmac, 0, totalData, sendData.length, genmac->length());
+               System_arraycopy(sendData, 0, totalData, 0, sendData->length());
+               System_arraycopy(genmac, 0, totalData, sendData->length(), genmac->length());

 
                // Encrypt the data for sending
                Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());
 
                // Encrypt the data for sending
                Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());


@@ -461,20 +413,17 @@ Array<char> *sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, S
                int lengthOfReturnData = input->readInt();
                Array<char> *returnData = new Array<char>(lengthOfReturnData);
                input->readFully(returnData);
                int lengthOfReturnData = input->readInt();
                Array<char> *returnData = new Array<char>(lengthOfReturnData);
                input->readFully(returnData);

-

                timer->endTime();
                timer->endTime();

-

                returnData = stripIVAndDecryptSlot(returnData);
 
                // We are done with this socket
                socket->close();
                returnData = stripIVAndDecryptSlot(returnData);
 
                // We are done with this socket
                socket->close();

-

                mac->update(returnData, 0, returnData->length - HMAC_SIZE);
                Array<char> *realmac = mac->doFinal();
                Array<char> *recmac = new Array<char>(HMAC_SIZE);
                System_arraycopy(returnData, returnData->length - realmac->length, recmac, 0, realmac->length);
 
                mac->update(returnData, 0, returnData->length - HMAC_SIZE);
                Array<char> *realmac = mac->doFinal();
                Array<char> *recmac = new Array<char>(HMAC_SIZE);
                System_arraycopy(returnData, returnData->length - realmac->length, recmac, 0, realmac->length);
 

-               if (!Arrays->equals(recmac, realmac))
+               if (!recmac->equals(realmac))

                        throw new Error("Local Error: Invalid HMAC!  Potential Attack!");
 
                Array<char> *returnData2 = new Array<char>(lengthOfReturnData - recmac->length());
                        throw new Error("Local Error: Invalid HMAC!  Potential Attack!");
 
                Array<char> *returnData2 = new Array<char>(lengthOfReturnData - recmac->length());


@@ -504,7 +453,6 @@ void CloudComm::localServerWorkerFunction() {
                try {
                        // Accept incoming socket
                        Socket *socket = inputSocket->accept();
                try {
                        // Accept incoming socket
                        Socket *socket = inputSocket->accept();

-

                        DataInputStream *input = new DataInputStream(socket->getInputStream());
                        DataOutputStream *output = new DataOutputStream(socket->getOutputStream());
 
                        DataInputStream *input = new DataInputStream(socket->getInputStream());
                        DataOutputStream *output = new DataOutputStream(socket->getOutputStream());
 


@@ -512,12 +460,10 @@ void CloudComm::localServerWorkerFunction() {
                        int dataSize = input->readInt();
                        Array<char> *readData = new Array<char>(dataSize);
                        input->readFully(readData);
                        int dataSize = input->readInt();
                        Array<char> *readData = new Array<char>(dataSize);
                        input->readFully(readData);

-

                        timer->endTime();
 
                        // Decrypt the data
                        readData = stripIVAndDecryptSlot(readData);
                        timer->endTime();
 
                        // Decrypt the data
                        readData = stripIVAndDecryptSlot(readData);

-

                        mac->update(readData, 0, readData->length - HMAC_SIZE);
                        Array<char> *genmac = mac->doFinal();
                        Array<char> *recmac = new Array<char>(HMAC_SIZE);
                        mac->update(readData, 0, readData->length - HMAC_SIZE);
                        Array<char> *genmac = mac->doFinal();
                        Array<char> *recmac = new Array<char>(HMAC_SIZE);


@@ -531,8 +477,6 @@ void CloudComm::localServerWorkerFunction() {
 
                        // Process the data
                        Array<char> *sendData = table->acceptDataFromLocal(returnData);
 
                        // Process the data
                        Array<char> *sendData = table->acceptDataFromLocal(returnData);

-
-

                        mac->update(sendData);
                        Array<char> *realmac = mac->doFinal();
                        Array<char> *totalData = new Array<char>(sendData->length() + realmac->length());
                        mac->update(sendData);
                        Array<char> *realmac = mac->doFinal();
                        Array<char> *totalData = new Array<char>(sendData->length() + realmac->length());


@@ -543,7 +487,6 @@ void CloudComm::localServerWorkerFunction() {
                        Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());
                        Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, iv);
 
                        Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());
                        Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, iv);
 

-

                        timer->startTime();
                        // Send data to output (length of data, the data)
                        output->writeInt(encryptedData->length());
                        timer->startTime();
                        // Send data to output (length of data, the data)
                        output->writeInt(encryptedData->length());


@@ -576,4 +519,3 @@ void CloudComm::close() {
                }
        }
 }
                }
        }
 }

-

diff --git a/version2/src/C/Commit.cc b/version2/src/C/Commit.cc
index 3672e08297bda61b32a8aaae2d2a85ac19b9f34d..34d51dcffba610182c03835b82dedd79ddaa6a6d 100644 (file)
--- a/version2/src/C/Commit.cc
+++ b/version2/src/C/Commit.cc
@@ -1,11 +1,14 @@
-#include "commit.h"
+#include "Commit.h"
+#include "CommitPart.h"
+#include "ByteBuffer.h"
+#include "KeyValue.h"

 
 Commit::Commit() :
        parts(new Hashtable<int32_t, CommitPart *>()),
        missingParts(NULL),
        fldisComplete(false),
        hasLastPart(false),
 
 Commit::Commit() :
        parts(new Hashtable<int32_t, CommitPart *>()),
        missingParts(NULL),
        fldisComplete(false),
        hasLastPart(false),

-       keyValueUpdateSet(new HashSet<KeyValue *>()),
+       keyValueUpdateSet(new Hashset<KeyValue *>()),

        isDead(false),
        sequenceNumber(-1),
        machineId(-1),
        isDead(false),
        sequenceNumber(-1),
        machineId(-1),


@@ -19,7 +22,7 @@ Commit::Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transaction
        missingParts(NULL),
        fldisComplete(true),
        hasLastPart(false),
        missingParts(NULL),
        fldisComplete(true),
        hasLastPart(false),

-       keyValueUpdateSet(new HashSet<KeyValue *>()),
+       keyValueUpdateSet(new Hashset<KeyValue *>()),

        isDead(false),
        sequenceNumber(_sequenceNumber),
        machineId(_machineId),
        isDead(false),
        sequenceNumber(_sequenceNumber),
        machineId(_machineId),


@@ -27,8 +30,7 @@ Commit::Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transaction
        liveKeys(new Hashset<IoTString *>) {
 }
 
        liveKeys(new Hashset<IoTString *>) {
 }
 

-void Commit::addPartDecode(CommitPart newPart) {
-
+void Commit::addPartDecode(CommitPart *newPart) {

        if (isDead) {
                // If dead then just kill this part and move on
                newPart->setDead();
        if (isDead) {
                // If dead then just kill this part and move on
                newPart->setDead();


@@ -41,7 +43,7 @@ void Commit::addPartDecode(CommitPart newPart) {
                // Set dead the old one since the new one is a rescued version of this part
                previoslySeenPart->setDead();
        } else if (newPart->isLastPart()) {
                // Set dead the old one since the new one is a rescued version of this part
                previoslySeenPart->setDead();
        } else if (newPart->isLastPart()) {

-               missingParts = new HashSet<int32_t>();
+               missingParts = new Hashset<int32_t>();

                hasLastPart = true;
 
                for (int i = 0; i < newPart->getPartNumber(); i++) {
                hasLastPart = true;
 
                for (int i = 0; i < newPart->getPartNumber(); i++) {


@@ -117,7 +119,7 @@ void Commit::setDead() {
 
        // Make all the parts of this transaction dead
        for (int32_t partNumber : parts->keySet()) {
 
        // Make all the parts of this transaction dead
        for (int32_t partNumber : parts->keySet()) {

-               CommitPart part = parts->get(partNumber);
+               CommitPart *part = parts->get(partNumber);

                part->setDead();
        }
 }
                part->setDead();
        }
 }


@@ -149,7 +151,7 @@ void Commit::createCommitParts() {
 
                // Copy to a smaller version
                Array<char> *partData = new Array<char>(copySize);
 
                // Copy to a smaller version
                Array<char> *partData = new Array<char>(copySize);

-               System->arraycopy(charData, currentPosition, partData, 0, copySize);
+               System_arraycopy(charData, currentPosition, partData, 0, copySize);

 
                CommitPart part = new CommitPart(NULL, machineId, sequenceNumber, transactionSequenceNumber, commitPartCount, partData, isLastPart);
                parts->put(part->getPartNumber(), part);
 
                CommitPart part = new CommitPart(NULL, machineId, sequenceNumber, transactionSequenceNumber, commitPartCount, partData, isLastPart);
                parts->put(part->getPartNumber(), part);


@@ -176,7 +178,7 @@ void Commit::decodeCommitData() {
        // Stitch all the data sections together
        for (int i = 0; i < parts->keySet()->size(); i++) {
                CommitPart *tp = parts->get(i);
        // Stitch all the data sections together
        for (int i = 0; i < parts->keySet()->size(); i++) {
                CommitPart *tp = parts->get(i);

-               System->arraycopy(tp->getData(), 0, combinedData, currentPosition, tp->getDataSize());
+               System_arraycopy(tp->getData(), 0, combinedData, currentPosition, tp->getDataSize());

                currentPosition += tp->getDataSize();
        }
 
                currentPosition += tp->getDataSize();
        }
 


@@ -188,7 +190,7 @@ void Commit::decodeCommitData() {
 
        // Decode all the updates key values
        for (int i = 0; i < numberOfKVUpdates; i++) {
 
        // Decode all the updates key values
        for (int i = 0; i < numberOfKVUpdates; i++) {

-               KeyValue *kv = (KeyValue *)KeyValue->decode(bbDecode);
+               KeyValue *kv = (KeyValue *)KeyValue_decode(bbDecode);

                keyValueUpdateSet->add(kv);
                liveKeys->add(kv->getKey());
        }
                keyValueUpdateSet->add(kv);
                liveKeys->add(kv->getKey());
        }


@@ -223,10 +225,8 @@ void Commit::setKVsMap(Hashtable<IoTString *, KeyValue *> *newKVs) {
 
        keyValueUpdateSet->addAll(newKVs->values());
        liveKeys->addAll(newKVs->keySet());
 
        keyValueUpdateSet->addAll(newKVs->values());
        liveKeys->addAll(newKVs->keySet());

-

 }
 
 }
 

-

 Commit *Commit_merge(Commit *newer, Commit *older, int64_t newSequenceNumber) {
 
        if (older == NULL) {
 Commit *Commit_merge(Commit *newer, Commit *older, int64_t newSequenceNumber) {
 
        if (older == NULL) {

diff --git a/version2/src/C/Commit.h b/version2/src/C/Commit.h
index 752293cf2c83fb52b3c467864510b2518d4717b6..4de3d22e478db8614da689f70ca89aa449841fc2 100644 (file)
--- a/version2/src/C/Commit.h
+++ b/version2/src/C/Commit.h
@@ -4,8 +4,8 @@
 
 class Commit {
 private:
 
 class Commit {
 private:

-       Hashtable<int32_t, CommitPart *, int32_t> *parts;
-       Hashset<int32_t, int32_t> *missingParts;
+       Hashtable<int32_t, CommitPart *> *parts;
+       Hashset<int32_t> *missingParts;

        bool fldisComplete;
        bool hasLastPart;
        Hashset<KeyValue *> *keyValueUpdateSet;
        bool fldisComplete;
        bool hasLastPart;
        Hashset<KeyValue *> *keyValueUpdateSet;


@@ -20,11 +20,10 @@ private:
 public:
        Commit();
        Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transactionSequenceNumber);
 public:
        Commit();
        Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transactionSequenceNumber);

-

        void addPartDecode(CommitPart *newPart);
        int64_t getSequenceNumber();
        int64_t getTransactionSequenceNumber();
        void addPartDecode(CommitPart *newPart);
        int64_t getSequenceNumber();
        int64_t getTransactionSequenceNumber();

-       Hashtable<int32_t, CommitPart *, int32_t> *getParts();
+       Hashtable<int32_t, CommitPart *> *getParts();

        void addKV(KeyValue *kv);
        void invalidateKey(IoTString *key);
        Hashset<KeyValue *> *getKeyValueUpdateSet();
        void addKV(KeyValue *kv);
        void invalidateKey(IoTString *key);
        Hashset<KeyValue *> *getKeyValueUpdateSet();


@@ -36,6 +35,7 @@ public:
        CommitPart *getPart(int32_t index);
        void createCommitParts();
        void decodeCommitData();
        CommitPart *getPart(int32_t index);
        void createCommitParts();
        void decodeCommitData();

+       friend Commit *Commit_merge(Commit *newer, Commit *older, int64_t newSequenceNumber);

 };
 
 Commit *Commit_merge(Commit *newer, Commit *older, int64_t newSequenceNumber);
 };
 
 Commit *Commit_merge(Commit *newer, Commit *older, int64_t newSequenceNumber);

diff --git a/version2/src/C/hashset.h b/version2/src/C/hashset.h
index a518de651ff9343c1b8bbc3e7c08fa05af1a638e..d37ac3bafd4e56784c5c4f395696e86d533df355 100644 (file)
--- a/version2/src/C/hashset.h
+++ b/version2/src/C/hashset.h
@@ -106,7 +106,7 @@ public:
                return copy;
        }
 
                return copy;
        }
 

-       void reset() {
+       void clear() {

                Linknode<_Key> *tmp = list;
                while (tmp != NULL) {
                        Linknode<_Key> *tmpnext = tmp->next;
                Linknode<_Key> *tmp = list;
                while (tmp != NULL) {
                        Linknode<_Key> *tmpnext = tmp->next;


@@ -114,7 +114,7 @@ public:
                        tmp = tmpnext;
                }
                list = tail = NULL;
                        tmp = tmpnext;
                }
                list = tail = NULL;

-               table->reset();
+               table->clear();

        }
 
        void resetAndDelete() {
        }
 
        void resetAndDelete() {


@@ -217,7 +217,7 @@ public:
        }
 
        unsigned int size() const {
        }
 
        unsigned int size() const {

-               return table->getSize();
+               return table->size();

        }
 
        bool isEmpty() const {
        }
 
        bool isEmpty() const {

diff --git a/version2/src/C/hashtable.h b/version2/src/C/hashtable.h
index c642804f99433c1ab221ae6c220c2345459d2346..b610154dc87d111cc123a1cf309f538e25657f73 100644 (file)
--- a/version2/src/C/hashtable.h
+++ b/version2/src/C/hashtable.h
@@ -76,7 +76,7 @@ public:
                capacitymask = initialcapacity - 1;
 
                threshold = (unsigned int)(initialcapacity * loadfactor);
                capacitymask = initialcapacity - 1;
 
                threshold = (unsigned int)(initialcapacity * loadfactor);

-               size = 0;                                                       // Initial number of elements in the hash
+               Size = 0;                                                       // Initial number of elements in the hash

        }
 
        /** @brief Hash table destructor */
        }
 
        /** @brief Hash table destructor */


@@ -107,13 +107,13 @@ public:
        }
 
        /** @brief Reset the table to its initial state. */
        }
 
        /** @brief Reset the table to its initial state. */

-       void reset() {
+       void clear() {

                memset(table, 0, capacity * sizeof(struct Hashlistnode<_Key, _Val>));
                if (zero) {
                        ourfree(zero);
                        zero = NULL;
                }
                memset(table, 0, capacity * sizeof(struct Hashlistnode<_Key, _Val>));
                if (zero) {
                        ourfree(zero);
                        zero = NULL;
                }

-               size = 0;
+               Size = 0;

        }
 
        /** Doesn't work with zero value */
        }
 
        /** Doesn't work with zero value */


@@ -142,7 +142,7 @@ public:
                        ourfree(zero);
                        zero = NULL;
                }
                        ourfree(zero);
                        zero = NULL;
                }

-               size = 0;
+               Size = 0;

        }
 
        void resetAndDeleteVals() {
        }
 
        void resetAndDeleteVals() {


@@ -162,7 +162,7 @@ public:
                        ourfree(zero);
                        zero = NULL;
                }
                        ourfree(zero);
                        zero = NULL;
                }

-               size = 0;
+               Size = 0;

        }
 
        void resetAndFreeVals() {
        }
 
        void resetAndFreeVals() {


@@ -182,7 +182,7 @@ public:
                        ourfree(zero);
                        zero = NULL;
                }
                        ourfree(zero);
                        zero = NULL;
                }

-               size = 0;
+               Size = 0;

        }
 
        /**
        }
 
        /**


@@ -196,7 +196,7 @@ public:
                        _Val oldval;
                        if (!zero) {
                                zero = (struct Hashlistnode<_Key, _Val> *)ourmalloc(sizeof(struct Hashlistnode<_Key, _Val>));
                        _Val oldval;
                        if (!zero) {
                                zero = (struct Hashlistnode<_Key, _Val> *)ourmalloc(sizeof(struct Hashlistnode<_Key, _Val>));

-                               size++;
+                               Size++;

                                oldval = (_Val) 0;
                        } else
                                oldval = zero->val;
                                oldval = (_Val) 0;
                        } else
                                oldval = zero->val;


@@ -205,7 +205,7 @@ public:
                        return oldval;
                }
 
                        return oldval;
                }
 

-               if (size > threshold)
+               if (Size > threshold)

                        resize(capacity << 1);
 
                struct Hashlistnode<_Key, _Val> *search;
                        resize(capacity << 1);
 
                struct Hashlistnode<_Key, _Val> *search;


@@ -231,7 +231,7 @@ public:
                search->key = key;
                search->val = val;
                search->hashcode = hashcode;
                search->key = key;
                search->val = val;
                search->hashcode = hashcode;

-               size++;
+               Size++;

                return (_Val) 0;
        }
 
                return (_Val) 0;
        }
 


@@ -287,7 +287,7 @@ public:
                                _Val v = zero->val;
                                ourfree(zero);
                                zero = NULL;
                                _Val v = zero->val;
                                ourfree(zero);
                                zero = NULL;

-                               size--;
+                               Size--;

                                return v;
                        }
                }
                                return v;
                        }
                }


@@ -308,7 +308,7 @@ public:
                                        //empty out this bin
                                        search->val = (_Val) 1;
                                        search->key = 0;
                                        //empty out this bin
                                        search->val = (_Val) 1;
                                        search->key = 0;

-                                       size--;
+                                       Size--;

                                        return v;
                                }
                        index++;
                                        return v;
                                }
                        index++;


@@ -316,8 +316,8 @@ public:
                return (_Val)0;
        }
 
                return (_Val)0;
        }
 

-       unsigned int getSize() const {
-               return size;
+       unsigned int size() const {
+               return Size;

        }
 
 
        }
 
 


@@ -400,7 +400,7 @@ public:
        struct Hashlistnode<_Key, _Val> *table;
        struct Hashlistnode<_Key, _Val> *zero;
        unsigned int capacity;
        struct Hashlistnode<_Key, _Val> *table;
        struct Hashlistnode<_Key, _Val> *zero;
        unsigned int capacity;

-       unsigned int size;
+       unsigned int Size;

 private:
        unsigned int capacitymask;
        unsigned int threshold;
 private:
        unsigned int capacitymask;
        unsigned int threshold;