From: bdemsky Date: Sat, 23 Jul 2016 23:27:34 +0000 (-0700) Subject: formatting X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=commitdiff_plain;h=0836b97f779b0ef8ef89ca8bae05e7ec5750c164 formatting --- diff --git a/src/java/iotcloud/CloudComm.java b/src/java/iotcloud/CloudComm.java index eb061a4..ca17ffb 100644 --- a/src/java/iotcloud/CloudComm.java +++ b/src/java/iotcloud/CloudComm.java @@ -9,14 +9,14 @@ class CloudComm { Cipher encryptcipher; Cipher decryptcipher; Mac mac; - + CloudComm(String _baseurl, Cipher _encrypt, Cipher _decrypt, Mac _mac) { this.baseurl=_baseurl; this.encryptcipher = _encrypt; this.decryptcipher = _decrypt; this.mac = _mac; } - + private URL buildRequest(boolean isput, long sequencenumber, long maxentries) throws IOException { String reqstring=isput?"req=putslot":"req=getslot"; String urlstr=baseurl+"?"+reqstring+"&seq="+sequencenumber; @@ -25,11 +25,11 @@ class CloudComm { return new URL(urlstr); } - public Slot[] putSlot(Slot slot, int max) throws IOException{ + public Slot[] putSlot(Slot slot, int max) throws IOException { try { long sequencenumber=slot.getSequenceNumber(); byte[] bytes=slot.encode(mac); - + URL url=buildRequest(true, sequencenumber, max); URLConnection con=url.openConnection(); HttpURLConnection http = (HttpURLConnection) con; @@ -40,7 +40,7 @@ class CloudComm { OutputStream os=http.getOutputStream(); os.write(bytes); System.out.println(http.getResponseMessage()); - + InputStream is=http.getInputStream(); DataInputStream dis=new DataInputStream(is); byte[] resptype=new byte[7]; @@ -55,7 +55,7 @@ class CloudComm { throw new Error("putSlot failed"); } } - + public Slot[] getSlots(long sequencenumber) { try { URL url=buildRequest(false, sequencenumber, 0); @@ -65,7 +65,7 @@ class CloudComm { http.connect(); System.out.println(http.getResponseMessage()); InputStream is=http.getInputStream(); - + DataInputStream dis=new DataInputStream(is); byte[] resptype=new byte[7]; dis.readFully(resptype); @@ -77,15 +77,15 @@ class CloudComm { throw new Error("getSlots failed"); } } - + Slot[] processSlots(DataInputStream dis) throws IOException { int numberofslots=dis.readInt(); int[] sizesofslots=new int[numberofslots]; Slot[] slots=new Slot[numberofslots]; - for(int i=0;i { - private A a; - private B b; + private A a; + private B b; - public Pair(A a, B b) { - this.a=a; - this.b=b; - } + public Pair(A a, B b) { + this.a=a; + this.b=b; + } - public A getFirst() { - return a; - } + public A getFirst() { + return a; + } - public B getSecond() { - return b; - } + public B getSecond() { + return b; + } - public String toString() { - return "<"+a+","+b+">"; - } + public String toString() { + return "<"+a+","+b+">"; + } } diff --git a/src/java/iotcloud/RejectedMessage.java b/src/java/iotcloud/RejectedMessage.java index 44059bf..bd52ed0 100644 --- a/src/java/iotcloud/RejectedMessage.java +++ b/src/java/iotcloud/RejectedMessage.java @@ -3,9 +3,9 @@ import java.nio.ByteBuffer; class RejectedMessage extends Entry { private long machineid; - private long oldseqnum;//Oldest seqnum in range - private long newseqnum;//Newest seqnum in range (inclusive) - private boolean equalto;//Is message sent or not sent by machineid + private long oldseqnum; //Oldest seqnum in range + private long newseqnum; //Newest seqnum in range (inclusive) + private boolean equalto; //Is message sent or not sent by machineid RejectedMessage(Slot slot, long _machineid, long _oldseqnum, long _newseqnum, boolean _equalto) { super(slot); @@ -30,7 +30,7 @@ class RejectedMessage extends Entry { long getMachineID() { return machineid; } - + static Entry decode(Slot slot, ByteBuffer bb) { long machineid=bb.getLong(); long oldseqnum=bb.getLong(); @@ -38,7 +38,7 @@ class RejectedMessage extends Entry { byte equalto=bb.get(); return new RejectedMessage(slot, machineid, oldseqnum, newseqnum, equalto==1); } - + void encode(ByteBuffer bb) { bb.put(Entry.TypeRejectedMessage); bb.putLong(machineid); @@ -46,7 +46,7 @@ class RejectedMessage extends Entry { bb.putLong(newseqnum); bb.put(equalto?(byte)1:(byte)0); } - + int getSize() { return 3*Long.BYTES + 2*Byte.BYTES; } diff --git a/src/java/iotcloud/Slot.java b/src/java/iotcloud/Slot.java index 0452590..707b528 100644 --- a/src/java/iotcloud/Slot.java +++ b/src/java/iotcloud/Slot.java @@ -14,7 +14,7 @@ class Slot implements Liveness { private long machineid; private Vector entries; private int livecount; - + Slot(long _seqnum, long _machineid, byte[] _prevhmac, byte[] _hmac) { seqnum=_seqnum; machineid=_machineid; @@ -23,7 +23,7 @@ class Slot implements Liveness { entries=new Vector(); livecount=1; } - + Slot(long _seqnum, byte[] _bytes) { seqnum=_seqnum; } @@ -40,11 +40,11 @@ class Slot implements Liveness { entries.add(e); livecount++; } - + Vector getEntries() { return entries; } - + static Slot decode(byte[] array, Mac mac) { mac.update(array, HMAC_SIZE, array.length-HMAC_SIZE); byte[] realmac=mac.doFinal(); @@ -61,18 +61,18 @@ class Slot implements Liveness { long machineid=bb.getLong(); int numentries=bb.getInt(); Slot slot=new Slot(seqnum, machineid, prevhmac, hmac); - - for(int i=0;i 0; } diff --git a/src/java/iotcloud/SlotBuffer.java b/src/java/iotcloud/SlotBuffer.java index a2bac02..b975850 100644 --- a/src/java/iotcloud/SlotBuffer.java +++ b/src/java/iotcloud/SlotBuffer.java @@ -7,7 +7,7 @@ class SlotBuffer { private int head; private int tail; private long oldestseqn; - + SlotBuffer() { array=new Slot[DEFAULT_SIZE+1]; } @@ -17,7 +17,7 @@ class SlotBuffer { return head - tail; return (array.length + head) - tail; } - + void resize(int newsize) { if (newsize == (array.length-1)) return; @@ -54,11 +54,11 @@ class SlotBuffer { return null; index-= array.length; } - + if (index >= array.length || index >= head) return null; - + return array[index]; } diff --git a/src/java/iotcloud/SlotIndexer.java b/src/java/iotcloud/SlotIndexer.java index 4e344b7..00a82bf 100644 --- a/src/java/iotcloud/SlotIndexer.java +++ b/src/java/iotcloud/SlotIndexer.java @@ -4,7 +4,7 @@ class SlotIndexer { private Slot[] updates; private SlotBuffer buffer; private long firstslotseqnum; - + SlotIndexer(Slot[] _updates, SlotBuffer _buffer) { buffer = _buffer; updates = _updates; diff --git a/src/java/iotcloud/Table.java b/src/java/iotcloud/Table.java index 6cd2b32..dcb74e2 100644 --- a/src/java/iotcloud/Table.java +++ b/src/java/iotcloud/Table.java @@ -7,13 +7,13 @@ import javax.crypto.*; public class Table { int numslots; HashMap table=new HashMap(); - HashMap> lastmessagetable=new HashMap>(); + HashMap > lastmessagetable=new HashMap >(); SlotBuffer buffer; CloudComm cloud; private Mac hmac; long sequencenumber; long localmachineid; - + public Table(String baseurl, String password, long _localmachineid) { localmachineid=_localmachineid; buffer = new SlotBuffer(); @@ -63,7 +63,7 @@ public class Table { public IoTString put(IoTString key, IoTString value) { return null; } - + void validateandupdate(Slot[] newslots) { //The cloud communication layer has checked slot HMACs already //before decoding @@ -79,7 +79,7 @@ public class Table { for(Slot slot: newslots) { processSlot(indexer, slot); } - + } void processEntry(KeyValue entry, SlotIndexer indexer) { @@ -100,7 +100,7 @@ public class Table { long newseqnum=entry.getNewSeqNum(); boolean isequal=entry.getEqual(); long machineid=entry.getMachineID(); - for(long seqnum=oldseqnum;seqnum<=newseqnum;seqnum++) { + for(long seqnum=oldseqnum; seqnum<=newseqnum; seqnum++) { Slot slot=indexer.getSlot(seqnum); if (slot != null) { long slotmachineid=slot.getMachineID(); @@ -110,9 +110,9 @@ public class Table { } } } - + void processEntry(TableStatus entry, SlotIndexer indexer, Slot slot) { - + } void updateLastMessage(long machineid, long seqnum, Liveness liveness) { @@ -129,7 +129,7 @@ public class Table { } else { throw new Error("Unrecognized type"); } - + //Check that nothing funny happened if (machineid == localmachineid) { if (lastmsgseqnum != seqnum) @@ -139,7 +139,7 @@ public class Table { throw new Error("Server Error: Rolback on remote machine sequence number"); } } - + void processSlot(SlotIndexer indexer, Slot slot) { updateLastMessage(slot.getMachineID(), slot.getSequenceNumber(), slot); @@ -148,21 +148,25 @@ public class Table { case Entry.TypeKeyValue: processEntry((KeyValue)entry, indexer); break; + case Entry.TypeLastMessage: processEntry((LastMessage)entry, indexer); break; + case Entry.TypeRejectedMessage: processEntry((RejectedMessage)entry, indexer); break; + case Entry.TypeTableStatus: processEntry((TableStatus)entry, indexer, slot); break; + default: throw new Error("Unrecognized type: "+entry.getType()); } } } - + void checkHMACChain(SlotIndexer indexer, Slot[] newslots) { for(int i=0; i < newslots.length; i++) { Slot currslot=newslots[i]; diff --git a/src/java/iotcloud/TableStatus.java b/src/java/iotcloud/TableStatus.java index 05e5896..83aa9cc 100644 --- a/src/java/iotcloud/TableStatus.java +++ b/src/java/iotcloud/TableStatus.java @@ -3,12 +3,12 @@ import java.nio.ByteBuffer; class TableStatus extends Entry { int maxslots; - + TableStatus(Slot slot, int _maxslots) { super(slot); maxslots=_maxslots; } - + static Entry decode(Slot slot, ByteBuffer bb) { int maxslots=bb.getInt(); return new TableStatus(slot, maxslots); @@ -22,7 +22,7 @@ class TableStatus extends Entry { int getSize() { return Integer.BYTES+Byte.BYTES; } - + byte getType() { return Entry.TypeTableStatus; } diff --git a/src/script/C.cfg b/src/script/C.cfg new file mode 100644 index 0000000..6165d83 --- /dev/null +++ b/src/script/C.cfg @@ -0,0 +1,37 @@ +indent_with_tabs = 2 +indent_cmt_with_tabs = True +indent_columns = 2 +indent_class = True +output_tab_size = 2 +nl_if_brace = Remove +nl_brace_else = Remove +nl_elseif_brace = Remove +nl_struct_brace = Remove +nl_union_brace = Remove +nl_fcall_brace = Remove +nl_for_brace = Remove +nl_fdef_brace = Remove +nl_while_brace = Remove +nl_do_brace = Remove +nl_brace_while = Remove +nl_switch_brace = Remove +nl_before_case = True +nl_try_brace = Remove +nl_catch_brace = Remove +nl_brace_catch = Remove +sp_func_proto_paren = Remove +sp_func_def_paren = Remove +sp_inside_fparens = remove +sp_inside_fparen = remove +sp_func_call_paren = Remove +sp_fparen_brace = Add +sp_sparen_brace = Add +sp_paren_brace = Add +sp_else_brace = Add +sp_brace_else = Add +sp_catch_brace = Add +sp_brace_catch = Add +sp_try_brace = Add +sp_after_sparen = Add +sp_cond_colon = remove +sp_cond_question = remove diff --git a/src/script/java.cfg b/src/script/java.cfg new file mode 100644 index 0000000..6165d83 --- /dev/null +++ b/src/script/java.cfg @@ -0,0 +1,37 @@ +indent_with_tabs = 2 +indent_cmt_with_tabs = True +indent_columns = 2 +indent_class = True +output_tab_size = 2 +nl_if_brace = Remove +nl_brace_else = Remove +nl_elseif_brace = Remove +nl_struct_brace = Remove +nl_union_brace = Remove +nl_fcall_brace = Remove +nl_for_brace = Remove +nl_fdef_brace = Remove +nl_while_brace = Remove +nl_do_brace = Remove +nl_brace_while = Remove +nl_switch_brace = Remove +nl_before_case = True +nl_try_brace = Remove +nl_catch_brace = Remove +nl_brace_catch = Remove +sp_func_proto_paren = Remove +sp_func_def_paren = Remove +sp_inside_fparens = remove +sp_inside_fparen = remove +sp_func_call_paren = Remove +sp_fparen_brace = Add +sp_sparen_brace = Add +sp_paren_brace = Add +sp_else_brace = Add +sp_brace_else = Add +sp_catch_brace = Add +sp_brace_catch = Add +sp_try_brace = Add +sp_after_sparen = Add +sp_cond_colon = remove +sp_cond_question = remove diff --git a/src/script/makefile b/src/script/makefile new file mode 100644 index 0000000..ac2da6e --- /dev/null +++ b/src/script/makefile @@ -0,0 +1,4 @@ +tabbing: + uncrustify -c java.cfg --no-backup $$(find .. -name "*.java") + uncrustify -c C.cfg --no-backup $$(find .. -name "*.cpp") + uncrustify -c C.cfg --no-backup $$(find .. -name "*.h") diff --git a/src/server/iotquery.cpp b/src/server/iotquery.cpp index 0dac1f7..e865468 100644 --- a/src/server/iotquery.cpp +++ b/src/server/iotquery.cpp @@ -57,7 +57,7 @@ void IoTQuery::decodeQuery() { char * str=new char[len+1]; memcpy(str, query, len+1); char *tok_ptr=str; - + /* Parse commands */ char *command=strsep(&tok_ptr, "&"); if (strncmp(command, "req=putslot", 11) == 0) @@ -79,7 +79,7 @@ void IoTQuery::decodeQuery() { //don't allow a really old sequence number if (requestsequencenumber < oldestentry) requestsequencenumber = oldestentry; - + /* Update size if we get request */ char * numqueueentries_str = tok_ptr; if (numqueueentries_str != NULL && @@ -87,7 +87,7 @@ void IoTQuery::decodeQuery() { numqueueentries_str = strchr(numqueueentries_str + 1, '='); numqueueentries = strtoll(numqueueentries_str, NULL, 10); } - + delete str; } @@ -144,7 +144,7 @@ void IoTQuery::getSlot() { delete filename; } const char header[]="getslot"; - long long size=sizeof(header)-1+sizeof(numrequeststosend)+4*numrequeststosend+numbytes; //header + payload + file count + sizes + long long size=sizeof(header)-1+sizeof(numrequeststosend)+4*numrequeststosend+numbytes; //header + payload + file count + sizes char * response = new char[size]; long long offset=0; memcpy(response, header, sizeof(header)-1); @@ -153,26 +153,26 @@ void IoTQuery::getSlot() { cerr << numrequeststosend << " " << numreq << endl; memcpy(response + offset, &numreq, sizeof(numreq)); offset+=sizeof(numrequeststosend); - for(int i=0;i=0) { doRead(fdarray[i], response+offset, filesizes[i]); offset+=filesizes[i]; } } - + //write response out sendResponse(response, size); //cleanup delete response; - for(int i=0;i= 0) close(fdarray[i]); } @@ -189,15 +189,15 @@ void IoTQuery::putSlot() { //need to drop slot removeOldestSlot(); } - + //write slot data out to file char *filename = getSlotFileName(requestsequencenumber); int slotfd = open(filename, O_CREAT|O_WRONLY, S_IRUSR| S_IWUSR); doWrite(slotfd, data, length); close(slotfd); delete filename; - newestentry = requestsequencenumber; // update sequence number - updateStatusFile(); // update counts + newestentry = requestsequencenumber; // update sequence number + updateStatusFile(); // update counts char command[]="putslot"; sendResponse(command, sizeof(command)-1); } @@ -206,12 +206,12 @@ void IoTQuery::sendResponse(char * bytes, int len) { cout << "Accept-Ranges: bytes\r\n" << "Content-Length: " << len << "\r\n" << "\r\n"; - cout.write(bytes, len); + cout.write(bytes, len); } char * IoTQuery::getSlotFileName(long long slot) { int directorylen=strlen(directory); - char * filename=new char[25+directorylen];//19 digits for long number + 4 characters for SLOT + 1 character for null termination + char * filename=new char[25+directorylen]; //19 digits for long number + 4 characters for SLOT + 1 character for null termination snprintf(filename, 24+directorylen+1, "%s/SLOT%lld", directory, slot); return filename; } @@ -249,7 +249,7 @@ void IoTQuery::processQuery() { flock(fd, LOCK_EX); decodeQuery(); - + if (reqGetSlot) getSlot(); else if (reqPutSlot) @@ -332,7 +332,7 @@ bool IoTQuery::openStatusFile() { cerr << strerror(errno) << " error opening statusfile" << endl; return false; } - + int size; int needwrite=0; if (doread(fd, &size, sizeof(size), OFFSET_MAX)) diff --git a/src/server/iotquery.h b/src/server/iotquery.h index 6e35f9c..05156b8 100644 --- a/src/server/iotquery.h +++ b/src/server/iotquery.h @@ -10,12 +10,12 @@ #define OFFSET_NEW 12 class IoTQuery { - public: +public: IoTQuery(FCGX_Request * request); ~IoTQuery(); void processQuery(); - - private: + +private: void sendResponse(char *data, int length); void getQuery(); void getDirectory(); @@ -28,7 +28,7 @@ class IoTQuery { void putSlot(); void removeOldestSlot(); char * getSlotFileName(long long); - + FCGX_Request * request; char *data; char *directory; diff --git a/src/serverJ/.idea/compiler.xml b/src/serverJ/.idea/compiler.xml deleted file mode 100644 index 05ea1dc..0000000 --- a/src/serverJ/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/serverJ/.idea/copyright/profiles_settings.xml b/src/serverJ/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/src/serverJ/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/serverJ/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_52.xml b/src/serverJ/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_52.xml deleted file mode 100644 index 4b942f1..0000000 --- a/src/serverJ/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_52.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/serverJ/.idea/libraries/Maven__org_json_json_20090211.xml b/src/serverJ/.idea/libraries/Maven__org_json_json_20090211.xml deleted file mode 100644 index e57dc0a..0000000 --- a/src/serverJ/.idea/libraries/Maven__org_json_json_20090211.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/serverJ/.idea/misc.xml b/src/serverJ/.idea/misc.xml deleted file mode 100644 index 233a7f0..0000000 --- a/src/serverJ/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/serverJ/.idea/modules.xml b/src/serverJ/.idea/modules.xml deleted file mode 100644 index ef33d7f..0000000 --- a/src/serverJ/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/serverJ/.idea/workspace.xml b/src/serverJ/.idea/workspace.xml deleted file mode 100644 index 655dfea..0000000 --- a/src/serverJ/.idea/workspace.xml +++ /dev/null @@ -1,770 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1469215057799 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.8 - - - - - - - - serverJ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/serverJ/pom.xml b/src/serverJ/pom.xml deleted file mode 100644 index ec5d251..0000000 --- a/src/serverJ/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - com.iotcloud.iot - iotcloudserverlib - 1.0-SNAPSHOT - - - - org.bouncycastle - bcprov-jdk15on - 1.52 - - - org.json - json - 20090211 - - - - - \ No newline at end of file diff --git a/src/serverJ/serverJ.iml b/src/serverJ/serverJ.iml deleted file mode 100644 index 61230e4..0000000 --- a/src/serverJ/serverJ.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/serverJ/src/main/java/com/iotcloud/iot/slots/Slot.java b/src/serverJ/src/main/java/com/iotcloud/iot/slots/Slot.java deleted file mode 100644 index 33605e9..0000000 --- a/src/serverJ/src/main/java/com/iotcloud/iot/slots/Slot.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.iotcloud.iot.slots; - -/** - * Created by joel on 7/22/16. - */ - -import org.json.JSONException; -import org.json.JSONObject; -public class Slot { - - - //int is not a good choice for sequenceNumber I believe; - - int sequenceNumber; - String slotValue; - - public Slot(int sequenceNumber, String slotValue) { - this.sequenceNumber = sequenceNumber; - this.slotValue = slotValue; - } - - public String toJsonString() throws JSONException { - JSONObject obj = new JSONObject(); - obj.put(Integer.toString(this.sequenceNumber),this.slotValue); - return obj.toString(); - } - -}