diff --git a/src/main/java/cp/CPCookie.java b/src/main/java/cp/CPCookie.java new file mode 100644 index 0000000000000000000000000000000000000000..161efa8b9fd284f1d194142d2629dd2519a60124 --- /dev/null +++ b/src/main/java/cp/CPCookie.java @@ -0,0 +1,4 @@ +package cp; + +public class CPCookie { +} diff --git a/src/main/java/cp/CPProtocol.java b/src/main/java/cp/CPProtocol.java index e27711d71a2e7034589d3765d57d2b3e52f4375d..b44babeb6ff99c606df7625387a90ecfdbbb2542 100644 --- a/src/main/java/cp/CPProtocol.java +++ b/src/main/java/cp/CPProtocol.java @@ -21,7 +21,7 @@ public class CPProtocol extends Protocol { private PhyConfiguration PhyConfig; private PhyProtocol PhyProto; boolean isClient; - HashMap<PhyConfiguration, String> cookieMap; + HashMap<PhyConfiguration, Integer> cookieMap; Random rnd; // Constructor for clients @@ -93,7 +93,6 @@ public class CPProtocol extends Protocol { //Discard Message } - /* //discard message, if not instance of CPCommandMessage if(!(in instanceof CPCommandResponseMessage)){ continue; @@ -102,7 +101,7 @@ public class CPProtocol extends Protocol { //compare the id from the received message and the earlier sent message if(((CPCommandResponseMessage) in).getMessageId() != this.id){ continue; - }*/ + } receving = false; } @@ -116,7 +115,7 @@ public class CPProtocol extends Protocol { return; } - cookieMap.put(config, cookie); + cookieMap.put(config, config.hashCode(cookie)); } diff --git a/src/main/java/cp/CPStatusCommand.java b/src/main/java/cp/CPStatusCommand.java deleted file mode 100644 index 41cbd7d5cfada1c389bb1d2e3eafc464db20fc29..0000000000000000000000000000000000000000 --- a/src/main/java/cp/CPStatusCommand.java +++ /dev/null @@ -1,6 +0,0 @@ -package cp; - -public class CPStatusCommand extends CPMsg{ - - -} diff --git a/src/main/java/phy/PhyConfiguration.java b/src/main/java/phy/PhyConfiguration.java index 121f9bd7ea9173b1d79327f65c5ff5914734c585..b91e2bae334ecc7037e32c55a062eeb63642ac86 100644 --- a/src/main/java/phy/PhyConfiguration.java +++ b/src/main/java/phy/PhyConfiguration.java @@ -2,6 +2,7 @@ package phy; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.Objects; import core.Configuration; import core.Protocol; @@ -30,11 +31,10 @@ public class PhyConfiguration extends Configuration{ public Protocol.proto_id getPid() {return this.pid;} - public boolean equals(PhyConfiguration otherConfig){ + public boolean equals(PhyConfiguration otherConfig ){ return false; } - public int hashCode(){ - - return 0; + public int hashCode(String cookie){ + return System.identityHashCode(cookie); } }