Improved determinePublicHostName method

GuilhemSempere · Jul 15, 2019 · d12d0d2 · d12d0d2
1 parent e084fe5
commit d12d0d2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.cirad</groupId>
   <artifactId>Mgdb2BrapiImpl</artifactId>
-  <version>1.1-RC1</version>
+  <version>1.1-RC2</version>
   <packaging>jar</packaging> 
 
   <dependencies>
         <dependency>
 		    <groupId>fr.cirad</groupId>
 		    <artifactId>mgdb2</artifactId>
-		    <version>2.1-RELEASE</version>
+		    <version>2.2-RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/src/fr/cirad/web/controller/rest/BrapiRestController.java b/src/fr/cirad/web/controller/rest/BrapiRestController.java
@@ -1207,19 +1207,19 @@ public String determinePublicHostName(HttpServletRequest request) throws Unknown
 		        Enumeration<NetworkInterface> niEnum = NetworkInterface.getNetworkInterfaces();
 		        mainLoop : for (; niEnum.hasMoreElements();)
 		        {
-		                NetworkInterface ni = niEnum.nextElement();
-		                Enumeration<InetAddress> a = ni.getInetAddresses();
-		                for (; a.hasMoreElements();)
-		                {
-	                        InetAddress addr = a.nextElement();
-	                        String hostAddress = addr.getHostAddress();
-	                        if (!"127.0.1.1".equals(hostAddress) && hostAddress.split("\\.").length >= 4)
-	                        {
-	                        	sHostName = hostAddress;
-	                        	if (!ni.getDisplayName().toLowerCase().startsWith("wlan"))
-	                        		break mainLoop;	// otherwise we will keep searching in case we find an ethernet network
-	                        }
-		                }
+	                NetworkInterface ni = niEnum.nextElement();
+	                Enumeration<InetAddress> a = ni.getInetAddresses();
+	                for (; a.hasMoreElements();)
+	                {
+                        InetAddress addr = a.nextElement();
+                        String hostAddress = addr.getHostAddress().replaceAll("/", "");
+                        if (!hostAddress.startsWith("127.0.") && hostAddress.split("\\.").length >= 4)
+                        {
+                        	sHostName = hostAddress;
+                        	if (!addr.isSiteLocalAddress() && !ni.getDisplayName().toLowerCase().startsWith("wlan"))
+                        		break mainLoop;	// otherwise we will keep searching in case we find an ethernet network
+                        }
+	                }
 		        }
 		        if (sHostName == null)
 		        	LOG.error("Unable to convert local address to internet IP");