Add HMAC
[iotcloud.git] / version2 / src / C / CloudComm.cc
index c5da91a1b5d43166373797fc5c1af215aa300450..d1ba7cacb099dd2cb5eac26969c692302b383366 100644 (file)
@@ -1,4 +1,16 @@
 #include "CloudComm.h"
+#include "TimingSingleton.h"
+#include "SecureRandom.h"
+#include "IoTString.h"
+#include "Error.h"
+#include "URL.h"
+#include "Mac.h"
+#include "Table.h"
+#include "Slot.h"
+#include "Crypto.h"
+#include "ByteBuffer.h"
+#include <sys/socket.h>
+#include <unistd.h>
 
 /**
  * Empty Constructor needed for child class.
@@ -13,15 +25,23 @@ CloudComm::CloudComm() :
        table(NULL),
        listeningPort(-1),
        localServerThread(NULL),
-       doEnd(false)
-       timer(TimingSingleton.getInstance())
+       doEnd(false),
+       timer(TimingSingleton_getInstance()),
+       getslot(new Array<char>("getslot", 7)),
+       putslot(new Array<char>("putslot", 7))
 {
 }
 
+void *threadWrapper(void *cloud) {
+       CloudComm *c = (CloudComm *) cloud;
+       c->localServerWorkerFunction();
+       return NULL;
+}
+
 /**
  * Constructor for actual use. Takes in the url and password.
  */
-CloudComm::CloudComm(Table _table,  String _baseurl, String _password, int _listeningPort) :
+CloudComm::CloudComm(Table *_table,  IoTString *_baseurl, IoTString *_password, int _listeningPort) :
        baseurl(_baseurl),
        key(NULL),
        mac(NULL),
@@ -31,31 +51,24 @@ CloudComm::CloudComm(Table _table,  String _baseurl, String _password, int _list
        table(_table),
        listeningPort(_listeningPort),
        localServerThread(NULL),
-       doEnd(false)
-       timer(TimingSingleton.getInstance()) {
-       if (this.listeningPort > 0) {
-               localServerThread = new Thread(new Runnable() {
-                       void run() {
-                               localServerWorkerFunction();
-                       }
-               });
-               localServerThread.start();
+       doEnd(false),
+       timer(TimingSingleton_getInstance()) {
+       if (listeningPort > 0) {
+               pthread_create(&localServerThread, NULL, threadWrapper, this);
        }
 }
 
 /**
  * Generates Key from password.
  */
-SecretKeySpec *CloudComm::initKey() {
+AESKey *CloudComm::initKey() {
        try {
-               PBEKeySpec keyspec = new PBEKeySpec(password.toCharArray(),
-                                                                                                                                                               salt,
-                                                                                                                                                               65536,
-                                                                                                                                                               128);
-               SecretKey tmpkey = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256").generateSecret(keyspec);
-               return new SecretKeySpec(tmpkey.getEncoded(), "AES");
-       } catch (Exception e) {
-               e.printStackTrace();
+               AESKey *key = new AESKey(password->internalBytes(),
+                                                                                                                salt,
+                                                                                                                65536,
+                                                                                                                128);
+               return key;
+       } catch (Exception *e) {
                throw new Error("Failed generating key.");
        }
 }
@@ -78,18 +91,15 @@ void CloudComm::initSecurity() {
  * Inits the HMAC generator.
  */
 void CloudComm::initCrypt() {
-
        if (password == NULL) {
                return;
        }
-
        try {
                key = initKey();
                password = NULL;// drop password
-               mac = Mac.getInstance("HmacSHA256");
-               mac.init(key);
-       } catch (Exception e) {
-               e.printStackTrace();
+               mac = new Mac();
+               mac->init(key);
+       } catch (Exception *e) {
                throw new Error("Failed To Initialize Ciphers");
        }
 }
@@ -97,335 +107,272 @@ void CloudComm::initCrypt() {
 /*
  * Builds the URL for the given request.
  */
-URL *CloudComm::buildRequest(bool isput, int64_t sequencenumber, int64_t maxentries) {
-       IoTString *reqstring = isput ? "req=putslot" : "req=getslot";
-       IoTString *urlstr = baseurl + "?" + reqstring + "&seq=" + sequencenumber;
+IoTString *CloudComm::buildRequest(bool isput, int64_t sequencenumber, int64_t maxentries) {
+       const char *reqstring = isput ? "req=putslot" : "req=getslot";
+       char *buffer = (char *) malloc(baseurl->length() + 200);
+       memcpy(buffer, baseurl->internalBytes(), baseurl->length());
+       int offset = baseurl->length();
+       offset += sprintf(&buffer[offset], "?%s&seq=%" PRId64, reqstring, sequencenumber);
        if (maxentries != 0)
-               urlstr += "&max=" + maxentries;
-       return new URL(urlstr);
+               sprintf(&buffer[offset], "&max=%" PRId64, maxentries);
+       IoTString *urlstr = new IoTString(buffer);
+       return urlstr;
 }
 
-void CloudComm::setSalt() {
+int openURL(IoTString *url, bool isPost) {
+       return 0;
+}
 
-       if (salt != NULL) {
-               // Salt already sent to server so dont set it again
-               return;
-       }
+int createSocket(IoTString *host, int port) {
+       return 0;
+}
 
-       try {
-               char[] saltTmp = new char[SALT_SIZE];
-               random.nextBytes(saltTmp);
+int createSocket(int port) {
+       return 0;
+}
 
-               for (int i = 0; i < SALT_SIZE; i++) {
-                       System.out.println((int)saltTmp[i] & 255);
-               }
+int acceptSocket(int socket) {
+       return 0;
+}
 
+void writeSocketData(int fd, Array<char> *data) {}
 
-               URL url = new URL(baseurl + "?req=setsalt");
+void writeSocketInt(int fd, int value) {}
 
-               timer.startTime();
-               URLConnection con = url.openConnection();
-               HttpURLConnection http = (HttpURLConnection) con;
+int readSocketInt(int fd) {return 0;}
 
-               http.setRequestMethod("POST");
-               http.setFixedLengthStreamingMode(saltTmp.length);
-               http.setDoOutput(true);
-               http.setConnectTimeout(TIMEOUT_MILLIS);
+void readSocketData(int fd, Array<char> *data) {}
 
+void writeURLData(int fd, Array<char> *data) {
+}
 
-               http.connect();
+void readURLData(int fd, Array<char> *output) {
+}
 
-               OutputStream os = http.getOutputStream();
-               os.write(saltTmp);
-               os.flush();
+int readURLInt(int fd) {
+       return 0;
+}
+
+int getResponseCode(int fd) {
+       return 0;
+}
 
-               int responsecode = http.getResponseCode();
-               if (responsecode != HttpURLConnection.HTTP_OK) {
-                       // TODO: Remove this print
-                       System.out.println(responsecode);
+void CloudComm::setSalt() {
+       if (salt != NULL) {
+               // Salt already sent to server so don't set it again
+               return;
+       }
+
+       int fd = -1;
+       try {
+               Array<char> *saltTmp = new Array<char>(CloudComm_SALT_SIZE);
+               random->nextBytes(saltTmp);
+
+               char *buffer = (char *) malloc(baseurl->length() + 100);
+               memcpy(buffer, baseurl->internalBytes(), baseurl->length());
+               int offset = baseurl->length();
+               offset += sprintf(&buffer[offset], "?req=setsalt");
+               IoTString *urlstr = new IoTString(buffer);
+               free(buffer);
+
+               timer->startTime();
+               fd = openURL(urlstr, true);
+               writeURLData(fd, saltTmp);
+
+               int responsecode = getResponseCode(fd);
+               if (responsecode != HttpURLConnection_HTTP_OK) {
                        throw new Error("Invalid response");
                }
 
-               timer.endTime();
-
+               timer->endTime();
                salt = saltTmp;
-       } catch (Exception e) {
-               // e.printStackTrace();
-               timer.endTime();
-               throw new ServerException("Failed setting salt", ServerException.TypeConnectTimeout);
+       } catch (Exception *e) {
+               timer->endTime();
+               throw new ServerException("Failed setting salt", ServerException_TypeConnectTimeout);
        }
 }
 
 bool CloudComm::getSalt() {
-       URL *url = NULL;
-       URLConnection *con = NULL;
-       HttpURLConnection *http = NULL;
+       int fd = -1;
+       IoTString *urlstr = NULL;
 
        try {
-               url = new URL(baseurl + "?req=getsalt");
-       } catch (Exception e) {
-               // e.printStackTrace();
+               char *buffer = (char *) malloc(baseurl->length() + 100);
+               memcpy(buffer, baseurl->internalBytes(), baseurl->length());
+               int offset = baseurl->length();
+               offset += sprintf(&buffer[offset], "?req=getsalt");
+               urlstr = new IoTString(buffer);
+               free(buffer);
+       } catch (Exception *e) {
                throw new Error("getSlot failed");
        }
        try {
-
-               timer.startTime();
-               con = url.openConnection();
-               http = (HttpURLConnection) con;
-               http.setRequestMethod("POST");
-               http.setConnectTimeout(TIMEOUT_MILLIS);
-               http.setReadTimeout(TIMEOUT_MILLIS);
-
-
-               http.connect();
-               timer.endTime();
-       } catch (SocketTimeoutException e) {
-               timer.endTime();
-               throw new ServerException("getSalt failed", ServerException.TypeConnectTimeout);
-       } catch (Exception e) {
-               // e.printStackTrace();
+               timer->startTime();
+               fd = openURL(urlstr, true);
+               timer->endTime();
+       } catch (SocketTimeoutException *e) {
+               timer->endTime();
+               throw new ServerException("getSalt failed", ServerException_TypeConnectTimeout);
+       } catch (Exception *e) {
                throw new Error("getSlot failed");
        }
 
        try {
-
-               timer.startTime();
-
-               int responsecode = http.getResponseCode();
-               if (responsecode != HttpURLConnection.HTTP_OK) {
-                       // TODO: Remove this print
-                       // System.out.println(responsecode);
+               timer->startTime();
+               int responsecode = getResponseCode(fd);
+               if (responsecode != HttpURLConnection_HTTP_OK) {
                        throw new Error("Invalid response");
                }
-
-               InputStream is = http.getInputStream();
-               if (is.available() > 0) {
-                       DataInputStream dis = new DataInputStream(is);
-                       int salt_length = dis.readInt();
-                       char [] tmp = new char[salt_length];
-                       dis.readFully(tmp);
-                       salt = tmp;
-                       timer.endTime();
-
-                       return true;
-               } else {
-                       timer.endTime();
-
-                       return false;
-               }
-       } catch (SocketTimeoutException e) {
-               timer.endTime();
-
-               throw new ServerException("getSalt failed", ServerException.TypeInputTimeout);
-       } catch (Exception e) {
-               // e.printStackTrace();
+               int salt_length = readURLInt(fd);
+               Array<char> *tmp = new Array<char>(salt_length);
+               readURLData(fd, tmp);
+               salt = tmp;
+               timer->endTime();
+               return true;
+       } catch (SocketTimeoutException *e) {
+               timer->endTime();
+               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) {
-       ByteBuffer buffer = ByteBuffer.allocate(IV_SIZE);
-       buffer.putLong(machineId);
+       ByteBuffer *buffer = ByteBuffer_allocate(CloudComm_IV_SIZE);
+       buffer->putLong(machineId);
        int64_t localSequenceNumberShifted = localSequenceNumber << 16;
-       buffer.putLong(localSequenceNumberShifted);
-       return buffer.array();
+       buffer->putLong(localSequenceNumberShifted);
+       return buffer->array();
 }
 
-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);
+Array<char> *AESEncrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
+       return NULL;
+}
 
-               char[] encryptedBytes = cipher.doFinal(rawData);
+Array<char> *AESDecrypt(Array<char> *ivBytes, AESKey *key, Array<char> *data) {
+       return NULL;
+}
 
-               char[] chars = new char[encryptedBytes.length + IV_SIZE];
-               System.arraycopy(ivBytes, 0, chars, 0, ivBytes.length);
-               System.arraycopy(encryptedBytes, 0, chars, IV_SIZE, encryptedBytes.length);
+Array<char> *CloudComm::encryptSlotAndPrependIV(Array<char> *rawData, Array<char> *ivBytes) {
+       try {
+               Array<char> *encryptedBytes = AESEncrypt(ivBytes, key, 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());
 
                return chars;
-
-       } catch (Exception e) {
-               e.printStackTrace();
+       } catch (Exception *e) {
                throw new Error("Failed To Encrypt");
        }
 }
 
-
 Array<char> *CloudComm::stripIVAndDecryptSlot(Array<char> *rawData) {
        try {
-               Array<char> *ivBytes = new char[IV_SIZE];
-               Array<char> *encryptedBytes = new char[rawData.length - IV_SIZE];
-               System.arraycopy(rawData, 0, ivBytes, 0, IV_SIZE);
-               System.arraycopy(rawData, 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);
-
-       } catch (Exception e) {
-               e.printStackTrace();
+               Array<char> *ivBytes = new Array<char>(CloudComm_IV_SIZE);
+               Array<char> *encryptedBytes = new Array<char>(rawData->length() - CloudComm_IV_SIZE);
+               System_arraycopy(rawData, 0, ivBytes, 0, CloudComm_IV_SIZE);
+               System_arraycopy(rawData, CloudComm_IV_SIZE, encryptedBytes, 0, encryptedBytes->length());
+               return AESDecrypt(ivBytes, key, encryptedBytes);
+       } 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
  * numbers.
  */
 Array<Slot *> *CloudComm::putSlot(Slot *slot, int max) {
-       URL url = NULL;
-       URLConnection con = NULL;
-       HttpURLConnection http = NULL;
-
+       int fd = -1;
        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();
-               char[] slotBytes = slot.encode(mac);
-               // slotBytes = encryptCipher.doFinal(slotBytes);
-
-               // char[] iVBytes = slot.getSlotCryptIV();
-
-               // char[] chars = new char[slotBytes.length + IV_SIZE];
-               // System.arraycopy(iVBytes, 0, chars, 0, iVBytes.length);
-               // System.arraycopy(slotBytes, 0, chars, IV_SIZE, slotBytes.length);
-
-
-               char[] chars = encryptSlotAndPrependIV(slotBytes, slot.getSlotCryptIV());
-
-               url = buildRequest(true, sequencenumber, max);
-
-               timer.startTime();
-               con = url.openConnection();
-               http = (HttpURLConnection) con;
-
-               http.setRequestMethod("POST");
-               http.setFixedLengthStreamingMode(chars.length);
-               http.setDoOutput(true);
-               http.setConnectTimeout(TIMEOUT_MILLIS);
-               http.setReadTimeout(TIMEOUT_MILLIS);
-               http.connect();
-
-               OutputStream os = http.getOutputStream();
-               os.write(chars);
-               os.flush();
-
-               timer.endTime();
-
-
-               // System.out.println("Bytes Sent: " + chars.length);
-       } catch (ServerException e) {
-               timer.endTime();
-
+               int64_t sequencenumber = slot->getSequenceNumber();
+               Array<char> *slotBytes = slot->encode(mac);
+               Array<char> *chars = encryptSlotAndPrependIV(slotBytes, slot->getSlotCryptIV());
+               IoTString *url = buildRequest(true, sequencenumber, max);
+               timer->startTime();
+               fd = openURL(url, true);
+               writeURLData(fd, chars);
+               timer->endTime();
+       } catch (ServerException *e) {
+               timer->endTime();
                throw e;
-       } catch (SocketTimeoutException e) {
-               timer.endTime();
-
-               throw new ServerException("putSlot failed", ServerException.TypeConnectTimeout);
-       } catch (Exception e) {
-               // e.printStackTrace();
+       } catch (SocketTimeoutException *e) {
+               timer->endTime();
+               throw new ServerException("putSlot failed", ServerException_TypeConnectTimeout);
+       } catch (Exception *e) {
                throw new Error("putSlot failed");
        }
 
-
-
        try {
-               timer.startTime();
-               InputStream is = http.getInputStream();
-               DataInputStream dis = new DataInputStream(is);
-               char[] resptype = new char[7];
-               dis.readFully(resptype);
-               timer.endTime();
-
-               if (Arrays.equals(resptype, "getslot".getBytes())) {
-                       return processSlots(dis);
-               } else if (Arrays.equals(resptype, "putslot".getBytes())) {
+               timer->startTime();
+               Array<char> *resptype = new Array<char>(7);
+               readURLData(fd, resptype);
+               timer->endTime();
+
+               if (resptype->equals(getslot)) {
+                       return processSlots(fd);
+               } else if (resptype->equals(putslot)) {
                        return NULL;
                } else
                        throw new Error("Bad response to putslot");
-
-       } catch (SocketTimeoutException e) {
-               timer.endTime();
-               throw new ServerException("putSlot failed", ServerException.TypeInputTimeout);
-       } catch (Exception e) {
-               // e.printStackTrace();
+       } catch (SocketTimeoutException *e) {
+               timer->endTime();
+               throw new ServerException("putSlot failed", ServerException_TypeInputTimeout);
+       } catch (Exception *e) {
                throw new Error("putSlot failed");
        }
 }
 
 /**
  * Request the server to send all slots with the given
- * sequencenumber or newer.
+ * sequencenumber or newer->
  */
 Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
-       URL url = NULL;
-       URLConnection con = NULL;
-       HttpURLConnection http = NULL;
-
+       int fd = -1;
        try {
                if (salt == NULL) {
                        if (!getSalt()) {
-                               throw new ServerException("getSlots failed", ServerException.TypeSalt);
+                               throw new ServerException("getSlots failed", ServerException_TypeSalt);
                        }
                        initCrypt();
                }
 
-               url = buildRequest(false, sequencenumber, 0);
-               timer.startTime();
-               con = url.openConnection();
-               http = (HttpURLConnection) con;
-               http.setRequestMethod("POST");
-               http.setConnectTimeout(TIMEOUT_MILLIS);
-               http.setReadTimeout(TIMEOUT_MILLIS);
-
-
-
-               http.connect();
-               timer.endTime();
-
-       } catch (SocketTimeoutException e) {
-               timer.endTime();
-
-               throw new ServerException("getSlots failed", ServerException.TypeConnectTimeout);
-       } catch (ServerException e) {
-               timer.endTime();
+               IoTString *url = buildRequest(false, sequencenumber, 0);
+               timer->startTime();
+               fd = openURL(url, true);
+               timer->endTime();
+       } catch (SocketTimeoutException *e) {
+               timer->endTime();
+               throw new ServerException("getSlots failed", ServerException_TypeConnectTimeout);
+       } catch (ServerException *e) {
+               timer->endTime();
 
                throw e;
-       } catch (Exception e) {
-               // e.printStackTrace();
+       } catch (Exception *e) {
                throw new Error("getSlots failed");
        }
 
        try {
-
-               timer.startTime();
-               InputStream is = http.getInputStream();
-               DataInputStream dis = new DataInputStream(is);
-               char[] resptype = new char[7];
-
-               dis.readFully(resptype);
-               timer.endTime();
-
-               if (!Arrays.equals(resptype, "getslot".getBytes()))
-                       throw new Error("Bad Response: " + new String(resptype));
-
-               return processSlots(dis);
-       } catch (SocketTimeoutException e) {
-               timer.endTime();
-
-               throw new ServerException("getSlots failed", ServerException.TypeInputTimeout);
-       } catch (Exception e) {
-               // e.printStackTrace();
+               timer->startTime();
+               Array<char> *resptype = new Array<char>(7);
+               readURLData(fd, resptype);
+               timer->endTime();
+               if (!resptype->equals(getslot))
+                       throw new Error("Bad Response: ");
+
+               return processSlots(fd);
+       } catch (SocketTimeoutException *e) {
+               timer->endTime();
+               throw new ServerException("getSlots failed", ServerException_TypeInputTimeout);
+       } catch (Exception *e) {
                throw new Error("getSlots failed");
        }
 }
@@ -434,198 +381,141 @@ Array<Slot *> *CloudComm::getSlots(int64_t sequencenumber) {
  * Method that actually handles building Slot objects from the
  * server response.  Shared by both putSlot and getSlots.
  */
-Array<Slot *> *CloudComm::processSlots(DataInputStream dis) {
-       int numberofslots = dis.readInt();
-       int[] sizesofslots = new int[numberofslots];
+Array<Slot *> *CloudComm::processSlots(int fd) {
+       int numberofslots = readURLInt(fd);
+       Array<int> *sizesofslots = new Array<int>(numberofslots);
+       Array<Slot *> *slots = new Array<Slot *>(numberofslots);
 
-       Slot[] slots = new Slot[numberofslots];
        for (int i = 0; i < numberofslots; i++)
-               sizesofslots[i] = dis.readInt();
-
+               sizesofslots->set(i, readURLInt(fd));
        for (int i = 0; i < numberofslots; i++) {
-
-               char[] rawData = new char[sizesofslots[i]];
-               dis.readFully(rawData);
-
-
-               // char[] data = new char[rawData.length - IV_SIZE];
-               // System.arraycopy(rawData, IV_SIZE, data, 0, data.length);
-
-
-               char[] data = stripIVAndDecryptSlot(rawData);
-
-               // data = decryptCipher.doFinal(data);
-
-               slots[i] = Slot.decode(table, data, mac);
+               Array<char> *rawData = new Array<char>(sizesofslots->get(i));
+               readURLData(fd, rawData);
+               Array<char> *data = stripIVAndDecryptSlot(rawData);
+               slots->set(i, Slot_decode(table, data, mac));
        }
-       dis.close();
        return slots;
 }
 
-Array<char> *sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, String host, int port) {
-
-       if (salt == NULL) {
+Array<char> *CloudComm::sendLocalData(Array<char> *sendData, int64_t localSequenceNumber, IoTString *host, int port) {
+       if (salt == NULL)
                return NULL;
-       }
        try {
-               System.out.println("Passing Locally");
-
-               mac.update(sendData);
-               char[] genmac = mac.doFinal();
-               char[] totalData = new char[sendData.length + genmac.length];
-               System.arraycopy(sendData, 0, totalData, 0, sendData.length);
-               System.arraycopy(genmac, 0, totalData, sendData.length, genmac.length);
+               printf("Passing Locally\n");
+               mac->update(sendData, 0, sendData->length());
+               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());
 
                // Encrypt the data for sending
-               // char[] encryptedData = encryptCipher.doFinal(totalData);
-               // char[] encryptedData = encryptCipher.doFinal(totalData);
-               char[] iv = createIV(table.getMachineId(), table.getLocalSequenceNumber());
-               char[] encryptedData = encryptSlotAndPrependIV(totalData, iv);
+               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.setReuseAddress(true);
-               DataOutputStream output = new DataOutputStream(socket.getOutputStream());
-               DataInputStream input = new DataInputStream(socket.getInputStream());
-
+               int socket = createSocket(host, port);
 
-               timer.startTime();
+               timer->startTime();
                // Send data to output (length of data, the data)
-               output.writeInt(encryptedData.length);
-               output.write(encryptedData, 0, encryptedData.length);
-               output.flush();
-
-               int lengthOfReturnData = input.readInt();
-               char[] returnData = new char[lengthOfReturnData];
-               input.readFully(returnData);
-
-               timer.endTime();
+               writeSocketInt(socket, encryptedData->length());
+               writeSocketData(socket, encryptedData);
 
-               // returnData = decryptCipher.doFinal(returnData);
+               int lengthOfReturnData = readSocketInt(socket);
+               Array<char> *returnData = new Array<char>(lengthOfReturnData);
+               readSocketData(socket, returnData);
+               timer->endTime();
                returnData = stripIVAndDecryptSlot(returnData);
-               // returnData = decryptCipher.doFinal(returnData);
 
                // We are done with this socket
-               socket.close();
+               close(socket);
+               mac->update(returnData, 0, returnData->length() - CloudComm_HMAC_SIZE);
+               Array<char> *realmac = mac->doFinal();
+               Array<char> *recmac = new Array<char>(CloudComm_HMAC_SIZE);
+               System_arraycopy(returnData, returnData->length() - realmac->length(), recmac, 0, realmac->length());
 
-               mac.update(returnData, 0, returnData.length - HMAC_SIZE);
-               char[] realmac = mac.doFinal();
-               char[] recmac = new 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!");
 
-               char[] returnData2 = new char[lengthOfReturnData - recmac.length];
-               System.arraycopy(returnData, 0, returnData2, 0, returnData2.length);
+               Array<char> *returnData2 = new Array<char>(lengthOfReturnData - recmac->length());
+               System_arraycopy(returnData, 0, returnData2, 0, returnData2->length());
 
                return returnData2;
-       } catch (Exception e) {
-               e.printStackTrace();
-               // throw new Error("Local comms failure...");
-
+       } catch (Exception *e) {
+               printf("Exception\n");
        }
 
        return NULL;
 }
 
 void CloudComm::localServerWorkerFunction() {
-
-       ServerSocket inputSocket = NULL;
+       int inputSocket = -1;
 
        try {
                // Local server socket
-               inputSocket = new ServerSocket(listeningPort);
-               inputSocket.setReuseAddress(true);
-               inputSocket.setSoTimeout(TIMEOUT_MILLIS);
-       } catch (Exception e) {
-               e.printStackTrace();
+               inputSocket = createSocket(listeningPort);
+       } catch (Exception *e) {
                throw new Error("Local server setup failure...");
        }
 
        while (!doEnd) {
-
                try {
                        // Accept incoming socket
-                       Socket socket = inputSocket.accept();
-
-                       DataInputStream input = new DataInputStream(socket.getInputStream());
-                       DataOutputStream output = new DataOutputStream(socket.getOutputStream());
+                       int socket = acceptSocket(inputSocket);
 
                        // Get the encrypted data from the server
-                       int dataSize = input.readInt();
-                       char[] readData = new char[dataSize];
-                       input.readFully(readData);
-
-                       timer.endTime();
+                       int dataSize = readSocketInt(socket);
+                       Array<char> *readData = new Array<char>(dataSize);
+                       readSocketData(socket, readData);
+                       timer->endTime();
 
                        // Decrypt the data
-                       // readData = decryptCipher.doFinal(readData);
                        readData = stripIVAndDecryptSlot(readData);
+                       mac->update(readData, 0, readData->length() - CloudComm_HMAC_SIZE);
+                       Array<char> *genmac = mac->doFinal();
+                       Array<char> *recmac = new Array<char>(CloudComm_HMAC_SIZE);
+                       System_arraycopy(readData, readData->length() - recmac->length(), recmac, 0, recmac->length());
 
-                       mac.update(readData, 0, readData.length - HMAC_SIZE);
-                       char[] genmac = mac.doFinal();
-                       char[] recmac = new char[HMAC_SIZE];
-                       System.arraycopy(readData, readData.length - recmac.length, recmac, 0, recmac.length);
-
-                       if (!Arrays.equals(recmac, genmac))
+                       if (!recmac->equals(genmac))
                                throw new Error("Local Error: Invalid HMAC!  Potential Attack!");
 
-                       char[] returnData = new char[readData.length - recmac.length];
-                       System.arraycopy(readData, 0, returnData, 0, returnData.length);
+                       Array<char> *returnData = new Array<char>(readData->length() - recmac->length());
+                       System_arraycopy(readData, 0, returnData, 0, returnData->length());
 
                        // Process the data
-                       // char[] sendData = table.acceptDataFromLocal(readData);
-                       char[] sendData = table.acceptDataFromLocal(returnData);
-
-
-                       mac.update(sendData);
-                       char[] realmac = mac.doFinal();
-                       char[] totalData = new char[sendData.length + realmac.length];
-                       System.arraycopy(sendData, 0, totalData, 0, sendData.length);
-                       System.arraycopy(realmac, 0, totalData, sendData.length, realmac.length);
+                       Array<char> *sendData = table->acceptDataFromLocal(returnData);
+                       mac->update(sendData, 0, sendData->length());
+                       Array<char> *realmac = mac->doFinal();
+                       Array<char> *totalData = new Array<char>(sendData->length() + realmac->length());
+                       System_arraycopy(sendData, 0, totalData, 0, sendData->length());
+                       System_arraycopy(realmac, 0, totalData, sendData->length(), realmac->length());
 
                        // Encrypt the data for sending
-                       // char[] encryptedData = encryptCipher.doFinal(totalData);
-                       char[] iv = createIV(table.getMachineId(), table.getLocalSequenceNumber());
-                       char[] encryptedData = encryptSlotAndPrependIV(totalData, iv);
-
+                       Array<char> *iv = createIV(table->getMachineId(), table->getLocalSequenceNumber());
+                       Array<char> *encryptedData = encryptSlotAndPrependIV(totalData, iv);
 
-                       timer.startTime();
+                       timer->startTime();
                        // Send data to output (length of data, the data)
-                       output.writeInt(encryptedData.length);
-                       output.write(encryptedData, 0, encryptedData.length);
-                       output.flush();
-
-                       // close the socket
-                       socket.close();
-               } catch (Exception e) {
-
+                       writeSocketInt(socket, encryptedData->length());
+                       writeSocketData(socket, encryptedData);
+                       close(socket);
+               } catch (Exception *e) {
                }
        }
 
-       if (inputSocket != NULL) {
+       if (inputSocket != -1) {
                try {
-                       inputSocket.close();
-               } catch (Exception e) {
-                       e.printStackTrace();
+                       close(inputSocket);
+               } catch (Exception *e) {
                        throw new Error("Local server close failure...");
                }
        }
 }
 
-void CloudComm::close() {
+void CloudComm::closeCloud() {
        doEnd = true;
 
        if (localServerThread != NULL) {
-               try {
-                       localServerThread.join();
-               } catch (Exception e) {
-                       e.printStackTrace();
+               if (pthread_join(localServerThread, NULL) != 0)
                        throw new Error("Local Server thread join issue...");
-               }
        }
-
-       // System.out.println("Done Closing Cloud Comm");
 }
-