From: bdemsky Date: Sat, 20 Jan 2018 05:48:59 +0000 (-0800) Subject: edits X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=commitdiff_plain;h=a5f6f53f487875a39c9b27daafbde2c6743546db;hp=15175037b4697d670a50b5c1362138da2b382137 edits --- diff --git a/version2/src/C/CloudComm.cc b/version2/src/C/CloudComm.cc index 97a96c2..452317f 100644 --- a/version2/src/C/CloudComm.cc +++ b/version2/src/C/CloudComm.cc @@ -124,7 +124,7 @@ void CloudComm::setSalt() { } - URL* url = new URL(baseurl + "?req=setsalt"); + URL *url = new URL(baseurl + "?req=setsalt"); timer->startTime(); URLConnection con = url->openConnection(); @@ -138,7 +138,7 @@ void CloudComm::setSalt() { http->connect(); - OutputStream* os = http->getOutputStream(); + OutputStream *os = http->getOutputStream(); os->write(saltTmp); os->flush(); @@ -200,9 +200,9 @@ bool CloudComm::getSalt() { InputStream is = http->getInputStream(); if (is->available() > 0) { - DataInputStream* dis = new DataInputStream(is); + DataInputStream *dis = new DataInputStream(is); int salt_length = dis->readInt(); - Array * tmp = new Array(salt_length); + Array *tmp = new Array(salt_length); dis->readFully(tmp); salt = tmp; timer->endTime(); @@ -257,9 +257,9 @@ Array *CloudComm::stripIVAndDecryptSlot(Array *rawData) { System_arraycopy(rawData, 0, ivBytes, 0, CloudComm_IV_SIZE); System_arraycopy(rawData, CloudComm_IV_SIZE, encryptedBytes, 0, encryptedBytes->length); - IvParameterSpec* ivSpec = new IvParameterSpec(ivBytes); + IvParameterSpec *ivSpec = new IvParameterSpec(ivBytes); - Cipher* cipher = Cipher_getInstance("AES/CTR/NoPadding"); + Cipher *cipher = Cipher_getInstance("AES/CTR/NoPadding"); cipher->init(Cipher_DECRYPT_MODE, key, ivSpec); return cipher->doFinal(encryptedBytes); @@ -291,8 +291,8 @@ Array *CloudComm::putSlot(Slot *slot, int max) { URL *url = buildRequest(true, sequencenumber, max); timer->startTime(); - URLConnection * con = url->openConnection(); - HttpURLConnection * http = (HttpURLConnection *) con; + URLConnection *con = url->openConnection(); + HttpURLConnection *http = (HttpURLConnection *) con; http->setRequestMethod("POST"); http->setFixedLengthStreamingMode(chars->length); @@ -301,7 +301,7 @@ Array *CloudComm::putSlot(Slot *slot, int max) { http->setReadTimeout(CloudComm_TIMEOUT_MILLIS); http->connect(); - OutputStream * os = http->getOutputStream(); + OutputStream *os = http->getOutputStream(); os->write(chars); os->flush(); @@ -325,8 +325,8 @@ Array *CloudComm::putSlot(Slot *slot, int max) { try { timer->startTime(); InputStream is = http->getInputStream(); - DataInputStream * dis = new DataInputStream(is); - Array *resptype = new char[7]; + DataInputStream *dis = new DataInputStream(is); + Array *resptype = new Array(7); dis->readFully(resptype); timer->endTime(); @@ -412,26 +412,17 @@ Array *CloudComm::getSlots(int64_t sequencenumber) { */ Array *CloudComm::processSlots(DataInputStream *dis) { int numberofslots = dis->readInt(); - Array * sizesofslots = new Array(numberofslots); + Array *sizesofslots = new Array(numberofslots); - Array * slots = new Array(numberofslots); + Array *slots = new Array(numberofslots); for (int i = 0; i < numberofslots; i++) - sizesofslots->set(i], dis->readInt()); + sizesofslots->set(i, dis->readInt()); for (int i = 0; i < numberofslots; i++) { - Array *rawData = new Array(sizesofslots->get(i)); dis->readFully(rawData); - - // Array * data = new char[rawData.length - IV_SIZE]; - // System.arraycopy(rawData, IV_SIZE, data, 0, data.length); - - Array *data = stripIVAndDecryptSlot(rawData); - - // data = decryptCipher.doFinal(data); - slots->set(i, Slot_decode(table, data, mac)); } dis->close(); @@ -443,23 +434,23 @@ Array *sendLocalData(Array *sendData, int64_t localSequenceNumber, S return NULL; } try { - printf("Passing Locally"\m); + printf("Passing Locally\n"); mac->update(sendData); Array *genmac = mac->doFinal(); Array *totalData = new Array(sendData->length() + genmac->length()); System_arraycopy(sendData, 0, totalData, 0, sendData.length()); - System-arraycopy(genmac, 0, totalData, sendData.length, genmac->length()); + System - arraycopy(genmac, 0, totalData, sendData.length, genmac->length()); // Encrypt the data for sending Array *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber()); Array *encryptedData = encryptSlotAndPrependIV(totalData, iv); // Open a TCP socket connection to a local device - Socket* socket = new Socket(host, port); + Socket *socket = new Socket(host, port); socket->setReuseAddress(true); - DataOutputStream* output = new DataOutputStream(socket->getOutputStream()); - DataInputStream* input = new DataInputStream(socket->getInputStream()); + DataOutputStream *output = new DataOutputStream(socket->getOutputStream()); + DataInputStream *input = new DataInputStream(socket->getInputStream()); timer->startTime(); // Send data to output (length of data, the data) diff --git a/version2/src/C/CloudComm.h b/version2/src/C/CloudComm.h index fb16165..cdec495 100644 --- a/version2/src/C/CloudComm.h +++ b/version2/src/C/CloudComm.h @@ -44,7 +44,7 @@ private: /* * Builds the URL for the given request. */ - URL* buildRequest(bool isput, int64_t sequencenumber, int64_t maxentries); + URL *buildRequest(bool isput, int64_t sequencenumber, int64_t maxentries); void setSalt(); bool getSalt(); Array *createIV(int64_t machineId, int64_t localSequenceNumber); diff --git a/version2/src/C/SecureRandom.h b/version2/src/C/SecureRandom.h index 643efb4..34ccd72 100644 --- a/version2/src/C/SecureRandom.h +++ b/version2/src/C/SecureRandom.h @@ -1,7 +1,7 @@ #ifndef SECURERANDOM_H #define SECURERANDOM_H class SecureRandom { - public: +public: SecureRandom(); }; #endif diff --git a/version2/src/C/TimingSingleton.h b/version2/src/C/TimingSingleton.h index 8083c04..c9189c2 100644 --- a/version2/src/C/TimingSingleton.h +++ b/version2/src/C/TimingSingleton.h @@ -7,7 +7,7 @@ private: int64_t fldstartTime; int64_t fldtotalTime; - public: +public: TimingSingleton() : fldstartTime(0), fldtotalTime(0) { }