edits

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

diff --git a/version2/src/C/NewKey.cc b/version2/src/C/NewKey.cc
index 85a5234a94b58b4af202534a42a394deb7a63efe..a3a1a87c8dbe81007c5711b0b1a219b83c85116d 100644 (file)
--- a/version2/src/C/NewKey.cc
+++ b/version2/src/C/NewKey.cc
@@ -1,16 +1,31 @@
 #include "NewKey.h"
 #include "ByteBuffer.h"
+#include "IoTString.h"
 
-Entry * decode(Slot * slot, ByteBuffer * bb) {
+NewKey::NewKey(Slot *slot, IoTString *_key, int64_t _machineid) :
+       Entry(slot),
+       key(new IoTString(_key)),
+       machineid(_machineid) {
+}
+
+NewKey::~NewKey() {
+       delete key;
+}
+
+Entry *NewKey_decode(Slot *slot, ByteBuffer *bb) {
        int keylength = bb->getInt();
-       Array<char> * key = new Array<char>(keylength);
+       Array<char> *key = new Array<char>(keylength);
        bb->get(key);
        int64_t machineid = bb->getLong();
-       
-       return new NewKey(slot, IoTString.shallow(key), machineid);
+       IoTString *str = IoTString_shallow(key);
+       NewKey *newkey = new NewKey(slot, str, machineid);
+       delete str;
+       return newkey;
 }
 
-void NewKey::encode(ByteBuffer * bb) {
+Entry *NewKey::getCopy(Slot *s) { return new NewKey(s, new IoTString(key), machineid); }
+
+void NewKey::encode(ByteBuffer *bb) {
        bb->put(TypeNewKey);
        bb->putInt(key->length());
        bb->put(key->internalBytes());
@@ -18,5 +33,5 @@ void NewKey::encode(ByteBuffer * bb) {
 }
 
 int NewKey::getSize() {
-       return sizeof(int64_t) + sizeof(char) + sizeof(int32_t) + key.length();
+       return sizeof(int64_t) + sizeof(char) + sizeof(int32_t) + key->length();
 }