diff --git a/build.xml b/build.xml index 5b0f4fc..8869c70 100644 --- a/build.xml +++ b/build.xml @@ -13,6 +13,7 @@ + diff --git a/lib/jain-sdp.jar b/lib/jain-sdp.jar new file mode 100644 index 0000000..fd034e6 Binary files /dev/null and b/lib/jain-sdp.jar differ diff --git a/test/test/Ice.java b/test/test/Ice.java index 703bf3c..43237f9 100644 --- a/test/test/Ice.java +++ b/test/test/Ice.java @@ -28,17 +28,37 @@ public class Ice */ static long startTime; + public static void main(String[] args) throws Throwable + { + startTime = System.currentTimeMillis(); + + Agent localAgent = createAgent(9090); + localAgent.setNominationStrategy( + NominationStrategy.NOMINATE_HIGHEST_PRIO); + + localAgent.addStateChangeListener(new IceProcessingListener()); + + //let them fight ... fights forge character. + localAgent.setControlling(true); + + System.out.println(SdpUtils.createSDPDescription(localAgent)); + + + } + /** * Runs the test * @param args command line arguments * * @throws Throwable if bad stuff happens. */ - public static void main(String[] args) throws Throwable + public static void main2(String[] args) throws Throwable { startTime = System.currentTimeMillis(); Agent localAgent = createAgent(9090); + localAgent.setNominationStrategy( + NominationStrategy.NOMINATE_HIGHEST_PRIO); Agent remotePeer = createAgent(6060); localAgent.addStateChangeListener(new IceProcessingListener()); @@ -118,7 +138,7 @@ public class Ice } } - System.out.println("Printing the check lists:"); + System.out.println("Printing the completed check lists:"); for(IceMediaStream stream : streams) { String streamName = stream.getName(); @@ -180,7 +200,7 @@ public class Ice { int id = localComponent.getComponentID(); - Component remoteComponent = remoteStream.getComponnet(id); + Component remoteComponent = remoteStream.getComponent(id); if(remoteComponent != null) transferRemoteCandidates(localComponent, remoteComponent); @@ -245,7 +265,7 @@ public class Ice agent.addCandidateHarvester(stun6Harv); createStream(rtpPort, "audio", agent); - //createStream(rtpPort + 2, "video", agent); + createStream(rtpPort + 2, "video", agent); return agent; } @@ -285,8 +305,8 @@ public class Ice + (endTime - startTime) +" ms"); startTime = endTime; //rtcpComp - //agent.createComponent( - // stream, Transport.UDP, rtpPort + 1, rtpPort + 1, rtpPort + 101); + agent.createComponent( + stream, Transport.UDP, rtpPort + 1, rtpPort + 1, rtpPort + 101); endTime = System.currentTimeMillis(); System.out.println("RTCP Component created in " @@ -294,102 +314,4 @@ public class Ice return stream; } - - /** - * Runs the test - * @param args cmd line args - * - * @throws Throwable if bad stuff happens. - */ - public static void main2(String[] args) throws Throwable - { - //Agent agent = new Agent(); - //IceMediaStream stream = agent.createMediaStream("audio"); - - //rtp - //Component rtpComp = stream.createComponent(Transport.UDP, 9090); - //rtcpComp - //Component rtcpComp = stream.createComponent(Transport.UDP, 9091); - - // find a loopback interface - - - Enumeration interfaces - = NetworkInterface.getNetworkInterfaces(); - - while (interfaces.hasMoreElements()) - { - NetworkInterface iface = interfaces.nextElement(); - - System.out.println(iface.getName() - + " isLoopback=" + isLoop(iface)); - System.out.println(iface.getName() - + " isUp=" + isUp(iface)); - System.out.println(iface.getName() - + " isVirtual=" + isVirtual(iface)); - } - } - - public static boolean isLoop(NetworkInterface iface) - { - try - { - Method method = iface.getClass().getMethod("isLoopback"); - - System.out.println("It works!"); - - return ((Boolean)method.invoke(iface)).booleanValue(); - } - catch(Throwable t) - { - //apparently we are not running in a JVM that supports the - //is Loopback method. we'll try another approach. - System.out.println("Doesn't work"); - } - - Enumeration addresses = iface.getInetAddresses(); - - return addresses.hasMoreElements() - && addresses.nextElement().isLoopbackAddress(); - } - - public static boolean isUp(NetworkInterface iface) - { - try - { - Method method = iface.getClass().getMethod("isUp"); - - System.out.println("It works!"); - - return ((Boolean)method.invoke(iface)).booleanValue(); - } - catch(Throwable t) - { - //apparently we are not running in a JVM that supports the - //is Loopback method. we'll try another approach. - System.out.println("Doesn't work"); - } - - return true; - } - - public static boolean isVirtual(NetworkInterface iface) - { - try - { - Method method = iface.getClass().getMethod("isVirtual"); - - System.out.println("It works!"); - - return ((Boolean)method.invoke(iface)).booleanValue(); - } - catch(Throwable t) - { - //apparently we are not running in a JVM that supports the - //is Loopback method. we'll try another approach. - System.out.println("Doesn't work"); - } - - return false; - } } diff --git a/test/test/SdpUtils.java b/test/test/SdpUtils.java new file mode 100644 index 0000000..afcb3ff --- /dev/null +++ b/test/test/SdpUtils.java @@ -0,0 +1,232 @@ +/* + * ice4j, the OpenSource Java Solution for NAT and Firewall Traversal. + * Maintained by the SIP Communicator community (http://sip-communicator.org). + * + * Distributable under LGPL license. See terms of license at gnu.org. + */ +package test; + +import gov.nist.core.*; +import gov.nist.javax.sdp.fields.*; + +import java.util.*; + +import javax.sdp.*; + +import org.ice4j.*; +import org.ice4j.ice.*; + +/** + * Utilities for manipulating SDP. The utilities This method do not try + * to act smart and make a lot of assumptions (e.g. at least one media stream + * with at least one component) that may not always be true in real life and + * lead to exceptions. Therefore, make sure you reread the code if reusing it + * in an application. It should be fine for the purposes of our ice4j examples + * though. + * + * @author Emil Ivov + */ +public class SdpUtils +{ + /** + * Creates a session description containing the streams from the specified + * agent using dummy codecs. + * + * @param agent the {@link Agent} we'd like to generate. + * + * @return a {@link SessionDescription} representing agent's + * streams. + * + * @throws Throwable on rainy days + */ + public static String createSDPDescription(Agent agent) throws Throwable + { + SdpFactory factory = SdpFactory.getInstance(); + SessionDescription sdess = factory.createSessionDescription(); + Vector sessionAttributes = new Vector(); + + TransportAddress defaultAddress = agent.getStreams().get(0) + .getComponent(Component.RTP).getDefaultCandidate() + .getTransportAddress(); + + String addrType = defaultAddress.isIPv6() + ? Connection.IP6 + : Connection.IP4; + + //origin (use ip from the first component of the first stream) + Origin o = factory.createOrigin("ice4j.org", 0, 0, "IN", addrType, + defaultAddress.getHostAddress()); + sdess.setOrigin(o); + + //connection (again use ip from first stream's component) + Connection c = factory.createConnection("IN", addrType, + defaultAddress.getHostAddress() ); + sdess.setConnection(c); + + //ice u-frag and password + sessionAttributes.add(factory.createAttribute("ice-pwd", + agent.getLocalPassword())); + sessionAttributes.add(factory.createAttribute("ice-ufrag", + agent.getLocalUfrag())); + + //m lines + List streams = agent.getStreams(); + Vector mDescs = new Vector( + agent.getStreamCount()); + for(IceMediaStream stream : streams) + { + TransportAddress streamDefaultAddr = stream.getComponent( + Component.RTP).getDefaultCandidate().getTransportAddress(); + MediaDescription mdesc = factory.createMediaDescription( + stream.getName(), streamDefaultAddr.getPort(), + 1, SdpConstants.RTP_AVP, new int[]{0}); + + Vector candidates = new Vector(); + for(Component component : stream.getComponents()) + { + for(Candidate cand : component.getLocalCandidates()) + { + candidates.add(new CandidateAttribute(cand)); + } + } + + mdesc.setAttributes(candidates); + + mDescs.add(mdesc); + } + + sdess.setAttributes(sessionAttributes); + sdess.setMediaDescriptions(mDescs); + return sdess.toString(); + } + + /** + * An implementation of the candidate SDP attribute. + */ + private static class CandidateAttribute extends AttributeField + { + /** + * This class's serial version uid. + */ + private static final long serialVersionUID = 1L; + + /** + * The Candidate that we will be encapsulating. + */ + private final Candidate candidate; + + /** + * Creates an attribute instance + * + * @param candidate the Candidate + */ + public CandidateAttribute(Candidate candidate) + { + this.candidate = candidate; + } + /** + * Returns the name of this attribute + * + * @return a String identity. + */ + public String getName() + { + return "candidate"; + } + + /** + * Does nothing . + * + * @param name ignored. + */ + public void setName(String name){} + + /** + * Always returns true as this attribute always has a value. + * + * @return true if the attribute has a value. + */ + public boolean hasValue() + { + return true; + }; + + /** + * Returns the value of this attribute. + * + * @return the value + */ + public String getValue() + { + StringBuffer buff= new StringBuffer(); + + buff.append(candidate.getFoundation()); + buff.append(" ").append( + candidate.getParentComponent().getComponentID()); + buff.append(" ").append(candidate.getTransport()); + buff.append(" ").append(candidate.getPriority()); + buff.append(" ").append( + candidate.getTransportAddress().getHostAddress()); + buff.append(" ").append( + candidate.getTransportAddress().getPort()); + buff.append(" typ ").append( + candidate.getType()); + + TransportAddress relAddr = candidate.getRelatedAddress(); + + if(relAddr != null) + { + buff.append(" raddr ").append(relAddr.getHostAddress()); + buff.append(" rport ").append(relAddr.getPort()); + } + + return buff.toString(); + } + + /** + * Parses the value of this attribute. + * + * @param value the - attribute value + * + * @throws SdpException if there's a problem with the value + * String. + */ + public void setValue(String value) throws SdpException + { + + } + + /** + * Returns the type character for the field. + * + * @return the type character for the field. + */ + public char getTypeChar() + { + return 'a'; + } + + /** + * Returns a reference to this attribute. + * + * @return a reference to this attribute. + */ + public CandidateAttribute clone() + { + return this; + } + + /** + * Returns the string encoded version of this object + * + * @return the string encoded version of this object + */ + public String encode() + { + StringBuffer sbuff = new StringBuffer(ATTRIBUTE_FIELD); + sbuff.append(getName()).append(Separators.COLON); + sbuff.append(getValue()); + return sbuff.append(Separators.NEWLINE).toString(); + } + } +}