From cfa0e2973d8c666c9634cde010beb411dc7f10f7 Mon Sep 17 00:00:00 2001 From: seb Date: Thu, 9 Dec 2010 10:29:58 +0000 Subject: [PATCH] Change Candidate's get/setTurnServerAddress() to get/setRelayServerAddress() to be more generic in naming relays. Typos and text formatting. --- src/org/ice4j/ice/Agent.java | 1 - src/org/ice4j/ice/Candidate.java | 31 ++++++++++--------- src/org/ice4j/ice/FoundationsRegistry.java | 2 +- src/org/ice4j/ice/RelayedCandidate.java | 2 +- .../ice/harvest/StunCandidateHarvester.java | 2 +- .../ice/harvest/TurnCandidateHarvest.java | 6 ++-- .../RelayedCandidateDatagramSocket.java | 5 +-- 7 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/org/ice4j/ice/Agent.java b/src/org/ice4j/ice/Agent.java index c96c452..9725c66 100644 --- a/src/org/ice4j/ice/Agent.java +++ b/src/org/ice4j/ice/Agent.java @@ -1171,7 +1171,6 @@ public class Agent if(!pair.isNominated() && !parentStream.validListContainsNomineeForComponent( parentComponent)) - /* && !checkList.containsNomineeForComponent(parentComponent)) */ { pair.nominate(); pair.getParentComponent().getParentStream() diff --git a/src/org/ice4j/ice/Candidate.java b/src/org/ice4j/ice/Candidate.java index bae1451..dee572f 100644 --- a/src/org/ice4j/ice/Candidate.java +++ b/src/org/ice4j/ice/Candidate.java @@ -90,11 +90,11 @@ public abstract class Candidate private TransportAddress stunServerAddress = null; /** - * The address of the TURN server that was used to obtain this - * Candidate. Will be null if this is not a relayed - * candidate. + * The address of the relay server (i.e. TURN, Jingle Nodes, ...) that was + * used to obtain this Candidate. Will be null if this is + * not a relayed candidate. */ - private TransportAddress turnServerAddress = null; + private TransportAddress relayServerAddress = null; /** * The address that our TURN/STUN server returned as mapped if this is a @@ -442,7 +442,6 @@ public abstract class Candidate //IPv4 return 10; } - } /** @@ -511,28 +510,30 @@ public abstract class Candidate } /** - * Returns the address of the TURN server that was used to obtain this - * Candidate or null if this is not a relayed candidate. + * Returns the address of the relay server (i.e. TURN, Jingle Nodes, ...) + * that was used to obtain this Candidate or null if this + * is not a relayed candidate. * - * @return the address of the TURN server that was used to obtain this + * @return the address of the relay server that was used to obtain this * Candidate or null if this is not a relayed candidate. */ - public TransportAddress getTurnServerAddress() + public TransportAddress getRelayServerAddress() { - return turnServerAddress; + return relayServerAddress; } /** - * Sets the address of the TURN server that was used to obtain this - * Candidate. Only makes sense if this is a relayed candidate. + * Sets the address of the relay server (i.e. TURN, Jingle Nodes, ...) that + * was used to obtain this Candidate. Only makes sense if this is a + * relayed candidate. * - * @param address the address of the TURN server that was used to obtain + * @param address the address of the relay server that was used to obtain * this Candidate or null if this is not a relayed * candidate. */ - protected void setTurnServerAddress(TransportAddress address) + protected void setRelayServerAddress(TransportAddress address) { - this.turnServerAddress = address; + this.relayServerAddress = address; } /** diff --git a/src/org/ice4j/ice/FoundationsRegistry.java b/src/org/ice4j/ice/FoundationsRegistry.java index f6e0313..0514112 100644 --- a/src/org/ice4j/ice/FoundationsRegistry.java +++ b/src/org/ice4j/ice/FoundationsRegistry.java @@ -57,7 +57,7 @@ public class FoundationsRegistry server = candidate.getStunServerAddress().getHostAddress(); break; case RELAYED_CANDIDATE: - server = candidate.getTurnServerAddress().getHostAddress(); + server = candidate.getRelayServerAddress().getHostAddress(); break; default: server = null; diff --git a/src/org/ice4j/ice/RelayedCandidate.java b/src/org/ice4j/ice/RelayedCandidate.java index ed63809..616c503 100644 --- a/src/org/ice4j/ice/RelayedCandidate.java +++ b/src/org/ice4j/ice/RelayedCandidate.java @@ -72,7 +72,7 @@ public class RelayedCandidate // RFC 5245: The base of a relayed candidate is that candidate itself. setBase(this); - setTurnServerAddress(turnCandidateHarvest.harvester.stunServer); + setRelayServerAddress(turnCandidateHarvest.harvester.stunServer); setMappedAddress(mappedAddress); } diff --git a/src/org/ice4j/ice/harvest/StunCandidateHarvester.java b/src/org/ice4j/ice/harvest/StunCandidateHarvester.java index 16d2a14..a698496 100644 --- a/src/org/ice4j/ice/harvest/StunCandidateHarvester.java +++ b/src/org/ice4j/ice/harvest/StunCandidateHarvester.java @@ -61,7 +61,7 @@ public class StunCandidateHarvester public final TransportAddress stunServer; /** - * The StunSTack used by this instance for the purposes of STUN + * The StunStack used by this instance for the purposes of STUN * communication. */ private StunStack stunStack; diff --git a/src/org/ice4j/ice/harvest/TurnCandidateHarvest.java b/src/org/ice4j/ice/harvest/TurnCandidateHarvest.java index e33b727..7b57323 100644 --- a/src/org/ice4j/ice/harvest/TurnCandidateHarvest.java +++ b/src/org/ice4j/ice/harvest/TurnCandidateHarvest.java @@ -401,10 +401,12 @@ public class TurnCandidateHarvest /** * Creates a new Request which is to be sent to - * {@link TurnCandidateHarvester#stunServer} in order to start resolving {@link #hostCandidate}. + * {@link TurnCandidateHarvester#stunServer} in order to start resolving + * {@link #hostCandidate}. * * @return a new Request which is to be sent to - * {@link TurnCandidateHarvester#stunServer} in order to start resolving {@link #hostCandidate} + * {@link TurnCandidateHarvester#stunServer} in order to start resolving + * {@link #hostCandidate} * @see StunCandidateHarvest#createRequestToStartResolvingCandidate() */ @Override diff --git a/src/org/ice4j/socket/RelayedCandidateDatagramSocket.java b/src/org/ice4j/socket/RelayedCandidateDatagramSocket.java index 905799d..dc655a7 100644 --- a/src/org/ice4j/socket/RelayedCandidateDatagramSocket.java +++ b/src/org/ice4j/socket/RelayedCandidateDatagramSocket.java @@ -453,7 +453,7 @@ public class RelayedCandidateDatagramSocket /** * Returns the port number on the local host to which this socket is bound. - * RelayedCandidateDatagram returns the port of its + * RelayedCandidateDatagramSocket returns the port of its * localSocketAddress. * * @return the port number on the local host to which this socket is bound @@ -1433,7 +1433,8 @@ public class RelayedCandidateDatagramSocket turnCandidateHarvest.harvester.stunServer); } else - channelDataPacket.setData(channelData, 0, channelDataLength); + channelDataPacket.setData(channelData, 0, + channelDataLength); channelDataSocket.send(channelDataPacket); }