Implementacion de response en Sendmsg.java y ICMPResponse.java

src/Entities/Equipment/Equipment.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 
 import Entities.Network.IMessaging;
+import Entities.Network.IPAddressV4;
 
 
 /**
@@ -11,5 +12,12 @@
 public abstract class Equipment implements IMessaging {
 
 	protected ArrayList<Equipment> equipments = new ArrayList<Equipment>();
-
+	protected IPAddressV4 associatedIp;
+	public IPAddressV4 getAssociatedIp() {
+		return associatedIp;
+	}
+
+	public void setAssociatedIp(IPAddressV4 associatedIp) {
+		this.associatedIp = associatedIp;
+	}
 }

src/Entities/Equipment/Terminal.java

@@ -2,15 +2,17 @@
 
 import Entities.Osystem.TerminalOs;
 import Entities.Packages.*;
+
+import java.util.Iterator;
+
 import Entities.Network.IPAddressV4;
 
 /**
  * Created by efridman on 14/11/15.
  */
 public class Terminal extends Equipment {
 
-	private TerminalOs operatingSystem;
-	private IPAddressV4 associatedIp;
+	private TerminalOs operatingSystem;	
 	private IPAddressV4 ed;
 
 	public TerminalOs getOperatingSystem() {
@@ -19,15 +21,7 @@ public TerminalOs getOperatingSystem() {
 
 	public void setOperatingSystem(TerminalOs operatingSystem) {
 		this.operatingSystem = operatingSystem;
-	}
-
-	public IPAddressV4 getAssociatedIp() {
-		return associatedIp;
-	}
-
-	public void setAssociatedIp(IPAddressV4 associatedIp) {
-		this.associatedIp = associatedIp;
-	}
+	}	
 
 	public IPAddressV4 getEd() {
 		return ed;
@@ -40,27 +34,45 @@ public void setEd(IPAddressV4 ed) {
 
 	@Override
 	public void receivePacket(Packet<PacketType> packet) {
-		String message = "";
-		PacketType responseType = packet.getServiceType().getResponse();
-		if(packet.getServiceType().isRequest()){
-			if(responseType instanceof Who){
-				message = operatingSystem.getDataVersion();
-			}
-			Packet<PacketType> response = new ServicePacket<PacketType>(packet.getDestination(),packet.getSource(),responseType,packet.getTtl(),message);
-		}else{
-			message = packet.getText();
-			if(responseType instanceof ICMPResponse){
-				message = packet.toString();
+		if(packet.getDestination().equals(associatedIp)){
+			String message = "";
+			PacketType responseType = packet.getServiceType().getResponse();
+			if(packet.getServiceType().isRequest()){
+				if(responseType instanceof Who){
+					message = operatingSystem.getDataVersion();
+				}
+				Packet<PacketType> response = new ServicePacket<PacketType>(packet.getDestination(),packet.getSource(),responseType,packet.getTtl(),message);
+				sendPacket(response);
+			}else{
+				message = packet.getText();
+				if(responseType instanceof ICMPResponse){
+					message = packet.toString();
+				}
+				System.out.println(message);
 			}
-			System.out.println(message);
 		}
 	}
 
 	@Override
 	public void sendPacket(Packet<PacketType> packet) {
 		// TODO Auto-generated method stub
+		boolean exists = false;
+		Packet<PacketType> pktRequest = packet;
+		for (Equipment equipment : equipments) {
+			if(equipment.associatedIp.sameNetwork(packet.getDestination())){
+				exists = true;
+				break;
+			}
+		}
+
+		if(!exists){
+			pktRequest = new RoutePacket<PacketType>(this.associatedIp, this.ed, packet.getServiceType(), 
+					this.operatingSystem.getTtl(),"", packet);	
+
+		}
+
 		for (Equipment equipment : equipments) {
-			equipment.receivePacket(packet);
+			equipment.receivePacket(pktRequest);
 		}		
 	}
 

src/Entities/Packages/ICMPResponse.java

@@ -7,4 +7,10 @@ public class ICMPResponse extends PacketType {
     public ICMPResponse(){
         this.setIsRequest(false);
     }
+
+	@Override
+	public PacketType getResponse() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/Entities/Packages/Sendmsg.java

@@ -8,4 +8,10 @@ public class Sendmsg extends PacketType {
     public Sendmsg(){
         this.setIsRequest(false);
     }
+
+	@Override
+	public PacketType getResponse() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }