From 893a3f0d84ae7858a114751dab7520e8d9411c40 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sun, 2 Mar 2014 14:53:59 -0800
Subject: [PATCH] Route all instructions through monitoring reader.

---
 .../guacamole/net/basic/BasicTunnelRequestUtility.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicTunnelRequestUtility.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicTunnelRequestUtility.java
index 7f1fd6694..eaa9f923a 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicTunnelRequestUtility.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicTunnelRequestUtility.java
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpSession;
 import org.glyptodon.guacamole.GuacamoleClientException;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.io.GuacamoleReader;
 import org.glyptodon.guacamole.net.GuacamoleSocket;
 import org.glyptodon.guacamole.net.GuacamoleTunnel;
 import org.glyptodon.guacamole.net.auth.Connection;
@@ -323,6 +324,12 @@ public class BasicTunnelRequestUtility {
         // Associate socket with tunnel
         GuacamoleTunnel tunnel = new GuacamoleTunnel(socket) {
 
+            @Override
+            public GuacamoleReader acquireReader() {
+                // Monitor instructions which pertain to server-side events
+                return new MonitoringGuacamoleReader(listeners, super.acquireReader());
+            }
+
             @Override
             public void close() throws GuacamoleException {