diff --git a/src/org/ice4j/ice/Agent.java b/src/org/ice4j/ice/Agent.java index 70f363c..990a668 100644 --- a/src/org/ice4j/ice/Agent.java +++ b/src/org/ice4j/ice/Agent.java @@ -440,7 +440,7 @@ public class Agent } /** - * Starts an asynchronous harvest across all components and reports newly + * Starts an asynchronous(?) harvest across all components and reports newly * discovered candidates to trickleCallback. * * @param trickleCallback the callback that will be notified for all newly diff --git a/src/org/ice4j/ice/CheckList.java b/src/org/ice4j/ice/CheckList.java index 41ed1e3..14e8404 100644 --- a/src/org/ice4j/ice/CheckList.java +++ b/src/org/ice4j/ice/CheckList.java @@ -182,8 +182,8 @@ public class CheckList if(highestPriorityPair != null) return highestPriorityPair; - for (CandidatePair pair : this) - { + for (CandidatePair pair : this) + { if (pair.getState() == CandidatePairState.FROZEN) { if(highestPriorityPair == null diff --git a/src/org/ice4j/ice/ConnectivityCheckClient.java b/src/org/ice4j/ice/ConnectivityCheckClient.java index e79e321..e507979 100644 --- a/src/org/ice4j/ice/ConnectivityCheckClient.java +++ b/src/org/ice4j/ice/ConnectivityCheckClient.java @@ -169,7 +169,7 @@ class ConnectivityCheckClient * * @param candidatePair that {@link CandidatePair} that we'd like to start * a check for. - * @param originalWiatInterval + * @param originalWaitInterval * @param maxWaitInterval * @param maxRetransmissions * @return a reference to the {@link TransactionID} used in the connectivity @@ -178,7 +178,7 @@ class ConnectivityCheckClient */ protected TransactionID startCheckForPair( CandidatePair candidatePair, - int originalWiatInterval, + int originalWaitInterval, int maxWaitInterval, int maxRetransmissions) { @@ -266,7 +266,7 @@ class ConnectivityCheckClient localCandidate.getBase().getTransportAddress(), this, tran, - originalWiatInterval, + originalWaitInterval, maxWaitInterval, maxRetransmissions); if(logger.isLoggable(Level.FINEST)) diff --git a/src/org/ice4j/ice/IceMediaStream.java b/src/org/ice4j/ice/IceMediaStream.java index d63e677..b2b6d59 100644 --- a/src/org/ice4j/ice/IceMediaStream.java +++ b/src/org/ice4j/ice/IceMediaStream.java @@ -344,8 +344,8 @@ public class IceMediaStream } /** - * Creates, initializes and orders the list of candidate pairs that would - * be used for the connectivity checks for all components in this stream. + * Creates and adds to checkList all the CandidatePairs + * in all Components of this stream. * * @param checkList the list that we need to update with the new pairs. */ @@ -372,6 +372,7 @@ public class IceMediaStream for(LocalCandidate lc : localCnds) { + // XXX do we assume a single UPNPCandidate here? if(lc instanceof UPNPCandidate) upnpBase = lc.getBase(); } diff --git a/src/org/ice4j/message/Message.java b/src/org/ice4j/message/Message.java index 295e5af..a577d7c 100644 --- a/src/org/ice4j/message/Message.java +++ b/src/org/ice4j/message/Message.java @@ -235,49 +235,48 @@ public abstract class Message */ public static final char DATA_INDICATION = (TURN_METHOD_DATA | STUN_INDICATION); - + /** * TURN Connect Request code. */ public static final char CONNECT_REQUEST = - (TURN_METHOD_CONNECT | STUN_REQUEST); - + (TURN_METHOD_CONNECT | STUN_REQUEST); + /** * TURN Connect Success Response code. */ public static final char CONNECT_RESPONSE = - (TURN_METHOD_CONNECT | STUN_SUCCESS_RESP); - + (TURN_METHOD_CONNECT | STUN_SUCCESS_RESP); + /** * TURN Connect Error Response code. */ public static final char CONNECT_ERROR_RESPONSE = - (TURN_METHOD_CONNECT | STUN_ERROR_RESP); - + (TURN_METHOD_CONNECT | STUN_ERROR_RESP); + /** * TURN Connection Bind Request code. */ public static final char CONNECTION_BIND_REQUEST = - (TURN_METHOD_CONNECTION_BIND | STUN_REQUEST); - + (TURN_METHOD_CONNECTION_BIND | STUN_REQUEST); + /** * TURN Connection Bind Success Response code. */ public static final char CONNECTION_BIND_SUCCESS_RESPONSE = - (TURN_METHOD_CONNECTION_BIND | STUN_SUCCESS_RESP); - + (TURN_METHOD_CONNECTION_BIND | STUN_SUCCESS_RESP); + /** * TURN Connection Bind error code. */ public static final char CONNECTION_BIND_ERROR_RESPONSE = - (TURN_METHOD_CONNECTION_BIND | STUN_ERROR_RESP); - - + (TURN_METHOD_CONNECTION_BIND | STUN_ERROR_RESP); + /** * TURN Connection Attempt Indication code. */ public static final char CONNECTION_ATTEMPT_INDICATION = - (TURN_METHOD_CONNECTION_ATTEMPT | STUN_INDICATION); + (TURN_METHOD_CONNECTION_ATTEMPT | STUN_INDICATION); /* Old TURN method */ /**