Made a missing PONG lead to disconnect

Author: Nadahar

src/main/java/org/digitalmediaserver/cast/Channel.java

@@ -40,6 +40,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -188,12 +189,14 @@ public class Channel implements Closeable {
 	@GuardedBy("socketLock")
 	protected InputHandler inputHandler;
 
-	/**
-	 * Counter for producing request numbers
-	 */
+	/** Counter for producing request numbers */
 	@Nonnull
 	protected final AtomicLong requestCounter = new AtomicLong(new Random().nextInt(65536) + 1L);
 
+	/** Counter for pending {@link Pong}s */
+	@Nonnull
+	protected final AtomicInteger pingCounter = new AtomicInteger();
+
 	/**
 	 * Processors of requests by their identifiers
 	 */
@@ -441,6 +444,7 @@ public boolean connect() throws IOException, NoSuchAlgorithmException, KeyManage
 					pingTimer.cancel();
 				}
 				// Start regular pinging
+				pingCounter.set(0);
 				PingTask pingTask = new PingTask();
 				pingTimer = new Timer(remoteName + " PING timer");
 				pingTimer.schedule(pingTask, 1000, PING_PERIOD);
@@ -2410,19 +2414,48 @@ public PingTask() {
 
 		@Override
 		public void run() {
+			int count = pingCounter.get();
+			if (count > 0) {
+				LOGGER.warn(
+					CAST_API_MARKER, "No PONG received for the previous PING from {}, disconnecting", remoteName
+				);
+				try {
+					close();
+				} catch (IOException e) {
+					LOGGER.debug(
+						CAST_API_MARKER,
+						"An error occurred while closing {} socket: {}",
+						remoteName,
+						e.getMessage()
+					);
+				}
+				cancel();
+			}
 			if (LOGGER.isTraceEnabled(CAST_API_HEARTBEAT_MARKER)) {
 				LOGGER.trace(CAST_API_HEARTBEAT_MARKER, "Pinging {}", remoteName);
 			}
 			try {
 				write(message);
+				pingCounter.incrementAndGet();
 			} catch (IOException e) {
 				LOGGER.warn(
 					CAST_API_MARKER,
-					"An error occurred while sending 'PING' to {}: {}",
+					"Disconnecting, because an error occurred while sending 'PING' to {}: {}",
 					remoteName,
 					e.getMessage()
 				);
 				LOGGER.trace(CAST_API_MARKER, "", e);
+				try {
+					close();
+				} catch (IOException ioe) {
+					LOGGER.debug(
+						CAST_API_MARKER,
+						"An error occurred while closing {} socket: {}",
+						remoteName,
+						ioe.getMessage()
+					);
+				}
+				cancel();
 			}
 		}
 	}
@@ -2612,6 +2645,21 @@ public void run() {
 								write(pongMessage);
 							} else if ("PONG".equals(responseType)) {
 								LOGGER.trace(CAST_API_HEARTBEAT_MARKER, "Received PONG from {}", remoteName);
+								while (true) {
+									int current = pingCounter.get();
+									int next = current - 1;
+									if (next < 0) {
+										LOGGER.warn(
+											CAST_API_MARKER,
+											"PING PONG mismatch, received more PONGs than sent PINGs from {}",
+											remoteName
+										);
+										break;
+									}
+									if (pingCounter.compareAndSet(current, next)) {
+										break;
+									}
+								}
 							} else {
 								LOGGER.trace(
 									CAST_API_HEARTBEAT_MARKER,