From 91d32290d336e615e2d8ef7f009e753e146136bb Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Tue, 11 Nov 2014 14:11:52 +0100
Subject: Implemented possible connection to master server via proxy server.
 Currently proxy server is found by DNS searching.

---
 .../java/org/openslx/satellitedaemon/Globals.java  | 33 +++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/openslx/satellitedaemon/Globals.java')

diff --git a/src/main/java/org/openslx/satellitedaemon/Globals.java b/src/main/java/org/openslx/satellitedaemon/Globals.java
index 0b0d287..d75459b 100644
--- a/src/main/java/org/openslx/satellitedaemon/Globals.java
+++ b/src/main/java/org/openslx/satellitedaemon/Globals.java
@@ -50,6 +50,26 @@ public class Globals
 	{
 		return properties.getProperty( "IMAGE_FOLDER" );
 	}
+	
+	public static String getProxyConf()
+	{
+		return properties.getProperty( "PROXY_CONF" );
+	}
+	
+	public static String getProxyAddress()
+	{
+		return properties.getProperty( "PROXY_ADDR" );
+	}
+	
+	public static String getProxyUsername()
+	{
+		return properties.getProperty( "PROXY_USERNAME" );
+	}
+
+	public static String getProxyPassword()
+	{
+		return properties.getProperty( "PROXY_PASSWORD" );
+	}
 
 	// Integers //
 
@@ -58,6 +78,11 @@ public class Globals
 		return tryToParseInt( properties.getProperty( "THRIFT_PORT" ) );
 	}
 
+	public static int getProxyPort()
+	{
+		return tryToParseInt( properties.getProperty( "PROXY_PORT" ) );
+	}
+	
 	/**
 	 * Load properties
 	 */
@@ -129,7 +154,7 @@ public class Globals
 	 * Tries to parse an int. Returns 0 on error.
 	 * 
 	 * @param s
-	 *           The strig to parse
+	 *           The string to parse
 	 * @return The parsed int or 0 on error
 	 */
 	public static int tryToParseInt( String s )
@@ -140,4 +165,10 @@ public class Globals
 			return 0;
 		}
 	}
+	
+	public static boolean checkProxySettings() {
+		return (
+				(getProxyAddress() != "") &&
+				(getProxyPort() != 0));
+	}
 }
-- 
cgit v1.2.3-55-g7522