Store address in MANETBroadcastAddress as it is needed to identify

sender when a packet is received
d3scomp · Mar 10, 2015 · e39433b · e39433b
1 parent 8721c43
commit e39433b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/MANETBroadcastAddress.java b/jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/MANETBroadcastAddress.java
@@ -8,20 +8,15 @@
  *
  */
 public class MANETBroadcastAddress extends Address {
+	public final static MANETBroadcastAddress BROADCAST = new MANETBroadcastAddress("broadcast");
+
+	private String address;
 
-	public final static MANETBroadcastAddress INSTANCE = new MANETBroadcastAddress();
-
-	private MANETBroadcastAddress() {
-		// Prevents instantiation from outside the class
+	public MANETBroadcastAddress(String address) {
+		this.address = address;
 	}
 
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		return getClass() == obj.getClass();
+	public String getAddress() {
+		return address;
 	}
-
 }
diff --git a/jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java b/jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
@@ -47,7 +47,7 @@ public void send(byte[] data, Address address) {
 		for (Layer1 layer : l1Layers) {
 			// TODO: Would be nice to know sender address (have a sending layer/network as a parameter)
 			// BUG: This is using recipient address, which is not correct
-			layer.processL0Packet(data, this, new ReceivedInfo(MANETBroadcastAddress.INSTANCE));
+			layer.processL0Packet(data, this, new ReceivedInfo(MANETBroadcastAddress.BROADCAST));
 		}
 	}
 

diff --git a/jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java b/jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
@@ -145,7 +145,7 @@ protected void publish() {
 
 		for(KnowledgeData data: prepareLocalKnowledgeData()) {
 			network.getL2().sendL2Packet(new L2Packet(new PacketHeader(L2PacketType.KNOWLEDGE), data),
-					MANETBroadcastAddress.INSTANCE);
+					MANETBroadcastAddress.BROADCAST);
 		}
 	}
 

diff --git a/jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java b/jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java
@@ -89,10 +89,10 @@ public void testL2PacketSending() {
 		L2Packet srcPacket = createSampleSourcepacket();
 
 		// Try to send the packet
-		l2Layer.sendL2Packet(srcPacket, MANETBroadcastAddress.INSTANCE);
+		l2Layer.sendL2Packet(srcPacket, MANETBroadcastAddress.BROADCAST);
 
 		// Check packet was passed to layer1
-		Mockito.verify(layer1).sendL2Packet(Matchers.eq(srcPacket), Matchers.eq(MANETBroadcastAddress.INSTANCE));
+		Mockito.verify(layer1).sendL2Packet(Matchers.eq(srcPacket), Matchers.eq(MANETBroadcastAddress.BROADCAST));
 	}
 
 	/**