From 7c1781eb7df671f6a779e55df4f475adaf798f3c Mon Sep 17 00:00:00 2001 From: emcho Date: Tue, 18 May 2010 07:24:23 +0000 Subject: [PATCH] Adds a testing utility that allows running the ICE sample over two distinct stations. --- lib/jain-sdp.jar | Bin 147907 -> 147920 bytes src/org/ice4j/Transport.java | 34 ++++++ src/org/ice4j/ice/Agent.java | 24 ++++ src/org/ice4j/ice/CandidateType.java | 31 +++++ src/org/ice4j/ice/RemoteCandidate.java | 36 ++++++ test/test/Ice.java | 51 +++++++- test/test/SdpUtils.java | 157 ++++++++++++++++++++++++- 7 files changed, 329 insertions(+), 4 deletions(-) diff --git a/lib/jain-sdp.jar b/lib/jain-sdp.jar index fd034e642779d231bb00991ffd6db544aef92091..b61f6364e49054cda9a393f8c85c99735762a2f6 100644 GIT binary patch delta 10013 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 F>VHFzaclqp delta 9965 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 IU_z+>1MZ?GDgXcg diff --git a/src/org/ice4j/Transport.java b/src/org/ice4j/Transport.java index 852f835..05ad973 100644 --- a/src/org/ice4j/Transport.java +++ b/src/org/ice4j/Transport.java @@ -68,4 +68,38 @@ public enum Transport { return transportName; } + + /** + * Returns a Transport instance corresponding to the specified + * transportName. For example, for name "udp", this method + * would return {@link #UDP}. + * + * @param transportName the name that we'd like to parse. + * @return a Transport instance corresponding to the specified + * transportName. + * + * @throws IllegalArgumentException in case transportName is + * not a valid or currently supported transport. + */ + public static Transport parse(String transportName) + throws IllegalArgumentException + { + if(UDP.toString().equals(transportName)) + return UDP; + + if(TCP.toString().equals(transportName)) + return TCP; + + if(TLS.toString().equals(transportName)) + return TLS; + + if(SCTP.toString().equals(transportName)) + return SCTP; + + if(DTLS.toString().equals(transportName)) + return DTLS; + + throw new IllegalArgumentException( + transportName + " is not a currently supported Transport"); + } } diff --git a/src/org/ice4j/ice/Agent.java b/src/org/ice4j/ice/Agent.java index b191671..7c09b7e 100644 --- a/src/org/ice4j/ice/Agent.java +++ b/src/org/ice4j/ice/Agent.java @@ -331,6 +331,7 @@ public class Agent { synchronized(startLock) { + pruneNonMatchedStreams(); initCheckLists(); //change state before we actually send checks so that we don't @@ -340,6 +341,29 @@ public class Agent } } + /** + * Free()s and removes from this agent components or entire streams + * if they do not contain remote candidates. A possible reason for this + * could be the fact that the remote party canceled some of the streams. + */ + private void pruneNonMatchedStreams() + { + for (IceMediaStream stream : getStreams()) + { + for(Component cmp : stream.getComponents()) + { + if(cmp.getRemoteCandidateCount() == 0) + { + stream.removeComponent(cmp); + } + } + + if(stream.getComponentCount() == 0) + removeStream(stream); + } + + } + /** * Indicates whether this {@link Agent} is currently in the process of * running connectivity checks and establishing connectivity. Connectivity diff --git a/src/org/ice4j/ice/CandidateType.java b/src/org/ice4j/ice/CandidateType.java index c0ba658..9647dce 100644 --- a/src/org/ice4j/ice/CandidateType.java +++ b/src/org/ice4j/ice/CandidateType.java @@ -77,4 +77,35 @@ public enum CandidateType { return typeName; } + + /** + * Returns a CandidateType instance corresponding to the specified + * candidateTypeName. For example, for name "host", this method + * would return {@link #HOST_CANDIDATE}. + * + * @param candidateTypeName the name that we'd like to parse. + * @return a CandidateType instance corresponding to the specified + * candidateTypeName. + * + * @throws IllegalArgumentException in case candidateTypeName is + * not a valid or currently supported candidate type. + */ + public static CandidateType parse(String candidateTypeName) + throws IllegalArgumentException + { + if(PEER_REFLEXIVE_CANDIDATE.toString().equals(candidateTypeName)) + return PEER_REFLEXIVE_CANDIDATE; + + if(SERVER_REFLEXIVE_CANDIDATE.toString().equals(candidateTypeName)) + return SERVER_REFLEXIVE_CANDIDATE; + + if(RELAYED_CANDIDATE.toString().equals(candidateTypeName)) + return RELAYED_CANDIDATE; + + if(HOST_CANDIDATE.toString().equals(candidateTypeName)) + return HOST_CANDIDATE; + + throw new IllegalArgumentException( + candidateTypeName + " is not a currently supported CandidateType"); + } } diff --git a/src/org/ice4j/ice/RemoteCandidate.java b/src/org/ice4j/ice/RemoteCandidate.java index a907541..4f2ba33 100644 --- a/src/org/ice4j/ice/RemoteCandidate.java +++ b/src/org/ice4j/ice/RemoteCandidate.java @@ -19,6 +19,10 @@ import org.ice4j.*; public class RemoteCandidate extends Candidate { + /** + * The related address that the remote party sent in SDP, if it did. + */ + private TransportAddress raddr; /** * Creates a RemoteCandidate instance for the specified transport @@ -78,4 +82,36 @@ public class RemoteCandidate return equals(parentCmp.getDefaultRemoteCandidate()); } + + /** + * Returns the TransportAddress that the remote party indicated + * as "related" for this Candidate. + *

+ * Related addresses are present for server reflexive, peer reflexive and + * relayed candidates. If a candidate is server or peer reflexive, + * the related address is equal to the base of this Candidate. + * If the candidate is relayed, the returned address is equal to the mapped + * address. If the candidate is a host candidate then the method returns + * null. + * + * @return the TransportAddress that the remote party indicated + * as "related" for this Candidate or null if they didn't + * include it in SDP. + */ + public TransportAddress getRelatedAddress() + { + return raddr; + } + + /** + * Specifies the TransportAddress that the remote party indicated + * as "related" for this Candidate. + * + * @param relatedAddr the TransportAddress that the remote party + * indicated as "related" for this Candidate. + */ + public void setRelatedAddress(TransportAddress relatedAddr) + { + this.raddr = relatedAddr; + } } diff --git a/test/test/Ice.java b/test/test/Ice.java index 43237f9..c757cdb 100644 --- a/test/test/Ice.java +++ b/test/test/Ice.java @@ -8,8 +8,7 @@ package test; import java.beans.*; -import java.lang.reflect.*; -import java.net.*; +import java.io.*; import java.util.*; import org.ice4j.*; @@ -28,6 +27,14 @@ public class Ice */ static long startTime; + /** + * Runs a test application that allocates streams, generates an SDP, dumps + * it on stdout, waits for a remote peer SDP on stdin, then feeds that + * to our local agent and starts ICE processing. + * + * @param args none currently handled + * @throws Throwable every now and then. + */ public static void main(String[] args) throws Throwable { startTime = System.currentTimeMillis(); @@ -40,10 +47,48 @@ public class Ice //let them fight ... fights forge character. localAgent.setControlling(true); + String localSDP = SdpUtils.createSDPDescription(localAgent); + System.out.println(localSDP); - System.out.println(SdpUtils.createSDPDescription(localAgent)); + String sdp = readSDP(); + SdpUtils.parseSDP(localAgent, sdp); + System.out.println("Agent:"); + System.out.println(localAgent); + } + + /** + * Reads an SDP description from the standard input. We expect descriptions + * provided to this method to be originating from instances of this + * application running on remote computers. + * + * @return whatever we got on stdin (hopefully an SDP description. + * + * @throws Throwable if something goes wrong with console reading. + */ + private static String readSDP() throws Throwable + { + System.out.println("Paste SDP here. Enter an empty line to proceed:"); + System.out.println("(we don't mind the [java] prefix in SDP intput)"); + BufferedReader reader + = new BufferedReader(new InputStreamReader(System.in)); + + StringBuffer buff = new StringBuffer(); + String line = new String(); + + while ( (line = reader.readLine()) != null) + { + line = line.replace("[java]", ""); + line = line.trim(); + if(line.length() == 0) + break; + + buff.append(line); + buff.append("\r\n"); + } + + return buff.toString(); } /** diff --git a/test/test/SdpUtils.java b/test/test/SdpUtils.java index afcb3ff..0c03a32 100644 --- a/test/test/SdpUtils.java +++ b/test/test/SdpUtils.java @@ -10,11 +10,15 @@ import gov.nist.core.*; import gov.nist.javax.sdp.fields.*; import java.util.*; +import java.util.StringTokenizer; import javax.sdp.*; import org.ice4j.*; import org.ice4j.ice.*; +import org.ice4j.ice.Agent; + +import sun.management.*; /** * Utilities for manipulating SDP. The utilities This method do not try @@ -100,11 +104,162 @@ public class SdpUtils return sdess.toString(); } + /** + * Configures localAgent the the remote peer streams, components, + * and candidates specified in sdp + * + * @param localAgent the {@link Agent} that we'd like to configure. + * + * @param sdp the SDP string that the remote peer sent. + * + * @throws Exception for all sorts of reasons. + */ + @SuppressWarnings("unchecked") // jain-sdp legacy code. + public static void parseSDP(Agent localAgent, String sdp) + throws Exception + { + SdpFactory factory = SdpFactory.getInstance(); + SessionDescription sdess = factory.createSessionDescription(sdp); + + localAgent.setRemotePassword(sdess.getAttribute("ice-pwd")); + localAgent.setRemoteUfrag(sdess.getAttribute("ice-ufrag")); + + Connection globalConn = sdess.getConnection(); + String globalConnAddr = null; + if(globalConn != null) + globalConnAddr = globalConn.getAddress(); + + Vector mdescs = sdess.getMediaDescriptions(true); + + for (MediaDescription desc : mdescs) + { + String streamName = desc.getMedia().getMediaType(); + + IceMediaStream stream = localAgent.getStream(streamName); + + if(stream == null) + continue; + + Vector attributes = desc.getAttributes(true); + for( Attribute attribute : attributes) + { + if(!attribute.getName().equals(CandidateAttribute.NAME)) + continue; + + parseCandidate(attribute, stream); + } + + //set default candidates + Connection streamConn = desc.getConnection(); + String streamConnAddr = null; + if(streamConn != null) + streamConnAddr = streamConn.getAddress(); + else + streamConnAddr = globalConnAddr; + + int port = desc.getMedia().getMediaPort(); + + TransportAddress defaultRtpAddress = + new TransportAddress(streamConnAddr, port, Transport.UDP); + + int rtcpPort = port + 1; + String rtcpAttributeValue = desc.getAttribute("rtcp"); + + if (rtcpAttributeValue != null) + rtcpPort = Integer.parseInt(rtcpAttributeValue); + + TransportAddress defaultRtcpAddress = + new TransportAddress(streamConnAddr, rtcpPort, Transport.UDP); + + Component rtpComponent = stream.getComponent(Component.RTP); + Component rtcpComponent = stream.getComponent(Component.RTCP); + + Candidate defaultRtpCandidate + = rtpComponent.findRemoteCandidate(defaultRtpAddress); + Candidate defaultRtcpCandidate + = rtcpComponent.findRemoteCandidate(defaultRtcpAddress); + + rtpComponent.setDefaultRemoteCandidate(defaultRtpCandidate); + rtcpComponent.setDefaultRemoteCandidate(defaultRtcpCandidate); + } + } + + /** + * Parses the attribute. + * + * @param attribute the attribute that we need to parse. + * @param stream the {@link IceMediaStream} that the candidate is supposed + * to belong to. + * + * @return a newly created {@link RemoteCandidate} matching the + * content of the specified attribute or null if the + * candidate belonged to a component we don't have. + */ + private static RemoteCandidate parseCandidate(Attribute attribute, + IceMediaStream stream) + { + String value = null; + + try{ + value = attribute.getValue(); + }catch (Throwable t){}//can't happen + + StringTokenizer tokenizer = new StringTokenizer(value); + + //XXX add exception handling. + String foundation = tokenizer.nextToken(); + int componentID = Integer.parseInt( tokenizer.nextToken() ); + Transport transport = Transport.parse(tokenizer.nextToken()); + long priority = Long.parseLong(tokenizer.nextToken()); + String address = tokenizer.nextToken(); + int port = Integer.parseInt(tokenizer.nextToken()); + + TransportAddress transAddr + = new TransportAddress(address, port, transport); + + tokenizer.nextToken(); //skip the "typ" String + CandidateType type = CandidateType.parse(tokenizer.nextToken()); + + Component component = stream.getComponent(componentID); + + if(component == null) + return null; + + RemoteCandidate cand = new RemoteCandidate(transAddr, component, type, + foundation, priority); + + component.addRemoteCandidate(cand); + + // check if there's a related address property + + if (tokenizer.countTokens() >= 4) + { + tokenizer.nextToken(); // skip the raddr element + String relatedAddr = tokenizer.nextToken(); + tokenizer.nextToken(); // skip the rport element + int relatedPort = Integer.parseInt(tokenizer.nextToken()); + + TransportAddress raddr = new TransportAddress( + relatedAddr, relatedPort, Transport.UDP); + + cand.setRelatedAddress(raddr); + } + + return cand; + } + + + /** * An implementation of the candidate SDP attribute. */ private static class CandidateAttribute extends AttributeField { + /** + * The SDP name of candidate attributes. + */ + public static final String NAME = "candidate"; + /** * This class's serial version uid. */ @@ -131,7 +286,7 @@ public class SdpUtils */ public String getName() { - return "candidate"; + return NAME; } /**