Resolve "Connect AutoRef to correct GC address"

Closes #1583 See merge request main/Sumatra!1329 sumatra-commit: d6c67bc1d00e369f759cb83b8d36162445eef67b
ZJU-RoboCup · Feb 20, 2021 · d84420d · d84420d
1 parent 8ed9329
commit d84420d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/config/moduli/moduli.xml b/config/moduli/moduli.xml
@@ -66,10 +66,8 @@
         <implementation>edu.tigers.sumatra.wp.exporter.VisionTrackerSender</implementation>
 
         <properties>
-            <source-name>TIGERs AutoRef</source-name>
             <address>224.5.23.2</address>
             <port>10010</port>
-<!--            <interface>enp12s0</interface>-->
         </properties>
     </module>
 

diff --git a/...s/moduli-autoreferee/src/main/java/edu/tigers/autoreferee/engine/ActiveAutoRefEngine.java b/...s/moduli-autoreferee/src/main/java/edu/tigers/autoreferee/engine/ActiveAutoRefEngine.java
@@ -1,14 +1,8 @@
 /*
- * Copyright (c) 2009 - 2019, DHBW Mannheim - TIGERs Mannheim
+ * Copyright (c) 2009 - 2021, DHBW Mannheim - TIGERs Mannheim
  */
 package edu.tigers.autoreferee.engine;
 
-import java.net.InetAddress;
-import java.util.Set;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import edu.tigers.autoreferee.IAutoRefFrame;
 import edu.tigers.autoreferee.engine.detector.EGameEventDetectorType;
 import edu.tigers.autoreferee.module.AutoRefModule;
@@ -21,6 +15,11 @@
 import edu.tigers.sumatra.referee.control.GcEventFactory;
 import edu.tigers.sumatra.referee.data.EGameState;
 import edu.tigers.sumatra.referee.gameevent.IGameEvent;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.net.InetAddress;
+import java.util.Set;
 
 
 public class ActiveAutoRefEngine extends AutoRefEngine
@@ -65,6 +64,12 @@ public void stop()
 	@Override
 	public void process(final IAutoRefFrame frame)
 	{
+		AReferee referee = SumatraModel.getInstance().getModule(AReferee.class);
+		String hostname = referee.getActiveSource().getRefBoxAddress()
+				.map(InetAddress::getHostAddress)
+				.orElse(DEFAULT_REFEREE_HOST);
+		remote.updateHostname(hostname);
+
 		processEngine(frame).forEach(this::processGameEvent);
 
 		if (SumatraModel.getInstance().isSimulation())

diff --git a/...referee/src/main/java/edu/tigers/autoreferee/remote/AutoRefToGameControllerConnector.java b/...referee/src/main/java/edu/tigers/autoreferee/remote/AutoRefToGameControllerConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 - 2020, DHBW Mannheim - TIGERs Mannheim
+ * Copyright (c) 2009 - 2021, DHBW Mannheim - TIGERs Mannheim
  */
 package edu.tigers.autoreferee.remote;
 
@@ -65,6 +65,12 @@ public AutoRefToGameControllerConnector(final String hostname, final int port)
 	}
 
 
+	public void updateHostname(String hostname)
+	{
+		protocol.setHostname(hostname);
+	}
+
+
 	private void register()
 	{
 		log.debug("Starting registering");
@@ -209,6 +215,7 @@ public void addGameEventResponseObserver(IGameEventResponseObserver observer)
 		this.responseObserverList.add(observer);
 	}
 
+
 	private static class QueueEntry
 	{
 		private final IGameEvent event;

diff --git a/modules/moduli-referee/src/main/java/edu/tigers/sumatra/referee/GameControllerProtocol.java b/modules/moduli-referee/src/main/java/edu/tigers/sumatra/referee/GameControllerProtocol.java
@@ -1,20 +1,19 @@
 /*
- * Copyright (c) 2009 - 2019, DHBW Mannheim - TIGERs Mannheim
+ * Copyright (c) 2009 - 2021, DHBW Mannheim - TIGERs Mannheim
  */
 
 package edu.tigers.sumatra.referee;
 
+import com.google.protobuf.Message;
+import com.google.protobuf.Parser;
+import lombok.Setter;
+import lombok.extern.log4j.Log4j2;
+
 import java.io.IOException;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import com.google.protobuf.Message;
-import com.google.protobuf.Parser;
-
 
 /**
  * Main Class to interact with the new (2019) SSL GameController Protocol
@@ -23,10 +22,10 @@
  * For more details about this protocol, visit the Repository of the official SSL-Game-Controller:
  * https://github.com/RoboCup-SSL/ssl-game-controller
  */
+@Log4j2
 public class GameControllerProtocol
 {
-	private static final Logger log = LogManager.getLogger(GameControllerProtocol.class);
-
+	@Setter
 	private String hostname;
 	private Socket socket;
 	private int port;
@@ -115,7 +114,7 @@ private boolean connect()
 			return true;
 		} catch (IOException e)
 		{
-			log.warn("Connection to SSL-Game-Controller Failed", e);
+			log.warn("Connection to SSL-Game-Controller ({}:{}) failed", hostname, port, e);
 		}
 		return false;
 	}