sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modified so that a -1 UDP port completely disables UDP.

Browse Source 
Client and server should match or bad things happen and it
might be worth adding this to the connection negotation
as a validation.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7106 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
PSp..om 2011-03-24 19:26:09 +00:00
parent 1a878a7ef7
commit 73305755bc
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engine/src/networking/com/jme3/network/Network.java
View File

@ -81,11 +81,12 @@ public class Network
* *
* @param gameName This is the name that identifies the game. Connecting clients * @param gameName This is the name that identifies the game. Connecting clients
* must use this name or be turned away. * must use this name or be turned away.
* @param gersion This is a game-specific verison that helps detect when out-of-date * @param version This is a game-specific verison that helps detect when out-of-date
* clients have connected to an incompatible server. * clients have connected to an incompatible server.
* @param tcpPort The port upon which the TCP hosting will listen for new connections. * @param tcpPort The port upon which the TCP hosting will listen for new connections.
* @param udpPort The port upon which the UDP hosting will listen for new 'fast' UDP * @param udpPort The port upon which the UDP hosting will listen for new 'fast' UDP
* messages. * messages. Set to -1 if 'fast' traffic should go over TCP. This will
* comletely disable UDP traffic for this server.
*/ */
public static Server createServer( String gameName, int version, int tcpPort, int udpPort ) throws IOException public static Server createServer( String gameName, int version, int tcpPort, int udpPort ) throws IOException
{ {
@ -144,12 +145,24 @@ public class Network
/** /**
* Creates a Client that communicates with the specified host and and separate TCP and UDP ports * Creates a Client that communicates with the specified host and and separate TCP and UDP ports
* using both reliable and fast transports. * using both reliable and fast transports.
*
* @param gameName This is the name that identifies the game. This must match
* the target server's name or this client will be turned away.
* @param version This is a game-specific verison that helps detect when out-of-date
* clients have connected to an incompatible server. This must match
* the server's version of this client will be turned away.
* @param tcpPort The remote TCP port on the server to which this client should
* send reliable messages.
* @param udpPort The remote UDP port on the server to which this client should
* send 'fast'/unreliable messages. Set to -1 if 'fast' traffic should
* go over TCP. This will completely disable UDP traffic for this
* client.
*/ */
public static Client connectToServer( String gameName, int version, public static Client connectToServer( String gameName, int version,
String host, int hostPort, int remoteUdpPort ) throws IOException String host, int hostPort, int remoteUdpPort ) throws IOException
{ {
InetAddress remoteAddress = InetAddress.getByName(host); InetAddress remoteAddress = InetAddress.getByName(host);
UdpConnector fast = new UdpConnector( remoteAddress, remoteUdpPort ); UdpConnector fast = remoteUdpPort == -1 ? null : new UdpConnector( remoteAddress, remoteUdpPort );
SocketConnector reliable = new SocketConnector( remoteAddress, hostPort ); SocketConnector reliable = new SocketConnector( remoteAddress, hostPort );
return new DefaultClient( gameName, version, reliable, fast ); return new DefaultClient( gameName, version, reliable, fast );

14
engine/src/networking/com/jme3/network/NetworkClient.java
View File

@ -46,8 +46,22 @@ import java.net.InetAddress;
*/ */
public interface NetworkClient extends Client public interface NetworkClient extends Client
{ {
/**
* Connects this client to the specified remote server and ports.
*/
public void connectToServer( String host, int port, int remoteUdpPort ) throws IOException; public void connectToServer( String host, int port, int remoteUdpPort ) throws IOException;
/**
* Connects this client to the specified remote server and ports.
*
* @param address The hosts internet address.
* @param tcpPort The remote TCP port on the server to which this client should
* send reliable messages.
* @param udpPort The remote UDP port on the server to which this client should
* send 'fast'/unreliable messages. Set to -1 if 'fast' traffic should
* go over TCP. This will completely disable UDP traffic for this
* client.
*/
public void connectToServer( InetAddress address, int port, int remoteUdpPort ) throws IOException; public void connectToServer( InetAddress address, int port, int remoteUdpPort ) throws IOException;
} }

2
engine/src/networking/com/jme3/network/base/DefaultClient.java
View File

@ -91,9 +91,7 @@ public class DefaultClient implements Client
this.reliable = reliable; this.reliable = reliable;
this.fast = fast; this.fast = fast;
if( reliable != null ) {
reliableAdapter = new ConnectorAdapter(reliable, dispatcher, true); reliableAdapter = new ConnectorAdapter(reliable, dispatcher, true);
}
if( fast != null ) { if( fast != null ) {
fastAdapter = new ConnectorAdapter(fast, dispatcher, false); fastAdapter = new ConnectorAdapter(fast, dispatcher, false);
} }