reorg threading

RScicomp · Jan 31, 2020 · 03646ea · 03646ea
1 parent 8e6e3eb
commit 03646ea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/sketch_code_COMP_535/src/main/java/socs/network/node/Router.java b/sketch_code_COMP_535/src/main/java/socs/network/node/Router.java
@@ -96,8 +96,12 @@ private void processStart() {
       System.out.println(link);
       if(link != null){
         System.out.println(link);
-        ServerHandler handler = new ServerHandler(link);
-        handler.run();
+        try{
+          Socket client = new Socket(link.router2.processIPAddress,link.router2.processPortNumber);
+          System.out.println("Just connected to" + client.getRemoteSocketAddress());
+        }catch(Exception e){
+          System.out.println("Failed");
+        }
       }
       //use our port number to send
       //Socket client = new Socket("Sender", rd.processPortNumber);
@@ -141,6 +145,11 @@ public void terminal() {
     try {
       InputStreamReader isReader = new InputStreamReader(System.in);
       BufferedReader br = new BufferedReader(isReader);
+      //thread server listening to incoming connections.
+      Runnable handler = new ServerHandler(rd);
+      //handle incoming connection requests
+      Thread t1 = new Thread(handler);
+
       System.out.print(">> ");
       String command = br.readLine();
       while (true) {
@@ -172,6 +181,7 @@ public void terminal() {
         System.out.print(">> ");
         command = br.readLine();
       }
+      t1.start();
       isReader.close();
       br.close();
     } catch (Exception e) {

diff --git a/sketch_code_COMP_535/target/COMP535-1.0-SNAPSHOT-jar-with-dependencies.jar b/sketch_code_COMP_535/target/COMP535-1.0-SNAPSHOT-jar-with-dependencies.jar