Added Lifetime to Media Proxy Sessions

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6644 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/mediaproxy/MediaProxy.java

@@ -35,6 +35,9 @@ public class MediaProxy implements SessionListener {
 
     private long idleTime = 90000;
 
+    // Lifetime of a Channel in Seconds
+    private long lifetime = 9000;
+
     /**
      * Contruct a MediaProxy instance that will listen from every Network Interface.
      * Recommended.
@@ -126,6 +129,24 @@ public class MediaProxy implements SessionListener {
         this.maxPort = maxPort;
     }
 
+    /**
+     * Get the Life Time of a channel in seconds
+     *
+     * @return Life Time in Seconds
+     */
+    public long getLifetime() {
+        return lifetime;
+    }
+
+    /**
+     * Sets the Life Time of a Channel in seconds
+     *
+     * @param lifetime Life Time in Seconds
+     */
+    public void setLifetime(long lifetime) {
+        this.lifetime = lifetime;
+    }
+
     /**
      * Get the agent with an especified ID
      *
@@ -146,7 +167,7 @@ public class MediaProxy implements SessionListener {
      * Implements Session Listener stopAgent event.
      * Remove the stopped session from the sessions list.
      *
-     * @param session the session to
+     * @param session the session that stopped
      */
     public void sessionClosed(MediaProxySession session) {
         sessions.remove(session);
@@ -172,6 +193,7 @@ public class MediaProxy implements SessionListener {
         if (session != null) {
             sessions.add(session);
             session.addKeepAlive(idleTime);
+            session.addLifeTime(lifetime);
             session.addAgentListener(this);
         }
         return session;
@@ -197,14 +219,15 @@ public class MediaProxy implements SessionListener {
      */
     public ProxyCandidate addSmartAgent(String id, String creator, String hostA, int portA,
                                         String hostB, int portB) {
-        final SmartSession agent = new SmartSession(id, creator, localhost, hostA, portA, hostB, portB,
+        final SmartSession session = new SmartSession(id, creator, localhost, hostA, portA, hostB, portB,
                 minPort, maxPort);
-        if (agent != null) {
-            sessions.add(agent);
-            agent.addKeepAlive(idleTime);
-            agent.addAgentListener(this);
+        if (session != null) {
+            sessions.add(session);
+            session.addKeepAlive(idleTime);
+            session.addLifeTime(lifetime);
+            session.addAgentListener(this);
         }
-        return agent;
+        return session;
     }
 
     /**

src/java/org/jivesoftware/wildfire/mediaproxy/MediaProxySession.java

@@ -48,6 +48,7 @@ public class MediaProxySession extends Thread implements ProxyCandidate, Datagra
     protected Thread threadBtoAControl;
 
     private Timer idleTimer = null;
+    private Timer lifeTimer = null;
 
     private int minPort = 10000;
     private int maxPort = 20000;
@@ -212,6 +213,16 @@ public class MediaProxySession extends Thread implements ProxyCandidate, Datagra
             e.printStackTrace();
         }
 
+        try {
+            if (lifeTimer != null) {
+                lifeTimer.cancel();
+                lifeTimer.purge();
+                lifeTimer = null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
         channelAtoB.removeListener();
         channelAtoBControl.removeListener();
         channelBtoA.removeListener();
@@ -395,6 +406,25 @@ public class MediaProxySession extends Thread implements ProxyCandidate, Datagra
         }, delay, delay);
     }
 
+    /**
+     * Add a limited life time to the Session.
+     * The Session is stoped and remove from agents List after a certain time.
+     * Prevents that network cycles, refreshes a Session forever.
+     *
+     * @param lifetime time in Seconds to kill the Session
+     */
+    void addLifeTime(long lifetime) {
+        lifetime *= 1000;
+        if (lifeTimer != null) return;
+        lifeTimer = new Timer();
+        lifeTimer.scheduleAtFixedRate(new TimerTask() {
+            public void run() {
+                stopAgent();
+                return;
+            }
+        }, lifetime, lifetime);
+    }
+
     /**
      * Adds a listener for Session events
      *