projects
/
iotcloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1517503
)
edits
author
bdemsky
<bdemsky@uci.edu>
Sat, 20 Jan 2018 05:48:59 +0000
(21:48 -0800)
committer
bdemsky
<bdemsky@uci.edu>
Sat, 20 Jan 2018 05:48:59 +0000
(21:48 -0800)
version2/src/C/CloudComm.cc
patch
|
blob
|
history
version2/src/C/CloudComm.h
patch
|
blob
|
history
version2/src/C/SecureRandom.h
patch
|
blob
|
history
version2/src/C/TimingSingleton.h
patch
|
blob
|
history
diff --git
a/version2/src/C/CloudComm.cc
b/version2/src/C/CloudComm.cc
index 97a96c25520f51376ef67edbfea1e977ba231737..452317f42335854743b9e95cb3d1f81bc62e8858 100644
(file)
--- 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();
timer->startTime();
URLConnection con = url->openConnection();
@@
-138,7
+138,7
@@
void CloudComm::setSalt() {
http->connect();
http->connect();
- OutputStream
*
os = http->getOutputStream();
+ OutputStream
*
os = http->getOutputStream();
os->write(saltTmp);
os->flush();
os->write(saltTmp);
os->flush();
@@
-200,9
+200,9
@@
bool CloudComm::getSalt() {
InputStream is = http->getInputStream();
if (is->available() > 0) {
InputStream is = http->getInputStream();
if (is->available() > 0) {
- DataInputStream
*
dis = new DataInputStream(is);
+ DataInputStream
*
dis = new DataInputStream(is);
int salt_length = dis->readInt();
int salt_length = dis->readInt();
- Array<char> *
tmp = new Array<char>(salt_length);
+ Array<char> *tmp = new Array<char>(salt_length);
dis->readFully(tmp);
salt = tmp;
timer->endTime();
dis->readFully(tmp);
salt = tmp;
timer->endTime();
@@
-257,9
+257,9
@@
Array<char> *CloudComm::stripIVAndDecryptSlot(Array<char> *rawData) {
System_arraycopy(rawData, 0, ivBytes, 0, CloudComm_IV_SIZE);
System_arraycopy(rawData, CloudComm_IV_SIZE, encryptedBytes, 0, encryptedBytes->length);
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);
cipher->init(Cipher_DECRYPT_MODE, key, ivSpec);
return cipher->doFinal(encryptedBytes);
@@
-291,8
+291,8
@@
Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
URL *url = buildRequest(true, sequencenumber, max);
timer->startTime();
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);
http->setRequestMethod("POST");
http->setFixedLengthStreamingMode(chars->length);
@@
-301,7
+301,7
@@
Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
http->connect();
http->setReadTimeout(CloudComm_TIMEOUT_MILLIS);
http->connect();
- OutputStream *
os = http->getOutputStream();
+ OutputStream *os = http->getOutputStream();
os->write(chars);
os->flush();
os->write(chars);
os->flush();
@@
-325,8
+325,8
@@
Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
try {
timer->startTime();
InputStream is = http->getInputStream();
try {
timer->startTime();
InputStream is = http->getInputStream();
- DataInputStream *
dis = new DataInputStream(is);
- Array<char> *resptype = new
char[7]
;
+ DataInputStream *dis = new DataInputStream(is);
+ Array<char> *resptype = new
Array<char>(7)
;
dis->readFully(resptype);
timer->endTime();
dis->readFully(resptype);
timer->endTime();
@@
-412,26
+412,17
@@
Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
*/
Array<Slot *> *CloudComm::processSlots(DataInputStream *dis) {
int numberofslots = dis->readInt();
*/
Array<Slot *> *CloudComm::processSlots(DataInputStream *dis) {
int numberofslots = dis->readInt();
- Array<int> *
sizesofslots = new Array<int>(numberofslots);
+ 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++)
for (int i = 0; i < numberofslots; i++)
- sizesofslots->set(i
]
, dis->readInt());
+ sizesofslots->set(i, dis->readInt());
for (int i = 0; i < numberofslots; i++) {
for (int i = 0; i < numberofslots; i++) {
-
Array<char> *rawData = new Array<char>(sizesofslots->get(i));
dis->readFully(rawData);
Array<char> *rawData = new Array<char>(sizesofslots->get(i));
dis->readFully(rawData);
-
- // Array<char> * data = new char[rawData.length - IV_SIZE];
- // System.arraycopy(rawData, IV_SIZE, data, 0, data.length);
-
-
Array<char> *data = stripIVAndDecryptSlot(rawData);
Array<char> *data = stripIVAndDecryptSlot(rawData);
-
- // data = decryptCipher.doFinal(data);
-
slots->set(i, Slot_decode(table, data, mac));
}
dis->close();
slots->set(i, Slot_decode(table, data, mac));
}
dis->close();
@@
-443,23
+434,23
@@
Array<char> *sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, S
return NULL;
}
try {
return NULL;
}
try {
- printf("Passing Locally
"\m
);
+ printf("Passing Locally
\n"
);
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());
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(genmac, 0, totalData, sendData.length, genmac->length());
// Encrypt the data for sending
Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());
Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, iv);
// Open a TCP socket connection to a local device
// Encrypt the data for sending
Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());
Array<char> *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);
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)
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 fb1616500ead4988734329d4e074a6f14fb2d525..cdec4950174c55e4fd22566bda37a22ae3337d1e 100644
(file)
--- a/
version2/src/C/CloudComm.h
+++ b/
version2/src/C/CloudComm.h
@@
-44,7
+44,7
@@
private:
/*
* Builds the URL for the given request.
*/
/*
* 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<char> *createIV(int64_t machineId, int64_t localSequenceNumber);
void setSalt();
bool getSalt();
Array<char> *createIV(int64_t machineId, int64_t localSequenceNumber);
diff --git
a/version2/src/C/SecureRandom.h
b/version2/src/C/SecureRandom.h
index 643efb471e53b33d5974834b5327117e3abefa25..34ccd729e2133813d29535e74b67945b78b65aa5 100644
(file)
--- a/
version2/src/C/SecureRandom.h
+++ b/
version2/src/C/SecureRandom.h
@@
-1,7
+1,7
@@
#ifndef SECURERANDOM_H
#define SECURERANDOM_H
class SecureRandom {
#ifndef SECURERANDOM_H
#define SECURERANDOM_H
class SecureRandom {
-
public:
+public:
SecureRandom();
};
#endif
SecureRandom();
};
#endif
diff --git
a/version2/src/C/TimingSingleton.h
b/version2/src/C/TimingSingleton.h
index 8083c04a27075efa8111fa2d823487ba8641db29..c9189c2f8a887a6417bc709517aa921523856cd4 100644
(file)
--- a/
version2/src/C/TimingSingleton.h
+++ b/
version2/src/C/TimingSingleton.h
@@
-7,7
+7,7
@@
private:
int64_t fldstartTime;
int64_t fldtotalTime;
int64_t fldstartTime;
int64_t fldtotalTime;
-
public:
+public:
TimingSingleton() : fldstartTime(0),
fldtotalTime(0) {
}
TimingSingleton() : fldstartTime(0),
fldtotalTime(0) {
}