bdi-network-resilience

changes to socket communication

9/13/2016 4:19:04 PM
IM

Details

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/escape/EscapeClassifier.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/escape/EscapeClassifier.java
index 50c145e..4aeaa79 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/escape/EscapeClassifier.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/escape/EscapeClassifier.java
@@ -39,7 +39,7 @@ import br.ufrgs.inf.bdinetr.domain.omnet.event.ThreatEvent;
 public class EscapeClassifier extends EscapeRouterComponent implements
 		Classifier, Observer {
 
-	private static final long WAITING_TIME = 20000;
+	private static final long WAITING_TIME = 10000;
 
 	private final Set<ThreatEvent> events;
 
diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/escape/EscapeRouterComponent.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/escape/EscapeRouterComponent.java
index 1666466..d84bef0 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/escape/EscapeRouterComponent.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/escape/EscapeRouterComponent.java
@@ -32,13 +32,14 @@ import org.apache.commons.logging.LogFactory;
 import br.ufrgs.inf.bdinetr.domain.Router;
 import br.ufrgs.inf.bdinetr.domain.RouterComponent;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * @author Alberto Egon, Ingrid Nunes and Frederico Schardong
  */
 public abstract class EscapeRouterComponent extends Observable implements RouterComponent {
 	protected final Log log;
 	protected final Router router;
-	
 
 	public EscapeRouterComponent(Router router) {
 		this.router = router;
@@ -47,10 +48,12 @@ public abstract class EscapeRouterComponent extends Observable implements Router
 
 	public void invoke(String remoteOp, Object[] args) {
 		String socket_arg = remoteOp;
-		
+
 		for (int i = 0; i < args.length; i++) {
 			socket_arg += ";" + args[i];
 		}
+		
+		socket_arg += '\n';
 
 		Object result = null;
 
@@ -60,14 +63,20 @@ public abstract class EscapeRouterComponent extends Observable implements Router
 			Socket clientSocket = new Socket(router.getIp().getAddress(), router.getPort());
 			DataOutputStream outToServer = new DataOutputStream(clientSocket.getOutputStream());
 			outToServer.writeBytes(socket_arg);
-			
+
 			clientSocket.close();
+			
+			try {
+				TimeUnit.SECONDS.sleep(1);
+			} catch(InterruptedException ex) {
+			    Thread.currentThread().interrupt();
+			}
 		} catch (IOException ioe) {
 			ioe.printStackTrace();
 		}
 
-		//apparently no one needs this return
-		//return result;
+		// apparently no one needs this return
+		// return result;
 	}
 
 }