ref: Remove unused "transport" parameter.
This commit is contained in:
parent
f637413a98
commit
64a7ca8c30
@ -410,7 +410,6 @@ public class Agent
|
|||||||
*
|
*
|
||||||
* @param stream the {@link IceMediaStream} that the new {@link Component}
|
* @param stream the {@link IceMediaStream} that the new {@link Component}
|
||||||
* should belong to.
|
* should belong to.
|
||||||
* @param transport the transport protocol used by the component
|
|
||||||
* @param preferredPort the port number that should be tried first when
|
* @param preferredPort the port number that should be tried first when
|
||||||
* binding local <tt>Candidate</tt> sockets for this <tt>Component</tt>.
|
* binding local <tt>Candidate</tt> sockets for this <tt>Component</tt>.
|
||||||
* @param minPort the port number where we should first try to bind before
|
* @param minPort the port number where we should first try to bind before
|
||||||
@ -430,21 +429,20 @@ public class Agent
|
|||||||
* <tt>minPort</tt> and <tt>maxPort</tt> before reaching the maximum allowed
|
* <tt>minPort</tt> and <tt>maxPort</tt> before reaching the maximum allowed
|
||||||
* number of retries.
|
* number of retries.
|
||||||
*/
|
*/
|
||||||
public Component createComponent( IceMediaStream stream,
|
public Component createComponent(
|
||||||
Transport transport,
|
IceMediaStream stream,
|
||||||
int preferredPort,
|
int preferredPort,
|
||||||
int minPort,
|
int minPort,
|
||||||
int maxPort)
|
int maxPort)
|
||||||
throws IllegalArgumentException,
|
throws IllegalArgumentException,
|
||||||
IOException,
|
IOException,
|
||||||
BindException
|
BindException
|
||||||
{
|
{
|
||||||
return createComponent(
|
return createComponent(
|
||||||
stream, transport,
|
stream,
|
||||||
preferredPort, minPort, maxPort,
|
preferredPort, minPort, maxPort,
|
||||||
KeepAliveStrategy.SELECTED_ONLY,
|
KeepAliveStrategy.SELECTED_ONLY,
|
||||||
StackProperties.getBoolean(
|
StackProperties.getBoolean(StackProperties.USE_COMPONENT_SOCKET, true));
|
||||||
StackProperties.USE_COMPONENT_SOCKET, true));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -453,7 +451,6 @@ public class Agent
|
|||||||
*
|
*
|
||||||
* @param stream the {@link IceMediaStream} that the new {@link Component}
|
* @param stream the {@link IceMediaStream} that the new {@link Component}
|
||||||
* should belong to.
|
* should belong to.
|
||||||
* @param transport the transport protocol used by the component
|
|
||||||
* @param preferredPort the port number that should be tried first when
|
* @param preferredPort the port number that should be tried first when
|
||||||
* binding local <tt>Candidate</tt> sockets for this <tt>Component</tt>.
|
* binding local <tt>Candidate</tt> sockets for this <tt>Component</tt>.
|
||||||
* @param minPort the port number where we should first try to bind before
|
* @param minPort the port number where we should first try to bind before
|
||||||
@ -477,7 +474,6 @@ public class Agent
|
|||||||
*/
|
*/
|
||||||
public Component createComponent(
|
public Component createComponent(
|
||||||
IceMediaStream stream,
|
IceMediaStream stream,
|
||||||
Transport transport,
|
|
||||||
int preferredPort,
|
int preferredPort,
|
||||||
int minPort,
|
int minPort,
|
||||||
int maxPort,
|
int maxPort,
|
||||||
@ -488,7 +484,6 @@ public class Agent
|
|||||||
{
|
{
|
||||||
return createComponent(
|
return createComponent(
|
||||||
stream,
|
stream,
|
||||||
transport,
|
|
||||||
preferredPort,
|
preferredPort,
|
||||||
minPort,
|
minPort,
|
||||||
maxPort,
|
maxPort,
|
||||||
@ -502,7 +497,6 @@ public class Agent
|
|||||||
*
|
*
|
||||||
* @param stream the {@link IceMediaStream} that the new {@link Component}
|
* @param stream the {@link IceMediaStream} that the new {@link Component}
|
||||||
* should belong to.
|
* should belong to.
|
||||||
* @param transport the transport protocol used by the component
|
|
||||||
* @param preferredPort the port number that should be tried first when
|
* @param preferredPort the port number that should be tried first when
|
||||||
* binding local <tt>Candidate</tt> sockets for this <tt>Component</tt>.
|
* binding local <tt>Candidate</tt> sockets for this <tt>Component</tt>.
|
||||||
* @param minPort the port number where we should first try to bind before
|
* @param minPort the port number where we should first try to bind before
|
||||||
@ -530,7 +524,6 @@ public class Agent
|
|||||||
*/
|
*/
|
||||||
public Component createComponent(
|
public Component createComponent(
|
||||||
IceMediaStream stream,
|
IceMediaStream stream,
|
||||||
Transport transport,
|
|
||||||
int preferredPort,
|
int preferredPort,
|
||||||
int minPort,
|
int minPort,
|
||||||
int maxPort,
|
int maxPort,
|
||||||
@ -540,15 +533,7 @@ public class Agent
|
|||||||
IOException,
|
IOException,
|
||||||
BindException
|
BindException
|
||||||
{
|
{
|
||||||
if (transport != Transport.UDP)
|
Component component = stream.createComponent(keepAliveStrategy, useComponentSocket);
|
||||||
{
|
|
||||||
throw new IllegalArgumentException(
|
|
||||||
"This implementation does not currently support transport: "
|
|
||||||
+ transport);
|
|
||||||
}
|
|
||||||
|
|
||||||
Component component
|
|
||||||
= stream.createComponent(keepAliveStrategy, useComponentSocket);
|
|
||||||
|
|
||||||
gatherCandidates(component, preferredPort, minPort, maxPort);
|
gatherCandidates(component, preferredPort, minPort, maxPort);
|
||||||
|
|
||||||
|
|||||||
@ -109,7 +109,6 @@ public class RoleConflictResolutionTest
|
|||||||
|
|
||||||
agent.createComponent(
|
agent.createComponent(
|
||||||
iceStream,
|
iceStream,
|
||||||
Transport.UDP,
|
|
||||||
0x400, 0x400, 0xFFFF,
|
0x400, 0x400, 0xFFFF,
|
||||||
KeepAliveStrategy.ALL_SUCCEEDED,
|
KeepAliveStrategy.ALL_SUCCEEDED,
|
||||||
true);
|
true);
|
||||||
|
|||||||
@ -415,15 +415,13 @@ public class Ice
|
|||||||
//simultaneously with the others.
|
//simultaneously with the others.
|
||||||
|
|
||||||
//rtp
|
//rtp
|
||||||
agent.createComponent(
|
agent.createComponent(stream, rtpPort, rtpPort, rtpPort + 100);
|
||||||
stream, Transport.UDP, rtpPort, rtpPort, rtpPort + 100);
|
|
||||||
|
|
||||||
long endTime = System.currentTimeMillis();
|
long endTime = System.currentTimeMillis();
|
||||||
logger.info("RTP Component created in " + (endTime - startTime) + " ms");
|
logger.info("RTP Component created in " + (endTime - startTime) + " ms");
|
||||||
startTime = endTime;
|
startTime = endTime;
|
||||||
//rtcpComp
|
//rtcpComp
|
||||||
agent.createComponent(
|
agent.createComponent(stream, rtpPort + 1, rtpPort + 1, rtpPort + 101);
|
||||||
stream, Transport.UDP, rtpPort + 1, rtpPort + 1, rtpPort + 101);
|
|
||||||
|
|
||||||
endTime = System.currentTimeMillis();
|
endTime = System.currentTimeMillis();
|
||||||
logger.info("RTCP Component created in "
|
logger.info("RTCP Component created in "
|
||||||
|
|||||||
@ -107,8 +107,7 @@ public class IcePseudoTcp
|
|||||||
for (String hostname : hostnames)
|
for (String hostname : hostnames)
|
||||||
{
|
{
|
||||||
agent.addCandidateHarvester(new TurnCandidateHarvester(
|
agent.addCandidateHarvester(new TurnCandidateHarvester(
|
||||||
new TransportAddress(hostname, port,
|
new TransportAddress(hostname, port, Transport.UDP), longTermCredential));
|
||||||
Transport.UDP), longTermCredential));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//STREAM
|
//STREAM
|
||||||
@ -127,8 +126,7 @@ public class IcePseudoTcp
|
|||||||
long startTime = System.currentTimeMillis();
|
long startTime = System.currentTimeMillis();
|
||||||
|
|
||||||
//udp component
|
//udp component
|
||||||
agent.createComponent(
|
agent.createComponent(stream, pTcpPort, pTcpPort, pTcpPort + 100);
|
||||||
stream, Transport.UDP, pTcpPort, pTcpPort, pTcpPort + 100);
|
|
||||||
|
|
||||||
long endTime = System.currentTimeMillis();
|
long endTime = System.currentTimeMillis();
|
||||||
logger.info("UDP Component created in " + (endTime - startTime) + " ms");
|
logger.info("UDP Component created in " + (endTime - startTime) + " ms");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user