edits

[iotcloud.git] / version2 / src / C / Slot.h

diff --git a/version2/src/C/Slot.h b/version2/src/C/Slot.h
index b46e2ab822b298dd95bcc951f08ee4deeaa1868b..d00cf4e3d470a7acd144cb27ef25c3643e144c7c 100644 (file)
--- a/version2/src/C/Slot.h
+++ b/version2/src/C/Slot.h
@@ -4,7 +4,6 @@
 #include "common.h"
 #include "Liveness.h"
 
-
 #define SLOT_SIZE 2048
 #define HMAC_SIZE 32
 
@@ -29,19 +28,20 @@ private:
        int freespace;
        /** Reference to Table */
        Table *table;
-
+       LastMessage * fakeLastMessage;
+       
        int64_t localSequenceNumber;
-       void addShallowEntry(Entry *e);
 
 public:
        Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_prevhmac, Array<char> *_hmac, int64_t _localSequenceNumber);
        Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_prevhmac, int64_t _localSequenceNumber);
        Slot(Table *_table, int64_t _seqnum, int64_t _machineid, int64_t _localSequenceNumber);
-
+       ~Slot();
+       
        Array<char> *getHMAC() { return hmac; }
        Array<char> *getPrevHMAC() { return prevhmac; }
        Entry *addEntry(Entry *e);
-       void removeEntry(Entry *e);
+       void addShallowEntry(Entry *e);
        bool hasSpace(Entry *e);
        Vector<Entry *> *getEntries();
        Array<char> *encode(Mac *mac);
@@ -53,8 +53,9 @@ public:
        void decrementLiveCount();
        bool isLive() { return livecount > 0; }
        Array<char> *getSlotCryptIV();
-       friend Slot *Slotdecode(Table *table, Array<char> *array, Mac *mac);
+       friend Slot *Slot_decode(Table *table, Array<char> *array, Mac *mac);
+       char getType();
 };
 
-Slot *Slotdecode(Table *table, Array<char> *array, Mac *mac);
+Slot *Slot_decode(Table *table, Array<char> *array, Mac *mac);
 #endif