update

jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DataIDSource.java

@@ -0,0 +1,5 @@
+package cz.cuni.mff.d3s.jdeeco.network.l1;
+
+public interface DataIDSource {
+	public int createDataID();
+}

jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DefaultDataIDSource.java

@@ -0,0 +1,21 @@
+package cz.cuni.mff.d3s.jdeeco.network.l1;
+
+public class DefaultDataIDSource implements DataIDSource {
+
+	private static DefaultDataIDSource instance;
+	private static int COUNTER = 0;
+
+	public synchronized DefaultDataIDSource getInstance() {
+		if (instance == null) {
+			instance = new DefaultDataIDSource();
+		}
+		return instance;
+	}
+
+	@Override
+	public int createDataID() {
+		COUNTER++;
+		return COUNTER;
+	}
+
+}

jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Packet.java

@@ -13,10 +13,10 @@ public class L1Packet {
 	public final int startPos;				/** in bytes*/
 	public final int payloadSize; 			/** in bytes*/
 	public final int totalSize; 			/** in bytes*/
-	public final ReceivedInfo receivedInfo; /** receival additaional information */
+	public final L1ReceivedInfo receivedInfo; /** receival additaional information */
 
 	public L1Packet(byte[] payload, int srcNode, int dataId, int startPos,
-			int payloadSize, int totalSize, ReceivedInfo receivedInfo) {
+			int payloadSize, int totalSize, L1ReceivedInfo receivedInfo) {
 		this.payload = payload;
 		this.srcNode = srcNode;
 		this.dataId = dataId;

jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java → jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1ReceivedInfo.java

@@ -6,10 +6,10 @@
  * @author Michal Kit <kit@d3s.mff.cuni.cz>
  *
  */
-public class ReceivedInfo {
-	public final String srcAddress; /** packet sending node address */
+public class L1ReceivedInfo {
+	public final Address srcAddress; /** packet sending node address */
 
-	public ReceivedInfo(String srcAddress) {
+	public L1ReceivedInfo(Address srcAddress) {
 		this.srcAddress = srcAddress;
 	}
 }

jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java

@@ -1,61 +1,81 @@
 package cz.cuni.mff.d3s.jdeeco.network.l1;
 
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 
 import cz.cuni.mff.d3s.jdeeco.network.Device;
 import cz.cuni.mff.d3s.jdeeco.network.l2.L2Packet;
+import cz.cuni.mff.d3s.jdeeco.network.l2.L2ReceivedInfo;
 
 /**
- * Defines L1 methods that are called from the upper layer (L2) or L1 strategies. 
+ * Defines L1 methods that are called from the upper layer (L2) or L1 strategies.
  * 
  * 
  * @author Michal Kit <kit@d3s.mff.cuni.cz>
  *
  */
 public class Layer1 {
-	
+
 	private final Set<Strategy> strategies;
 	private final Set<Device> devices;
-
-	public Layer1() {
+	private final int nodeId;
+	private final DataIDSource dataIdSource;
+
+	public Layer1(int nodeId, DataIDSource dataIdSource) {
 		this.strategies = new HashSet<Strategy>();
 		this.devices = new HashSet<Device>();
+		this.nodeId = nodeId;
+		this.dataIdSource = dataIdSource;
 	}
-	
+
 	public void registerStrategy(Strategy strategy) {
 		strategies.add(strategy);
 	}
-	
+
 	public void registerDevice(Device device) {
 		devices.add(device);
 	}
-	
+
 	public boolean sendL2Packet(L2Packet packet, Address address) {
 		if (packet != null) {
-			for (Device device: devices) {
+			for (Device device : devices) {
 				if (device.canSend(address)) {
 					packet.getData();
-					//device.send(encapsulate(packet), address);
+					// device.send(encapsulate(packet), address);
 					return true;
 				}
 			}
 		}
 		return false;
 	}
-	
+
 	public boolean sendL1Packet(L1Packet packet, Address address) {
-		//TODO
+		// TODO
 		return false;
 	}
-	
-	public L1Packet processL0Packet(byte [] packet) {
-		//TODO
+
+	public L1Packet processL0Packet(byte[] packet) {
+		// TODO
 		return null;
 	}
-
-	protected L1Packet encapsulateL2(L2Packet packet) {
-		//TODO
-		return null;
+
+	protected List<L1Packet> dissassembleL2ToL1(L2Packet packet, int mtu) {
+		LinkedList<L1Packet> result = new LinkedList<L1Packet>();
+		if (packet.getData() != null && packet.getData().length > 0) {
+			L2ReceivedInfo receivedInfo = packet.receivedInfo;
+			int srcNode, dataId;
+			if (receivedInfo == null) {
+				srcNode = nodeId;
+				dataId = dataIdSource.createDataID();
+			} else {
+				srcNode = receivedInfo.srcNode;
+				dataId = receivedInfo.dataId;
+			}
+			//L1Packet l1Packet = new L1Packet(packet.getData(), srcNode, dataId, startPos, payloadSize, totalSize, null);
+		}
+		return result;
 	}
 }

jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETReceivedInfo.java

@@ -6,11 +6,11 @@
  * @author Michal Kit <kit@d3s.mff.cuni.cz>
  *
  */
-public class MANETReceivedInfo extends ReceivedInfo {
+public class MANETReceivedInfo extends L1ReceivedInfo {
 
 	public final double rssi; /** Radio Signal Strength Indicator */
 
-	public MANETReceivedInfo(String srcAddress, double rssi) {
+	public MANETReceivedInfo(Address srcAddress, double rssi) {
 		super(srcAddress);
 		this.rssi = rssi;
 	}

jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java

@@ -8,14 +8,14 @@
  */
 public class L2Packet {
 	public final PacketHeader header;
-	public final ReceivedInfo receivedInfo;
+	public final L2ReceivedInfo receivedInfo;
 
 	private byte[] data;
 	private Object object;
 	private final Layer2 l2Layer;
 
 
-	private L2Packet(Layer2 l2Layer, PacketHeader header, ReceivedInfo receivedInfo) {
+	private L2Packet(Layer2 l2Layer, PacketHeader header, L2ReceivedInfo receivedInfo) {
 		this.l2Layer = l2Layer;
 		this.header = header;
 		this.receivedInfo = receivedInfo;
@@ -42,7 +42,7 @@ public L2Packet(Layer2 l2Layer, PacketHeader header, Object object) {
 	 * @param data
 	 *            Source binary data for object
 	 */
-	public L2Packet(Layer2 l2Layer, PacketHeader header, byte[] data, ReceivedInfo receivedInfo) {
+	public L2Packet(Layer2 l2Layer, PacketHeader header, byte[] data, L2ReceivedInfo receivedInfo) {
 		this(l2Layer, header, receivedInfo);
 		this.data = data;
 	}
@@ -75,13 +75,4 @@ public byte[] getData() {
 		}
 		return data;
 	}
-
-	/**
-	 * Gets packet received info
-	 * 
-	 * @return Returns packet received info, or null when no packet received info is available.
-	 */
-	public ReceivedInfo getReceivedInfo() {
-		return receivedInfo;
-	}
 }

jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/ReceivedInfo.java → jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2ReceivedInfo.java

@@ -10,7 +10,7 @@
  * @author Vladimir Matena <matena@d3s.mff.cuni.cz>
  *
  */
-public class ReceivedInfo {
+public class L2ReceivedInfo {
 	/**
 	 * Source L1 packets
 	 * 
@@ -33,7 +33,7 @@ public class ReceivedInfo {
 	public final int dataId;
 
 
-	public ReceivedInfo(Collection<L1Packet> srcFragments, int srcNode,
+	public L2ReceivedInfo(Collection<L1Packet> srcFragments, int srcNode,
 			int dataId) {
 		this.srcFragments = srcFragments;
 		this.srcNode = srcNode;

jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java

@@ -98,7 +98,7 @@ public L2Packet createPacket(PacketHeader header, Object object) {
 	 * @param receifedInfo
 	 *            Information about received packet
 	 */
-	public L2Packet createPacket(PacketHeader header, byte[] data, ReceivedInfo receivedInfo) {
+	public L2Packet createPacket(PacketHeader header, byte[] data, L2ReceivedInfo receivedInfo) {
 		return new L2Packet(this, header, data, receivedInfo);
 	}
 }

jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java

@@ -16,7 +16,7 @@
 import cz.cuni.mff.d3s.jdeeco.network.l2.L2Packet;
 import cz.cuni.mff.d3s.jdeeco.network.l2.Layer2;
 import cz.cuni.mff.d3s.jdeeco.network.l2.PacketHeader;
-import cz.cuni.mff.d3s.jdeeco.network.l2.ReceivedInfo;
+import cz.cuni.mff.d3s.jdeeco.network.l2.L2ReceivedInfo;
 import cz.cuni.mff.d3s.jdeeco.network.l2.Strategy;
 import cz.cuni.mff.d3s.jdeeco.network.marshaller.MarshallerRegistry;
 import cz.cuni.mff.d3s.jdeeco.network.marshaller.SerializingMarshaller;
@@ -68,7 +68,7 @@ public void testL2PacketMarshalling() {
 		assertPayload(srcPacket.getObject());
 
 		// Create destination packet from source packet binary data
-		ReceivedInfo info = new ReceivedInfo(new LinkedList<L1Packet>(), 1, 1);
+		L2ReceivedInfo info = new L2ReceivedInfo(new LinkedList<L1Packet>(), 1, 1);
 		L2Packet dstPacket = l2Layer.createPacket(new PacketHeader(PacketType.KNOWLEDGE), srcPacket.getData(), info);
 		assertPayload(dstPacket.getObject());
 	}
@@ -101,7 +101,7 @@ public void testL2PacketProcessing() {
 		Strategy strategy = Mockito.mock(Strategy.class);
 		l2Layer.registerL2Strategy(strategy);
 
-		ReceivedInfo info = new ReceivedInfo(new LinkedList<L1Packet>(), 1, 1);
+		L2ReceivedInfo info = new L2ReceivedInfo(new LinkedList<L1Packet>(), 1, 1);
 
 		// Create source packet (created with data and received packet info)
 		L2Packet srcPacket = l2Layer.createPacket(new PacketHeader(PacketType.KNOWLEDGE),