Merge pull request #7 from DirectProjectJavaRI/develop

Releasing 8.0.1

Author: Greg Meyer

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dns</artifactId>    
     <name>Direct Project DNS services</name>
-    <version>8.0.0</version>
+    <version>8.0.1</version>
     <description>Direct Project DNS services</description>
     <inceptionYear>2010</inceptionYear>
     <url>https://github.com/DirectProjectJavaRI/dns</url> 

src/main/java/org/nhindirect/dns/DNSServerSettings.java

@@ -32,10 +32,13 @@ public class DNSServerSettings extends SocketServerSettings
 	private static final int DEFAULT_PORT = 53;
 	private static final String DEFAULT_BIND_ADDRESS = "0.0.0.0"; // bind to all adapters
 	public  static final int DAFAULT_MAX_REQUEST_SIZE = 1024 * 16;
+	public  static final int DAFAULT_MAX_RECONNECT_ATTEMPTS = 10;
+	
 
 	private int port;
 	private String bindAddress;
 	private int maxRequestSize;
+	private int maxReconnectAttempts;
 
 	/**
 	 * Create default DNS server settings
@@ -46,6 +49,7 @@ public DNSServerSettings()
 		port = DEFAULT_PORT;
 		bindAddress = DEFAULT_BIND_ADDRESS;
 		maxRequestSize = DAFAULT_MAX_REQUEST_SIZE;
+		maxReconnectAttempts = DAFAULT_MAX_RECONNECT_ATTEMPTS;
 	}
 
 	/**
@@ -103,4 +107,26 @@ public void setMaxRequestSize(int maxRequestSize)
 	{
 		this.maxRequestSize = maxRequestSize;
 	}
+	/**
+	 * Gets the maximum number of times the service will attempt to reconnect
+	 * to the underlying IP stack if association is lost.
+	 * 
+	 * @return The maximum number of times the service will attempt to reconnect
+	 * to the underlying IP stack
+	 */
+	public int getMaxReconnectAttempts()
+	{
+		return maxReconnectAttempts;
+	}
+	
+	/**
+	 * Sets the maximum number of times the service will attempt to reconnect
+	 * to the underlying IP stack if association is lost.
+	 * @param maxReconnectAttempts the maximum number of times the service will attempt to reconnect
+	 * to the underlying IP stack
+	 */
+	public void setMaxReconnectAttempts(int maxReconnectAttempts)
+	{
+		this.maxReconnectAttempts = maxReconnectAttempts;
+	}
 }

src/main/java/org/nhindirect/dns/TCPServer.java

@@ -167,6 +167,7 @@ private void reconnect()
 			serverSocket.close();
 		} catch (IOException e) {/* no-op */}
 
+		int numAttempts = 0;
 		serverSocket = null;
 		while (serverSocket == null && running.get())
 		{	
@@ -177,6 +178,13 @@ private void reconnect()
 			}
 			catch (DNSException ex)
 			{
+				++numAttempts;
+				if (numAttempts > settings.getMaxReconnectAttempts())
+				{
+					log.error("Maximum number of TCP rebinds has been exceeded.  The DNS server will terminate");
+					System.exit(-1);
+				}
+				
 				log.error("DNS TCP server socket failed to rebind.  Trying again in 5 seconds.");
 
 				// the socket creation failed.... 

src/main/java/org/nhindirect/dns/UDPServer.java

@@ -166,6 +166,7 @@ private void reconnect()
 		// socket may already be closed, but clean up to be thorough.
 		serverSock.close();
 
+		int numAttempts = 0;
 		serverSock = null;
 		while (serverSock == null && running.get())
 		{	
@@ -176,6 +177,13 @@ private void reconnect()
 			}
 			catch (DNSException ex)
 			{
+				++numAttempts;
+				if (numAttempts > settings.getMaxReconnectAttempts())
+				{
+					log.error("Maximum number of UDP rebinds has been exceeded.  The DNS server will terminate");
+					System.exit(-1);
+				}
+				
 				log.error("DNS UDP server socket failed to rebind.  Trying again in 5 seconds.");
 
 				// the socket creation failed.... 

src/main/java/org/nhindirect/dns/springconfig/DNSServerConfig.java

@@ -16,13 +16,17 @@ public class DNSServerConfig
 	@Value("${direct.dns.binding.address:0.0.0.0}")
 	protected String bindAddress;
 
+	@Value("${direct.dns.binding.maxReconnectAttempts:10}")
+	protected int maxReconnectAttempts;
+	
 	@Bean
 	@ConditionalOnMissingBean
 	public DNSServerSettings dnsServerSettings()
 	{
 		final DNSServerSettings settings = new DNSServerSettings();
 		settings.setBindAddress(bindAddress);
 		settings.setPort(port);
+		settings.setMaxReconnectAttempts(maxReconnectAttempts);
 
 		return settings;
 	}