Adds an IceProcessingState tracking to Agents
This commit is contained in:
parent
3c3f40a38f
commit
3476b9194d
@ -7,6 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.ice4j.ice;
|
package org.ice4j.ice;
|
||||||
|
|
||||||
|
import java.beans.*;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.math.*;
|
import java.math.*;
|
||||||
import java.net.*;
|
import java.net.*;
|
||||||
@ -135,15 +136,24 @@ public class Agent
|
|||||||
= new ConnectivityCheckServer(this);
|
= new ConnectivityCheckServer(this);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates whether this agent has both sent and received candidate lists
|
* Indicates the state of ICE processing in this <tt>Agent</tt>. An
|
||||||
* and started connectivity establishment. This is important in cases like
|
* <tt>Agent</tt> is in the Waiting state until it has both sent and
|
||||||
* determining whether a remote address we've just discovered is peer
|
* received candidate lists and started connectivity establishment. The
|
||||||
* reflexive or not. If iceStarted is true and we don't know about the
|
* difference between the Waiting and the Running states is important in
|
||||||
|
* cases like determining whether a remote address we've just discovered is
|
||||||
|
* peer reflexive or not. If iceStarted is true and we don't know about the
|
||||||
* address then we should add it to the list of candidates. Otherwise
|
* address then we should add it to the list of candidates. Otherwise
|
||||||
* we should wait for the remote party to send their media description
|
* we should wait for the remote party to send their media description
|
||||||
* before being able to determine.
|
* before being able to determine.
|
||||||
*/
|
*/
|
||||||
private boolean iceStarted = false;
|
private IceProcessingState state = IceProcessingState.WAITING;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Contains {@link PropertyChangeListener}s registered with this {@link
|
||||||
|
* Agent} and following its changes of state.
|
||||||
|
*/
|
||||||
|
private List<PropertyChangeListener> stateListeners
|
||||||
|
= new LinkedList<PropertyChangeListener>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an empty <tt>Agent</tt> with no streams, and no address
|
* Creates an empty <tt>Agent</tt> with no streams, and no address
|
||||||
@ -315,7 +325,87 @@ public class Agent
|
|||||||
*/
|
*/
|
||||||
public boolean isStarted()
|
public boolean isStarted()
|
||||||
{
|
{
|
||||||
return iceStarted;
|
return state != IceProcessingState.WAITING;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the state of ICE processing for this <tt>Agent</tt>.
|
||||||
|
*
|
||||||
|
* @return the state of ICE processing for this <tt>Agent</tt>.
|
||||||
|
*/
|
||||||
|
public IceProcessingState getState()
|
||||||
|
{
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds <tt>l</tt> to the list of listeners tracking changes of the
|
||||||
|
* {@link IceProcessingState} of this <tt>Agent</tt>
|
||||||
|
*
|
||||||
|
* @param l the listener to register.
|
||||||
|
*/
|
||||||
|
public void addStateChangeListener(PropertyChangeListener l)
|
||||||
|
{
|
||||||
|
synchronized(stateListeners)
|
||||||
|
{
|
||||||
|
if(!stateListeners.contains(l))
|
||||||
|
this.stateListeners.add(l);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes <tt>l</tt> from the list of listeners tracking changes of the
|
||||||
|
* {@link IceProcessingState} of this <tt>Agent</tt>
|
||||||
|
*
|
||||||
|
* @param l the listener to remove.
|
||||||
|
*/
|
||||||
|
public void removeStateChangeListener(PropertyChangeListener l)
|
||||||
|
{
|
||||||
|
synchronized(stateListeners)
|
||||||
|
{
|
||||||
|
this.stateListeners.remove(l);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new {@link PropertyChangeEvent} and delivers it to all
|
||||||
|
* currently registered state listeners.
|
||||||
|
*
|
||||||
|
* @param oldState the {@link IceProcessingState} we had before the change
|
||||||
|
* @param newState the {@link IceProcessingState} we had after the change
|
||||||
|
*/
|
||||||
|
private void fireStateChange(IceProcessingState oldState,
|
||||||
|
IceProcessingState newState)
|
||||||
|
{
|
||||||
|
List<PropertyChangeListener> listenersCopy;
|
||||||
|
|
||||||
|
synchronized(stateListeners)
|
||||||
|
{
|
||||||
|
listenersCopy
|
||||||
|
= new LinkedList<PropertyChangeListener>(stateListeners);
|
||||||
|
}
|
||||||
|
|
||||||
|
PropertyChangeEvent evt = new PropertyChangeEvent(
|
||||||
|
this, "IceProcessingState", oldState, newState);
|
||||||
|
|
||||||
|
for(PropertyChangeListener l : listenersCopy)
|
||||||
|
{
|
||||||
|
l.propertyChange(evt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the {@link IceProcessingState} of this <tt>Agent</tt> to
|
||||||
|
* <tt>newState</tt> and triggers the corresponding change event.
|
||||||
|
*
|
||||||
|
* @param newState the new state of ICE processing for this <tt>Agent</tt>.
|
||||||
|
*/
|
||||||
|
private void setState(IceProcessingState newState)
|
||||||
|
{
|
||||||
|
IceProcessingState oldState = state;
|
||||||
|
|
||||||
|
this.state = state;
|
||||||
|
fireStateChange(oldState, newState)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
package test;
|
package test;
|
||||||
|
|
||||||
|
import java.beans.*;
|
||||||
import java.lang.reflect.*;
|
import java.lang.reflect.*;
|
||||||
import java.net.*;
|
import java.net.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@ -35,6 +36,8 @@ public class Ice
|
|||||||
Agent localAgent = createAgent(9090);
|
Agent localAgent = createAgent(9090);
|
||||||
Agent remotePeer = createAgent(6060);
|
Agent remotePeer = createAgent(6060);
|
||||||
|
|
||||||
|
localAgent.addStateChangeListener(new IceProcessingListener());
|
||||||
|
|
||||||
//let them fight ... fights forge character.
|
//let them fight ... fights forge character.
|
||||||
//localAgent.setControlling(true);
|
//localAgent.setControlling(true);
|
||||||
//remotePeer.setControlling(false);
|
//remotePeer.setControlling(false);
|
||||||
@ -62,7 +65,32 @@ public class Ice
|
|||||||
System.out.println("Total execution time: "
|
System.out.println("Total execution time: "
|
||||||
+ (endTime - startTime) + "ms");
|
+ (endTime - startTime) + "ms");
|
||||||
|
|
||||||
Thread.sleep(25000);
|
//Give processing enough time to finish. We'll System.exit() anyway
|
||||||
|
//as soon as localAgent enters a final state.
|
||||||
|
Thread.sleep(60000);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The listener that would end example execution once we enter the
|
||||||
|
* completed state.
|
||||||
|
*/
|
||||||
|
public static final class IceProcessingListener
|
||||||
|
implements PropertyChangeListener
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* System.exit()s as soon as ICE processing enters a final state.
|
||||||
|
*
|
||||||
|
* @param evt the {@link PropertyChangeEvent} containing the old and new
|
||||||
|
* states of ICE processing.
|
||||||
|
*/
|
||||||
|
public void propertyChange(PropertyChangeEvent evt)
|
||||||
|
{
|
||||||
|
if(evt.getNewValue() == IceProcessingState.COMPLETED
|
||||||
|
|| evt.getNewValue() == IceProcessingState.FAILED)
|
||||||
|
{
|
||||||
|
System.exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user