From: joelbandi <joelvivekbandi@gmail.com>
Date: Sat, 30 Jul 2016 12:42:13 +0000 (-0700)
Subject: more js
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=629534a1b8371f3db00aad1b1495a39711c1f955;p=iotcloud.git

more js
---

629534a1b8371f3db00aad1b1495a39711c1f955
diff --cc src/java/iotcloud/Slot.java
index 1d84baa,d23e5c1..c114a87
--- a/src/java/iotcloud/Slot.java
+++ b/src/java/iotcloud/Slot.java
@@@ -29,14 -27,16 +27,16 @@@ class Slot implements Liveness 
  	/** Vector of entries in this slot. */
  	private Vector<Entry> entries;
  	/** Pieces of information that are live. */
 -	private int livecount;
 +	private int livecount;//
  	/** Flag that indicates whether this slot is still live for
  	 * recording the machine that sent it. */
 -	private boolean seqnumlive;
 +	private boolean seqnumlive;//
  	/** Number of bytes of free space. */
  	private int freespace;
+ 	/** Reference to Table */
+ 	private Table table;
  
- 	Slot(long _seqnum, long _machineid, byte[] _prevhmac, byte[] _hmac) {
+ 	Slot(Table _table, long _seqnum, long _machineid, byte[] _prevhmac, byte[] _hmac) {
  		seqnum=_seqnum;
  		machineid=_machineid;
  		prevhmac=_prevhmac;
@@@ -45,14 -45,15 +45,20 @@@
  		livecount=1;
  		seqnumlive=true;
  		freespace = SLOT_SIZE - getBaseSize();
+ 		table=_table;
  	}
  
- 	Slot(long _seqnum, long _machineid, byte[] _prevhmac) {
- 		this(_seqnum, _machineid, _prevhmac, null);
+ 	Slot(Table _table, long _seqnum, long _machineid, byte[] _prevhmac) {
+ 		this(_table, _seqnum, _machineid, _prevhmac, null);
  	}
  
++<<<<<<< HEAD
 +	Slot(long _seqnum, long _machineid) {
 +		this(_seqnum, _machineid, new byte[ HMAC_SIZE], null);
++=======
+ 	Slot(Table _table, long _seqnum, long _machineid) {
+ 		this(_table, _seqnum, _machineid, new byte[HMAC_SIZE], null);
++>>>>>>> f80cc30f294899f47cef3507334f8ca357862e5e
  	}
  
  	byte[] getHMAC() {