bdi-network-resilience

Add Classifier, not working yet

6/7/2016 5:14:51 PM

Details

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java b/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java
index f425e0e..ec47cfd 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/BDINetRApp.java
@@ -122,13 +122,10 @@ public class BDINetRApp {
 		case ESCAPE:
 			factory = new EscapeRouterComponentFactory();
 			//bdi4jade won't send any data to link monitor
-			NETWORK.addRouter(new Router(new Ip("whatever"), -1, Role.LINK_MONITOR.getId(), factory));
-			NETWORK.addRouter(new Router(new Ip("192.168.123.11"), 5550, Role.RATE_LIMITER.getId(), factory));
-			//NETWORK.addRouter(new Router(new Ip("Anomaly Detection"), Role.ANOMALY_DETECTION.getId(), factory));
-			NETWORK.addRouter(new Router(new Ip("192.168.123.11"), 5551, Role.CLASSIFIER.getId(), factory));
-			//NETWORK.addRouter(new Router(new Ip("Flow Exporter"), Role.FLOW_EXPORTER.getId(), factory));
-
-			// AFFECTED_LINKS.add(new Link("AFFECTED_LINK"));
+			NETWORK.addRouter(new Router(new Ip("whatever"), -1, "LINK_MONITOR", Role.LINK_MONITOR.getId(), factory));
+			NETWORK.addRouter(new Router(new Ip("192.168.123.6"), 5550, "RATE_LIMITER", Role.RATE_LIMITER.getId(), factory));
+			NETWORK.addRouter(new Router(new Ip("192.168.123.6"), 5551, "ANOMALY_DETECTION", Role.ANOMALY_DETECTION.getId(), factory));
+			NETWORK.addRouter(new Router(new Ip("192.168.123.6"), 5552, "CLASSIFIER", Role.CLASSIFIER.getId() | Role.FLOW_EXPORTER.getId(), factory));
 			break;
 		}
 
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 17c0fa7..1a8a8d4 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
@@ -54,12 +54,12 @@ public abstract class EscapeRouterComponent extends Observable implements Router
 
 		Object result = null;
 
+		log.info("Sent to server: " + socket_arg);
+
 		try {
 			Socket clientSocket = new Socket(router.getIp().getAddress(), router.getPort());
-			
 			DataOutputStream outToServer = new DataOutputStream(clientSocket.getOutputStream());
 			outToServer.writeBytes(socket_arg);
-			log.info("Sent to server: " + socket_arg);
 			
 			clientSocket.close();
 		} catch (IOException ioe) {