Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6434:41d13007af23
8028293: Check local configuration for actual ephemeral port range
Reviewed-by: alanb, chegar, smarks
line wrap: on
line diff
--- a/make/java/net/FILES_c.gmk Sun Nov 24 13:08:16 2013 +0000 +++ b/make/java/net/FILES_c.gmk Fri Mar 21 18:39:16 2014 +0000 @@ -24,20 +24,21 @@ # FILES_c = \ - DatagramPacket.c \ - InetAddress.c \ - Inet4Address.c \ - Inet6Address.c \ - NetworkInterface.c \ - InetAddressImplFactory.c \ - Inet4AddressImpl.c \ - Inet6AddressImpl.c \ - SocketInputStream.c \ - SocketOutputStream.c \ - net_util.c \ - net_util_md.c \ - ResolverConfigurationImpl.c \ - DefaultProxySelector.c + DatagramPacket.c \ + InetAddress.c \ + Inet4Address.c \ + Inet6Address.c \ + NetworkInterface.c \ + InetAddressImplFactory.c \ + Inet4AddressImpl.c \ + Inet6AddressImpl.c \ + SocketInputStream.c \ + SocketOutputStream.c \ + net_util.c \ + net_util_md.c \ + portconfig.c \ + ResolverConfigurationImpl.c \ + DefaultProxySelector.c ifeq ($(PLATFORM), linux) FILES_c += linux_close.c
--- a/make/java/net/Makefile Sun Nov 24 13:08:16 2013 +0000 +++ b/make/java/net/Makefile Fri Mar 21 18:39:16 2014 +0000 @@ -69,7 +69,7 @@ java/net/ProtocolException.java \ sun/net/spi/DefaultProxySelector.java -ifeq ($(PLATFORM), windows) +ifeq ($(PLATFORM), windows) FILES_export += java/net/TwoStacksPlainSocketImpl.java FILES_export += java/net/DualStackPlainSocketImpl.java FILES_export += java/net/TwoStacksPlainDatagramSocketImpl.java @@ -83,7 +83,8 @@ # Find platform specific native code # vpath %.c $(PLATFORM_SRC)/native/sun/net/dns $(PLATFORM_SRC)/native/sun/net/www/protocol/http/ntlm \ - $(PLATFORM_SRC)/native/sun/net/sdp $(PLATFORM_SRC)/native/sun/net/spi + $(PLATFORM_SRC)/native/sun/net/sdp $(PLATFORM_SRC)/native/sun/net/spi \ + $(PLATFORM_SRC)/native/sun/net ifndef USE_SYSTEM_GCONF vpath %.c $(PLATFORM_SRC)/native/common/deps/gconf2 @@ -144,17 +145,17 @@ MISC_FILES = $(LIBDIR) $(LIBDIR)/net.properties $(LIBDIR)/net.properties: $(SHARE_SRC)/lib/net.properties - $(install-file) + $(install-file) -# +# # SDP configuration template # ifeq ($(PLATFORM), solaris) SDP_PATH = sdp/sdp.conf.template SDP_CONF = $(LIBDIR)/$(SDP_PATH) $(SDP_CONF): $(PLATFORM_SRC)/lib/$(SDP_PATH) - @$(RM) $* - $(install-file) + @$(RM) $* + $(install-file) MISC_FILES += $(SDP_CONF) endif
--- a/make/java/net/mapfile-vers Sun Nov 24 13:08:16 2013 +0000 +++ b/make/java/net/mapfile-vers Fri Mar 21 18:39:16 2014 +0000 @@ -26,84 +26,86 @@ # Define public interface. SUNWprivate_1.1 { - global: - JNI_OnLoad; - Java_java_net_PlainSocketImpl_socketListen; - Java_java_net_PlainDatagramSocketImpl_getTTL; - Java_java_net_PlainDatagramSocketImpl_init; - Java_java_net_SocketOutputStream_socketWrite0; - Java_java_net_PlainSocketImpl_socketCreate; - Java_java_net_PlainSocketImpl_socketAvailable; - Java_java_net_PlainDatagramSocketImpl_join; - Java_java_net_PlainDatagramSocketImpl_socketGetOption; - Java_java_net_InetAddress_init; - Java_java_net_Inet4Address_init; - Java_java_net_Inet6Address_init; - Java_java_net_PlainDatagramSocketImpl_setTTL; - Java_java_net_PlainDatagramSocketImpl_socketSetOption; - Java_java_net_PlainDatagramSocketImpl_bind0; - Java_java_net_PlainSocketImpl_socketAccept; - Java_java_net_DatagramPacket_init; - Java_java_net_PlainDatagramSocketImpl_leave; - Java_java_net_SocketInputStream_socketRead0; - Java_java_net_InetAddressImplFactory_isIPv6Supported; - Java_java_net_Inet4AddressImpl_getLocalHostName; - Java_java_net_Inet4AddressImpl_lookupAllHostAddr; - Java_java_net_Inet4AddressImpl_getHostByAddr; - Java_java_net_Inet4AddressImpl_isReachable0; - Java_java_net_Inet6AddressImpl_getLocalHostName; - Java_java_net_Inet6AddressImpl_lookupAllHostAddr; - Java_java_net_Inet6AddressImpl_getHostByAddr; - Java_java_net_Inet6AddressImpl_isReachable0; - Java_java_net_NetworkInterface_init; - Java_java_net_NetworkInterface_getByName0; - Java_java_net_NetworkInterface_getByIndex0; - Java_java_net_NetworkInterface_getByInetAddress0; - Java_java_net_NetworkInterface_getAll; - Java_java_net_NetworkInterface_isUp0; - Java_java_net_NetworkInterface_isLoopback0; - Java_java_net_NetworkInterface_isP2P0; - Java_java_net_NetworkInterface_supportsMulticast0; - Java_java_net_NetworkInterface_getMacAddr0; - Java_java_net_NetworkInterface_getMTU0; - Java_java_net_PlainDatagramSocketImpl_send; - Java_java_net_PlainSocketImpl_socketClose0; - Java_java_net_SocketOutputStream_init; - Java_java_net_PlainDatagramSocketImpl_peek; - Java_java_net_PlainDatagramSocketImpl_peekData; - Java_java_net_PlainSocketImpl_socketSetOption; - Java_java_net_PlainSocketImpl_socketSendUrgentData; - Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate; - Java_java_net_PlainSocketImpl_socketGetOption; - Java_java_net_PlainDatagramSocketImpl_receive0; - Java_java_net_PlainDatagramSocketImpl_connect0; - Java_java_net_PlainDatagramSocketImpl_disconnect0; - Java_java_net_PlainDatagramSocketImpl_datagramSocketClose; - Java_java_net_PlainSocketImpl_initProto; - Java_java_net_PlainSocketImpl_socketBind; - Java_java_net_PlainSocketImpl_socketShutdown; - Java_java_net_SocketInputStream_init; - Java_java_net_PlainSocketImpl_socketConnect; - Java_java_net_PlainDatagramSocketImpl_getTimeToLive; - Java_java_net_PlainDatagramSocketImpl_setTimeToLive; - Java_sun_net_dns_ResolverConfigurationImpl_localDomain0; - Java_sun_net_dns_ResolverConfigurationImpl_fallbackDomain0; - Java_sun_net_sdp_SdpSupport_convert0; - Java_sun_net_sdp_SdpSupport_create0; - Java_sun_net_spi_DefaultProxySelector_init; - Java_sun_net_spi_DefaultProxySelector_getSystemProxy; - NET_AllocSockaddr; - NET_SockaddrToInetAddress; + global: + JNI_OnLoad; + Java_java_net_PlainSocketImpl_socketListen; + Java_java_net_PlainDatagramSocketImpl_getTTL; + Java_java_net_PlainDatagramSocketImpl_init; + Java_java_net_SocketOutputStream_socketWrite0; + Java_java_net_PlainSocketImpl_socketCreate; + Java_java_net_PlainSocketImpl_socketAvailable; + Java_java_net_PlainDatagramSocketImpl_join; + Java_java_net_PlainDatagramSocketImpl_socketGetOption; + Java_java_net_InetAddress_init; + Java_java_net_Inet4Address_init; + Java_java_net_Inet6Address_init; + Java_java_net_PlainDatagramSocketImpl_setTTL; + Java_java_net_PlainDatagramSocketImpl_socketSetOption; + Java_java_net_PlainDatagramSocketImpl_bind0; + Java_java_net_PlainSocketImpl_socketAccept; + Java_java_net_DatagramPacket_init; + Java_java_net_PlainDatagramSocketImpl_leave; + Java_java_net_SocketInputStream_socketRead0; + Java_java_net_InetAddressImplFactory_isIPv6Supported; + Java_java_net_Inet4AddressImpl_getLocalHostName; + Java_java_net_Inet4AddressImpl_lookupAllHostAddr; + Java_java_net_Inet4AddressImpl_getHostByAddr; + Java_java_net_Inet4AddressImpl_isReachable0; + Java_java_net_Inet6AddressImpl_getLocalHostName; + Java_java_net_Inet6AddressImpl_lookupAllHostAddr; + Java_java_net_Inet6AddressImpl_getHostByAddr; + Java_java_net_Inet6AddressImpl_isReachable0; + Java_java_net_NetworkInterface_init; + Java_java_net_NetworkInterface_getByName0; + Java_java_net_NetworkInterface_getByIndex0; + Java_java_net_NetworkInterface_getByInetAddress0; + Java_java_net_NetworkInterface_getAll; + Java_java_net_NetworkInterface_isUp0; + Java_java_net_NetworkInterface_isLoopback0; + Java_java_net_NetworkInterface_isP2P0; + Java_java_net_NetworkInterface_supportsMulticast0; + Java_java_net_NetworkInterface_getMacAddr0; + Java_java_net_NetworkInterface_getMTU0; + Java_java_net_PlainDatagramSocketImpl_send; + Java_java_net_PlainSocketImpl_socketClose0; + Java_java_net_SocketOutputStream_init; + Java_java_net_PlainDatagramSocketImpl_peek; + Java_java_net_PlainDatagramSocketImpl_peekData; + Java_java_net_PlainSocketImpl_socketSetOption; + Java_java_net_PlainSocketImpl_socketSendUrgentData; + Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate; + Java_java_net_PlainSocketImpl_socketGetOption; + Java_java_net_PlainDatagramSocketImpl_receive0; + Java_java_net_PlainDatagramSocketImpl_connect0; + Java_java_net_PlainDatagramSocketImpl_disconnect0; + Java_java_net_PlainDatagramSocketImpl_datagramSocketClose; + Java_java_net_PlainSocketImpl_initProto; + Java_java_net_PlainSocketImpl_socketBind; + Java_java_net_PlainSocketImpl_socketShutdown; + Java_java_net_SocketInputStream_init; + Java_java_net_PlainSocketImpl_socketConnect; + Java_java_net_PlainDatagramSocketImpl_getTimeToLive; + Java_java_net_PlainDatagramSocketImpl_setTimeToLive; + Java_sun_net_PortConfig_getLower0; + Java_sun_net_PortConfig_getUpper0; + Java_sun_net_dns_ResolverConfigurationImpl_localDomain0; + Java_sun_net_dns_ResolverConfigurationImpl_fallbackDomain0; + Java_sun_net_sdp_SdpSupport_convert0; + Java_sun_net_sdp_SdpSupport_create0; + Java_sun_net_spi_DefaultProxySelector_init; + Java_sun_net_spi_DefaultProxySelector_getSystemProxy; + NET_AllocSockaddr; + NET_SockaddrToInetAddress; NET_SockaddrEqualsInetAddress; - NET_InetAddressToSockaddr; - NET_GetPortFromSockaddr; - NET_SetSockOpt; - NET_GetSockOpt; - NET_Bind; - NET_MapSocketOption; - NET_Wait; + NET_InetAddressToSockaddr; + NET_GetPortFromSockaddr; + NET_SetSockOpt; + NET_GetSockOpt; + NET_Bind; + NET_MapSocketOption; + NET_Wait; ipv6_available; - local: - *; + local: + *; };
--- a/make/sun/net/FILES_java.gmk Sun Nov 24 13:08:16 2013 +0000 +++ b/make/sun/net/FILES_java.gmk Fri Mar 21 18:39:16 2014 +0000 @@ -29,6 +29,7 @@ sun/net/URLCanonicalizer.java \ sun/net/NetworkClient.java \ sun/net/NetworkServer.java \ + sun/net/PortConfig.java \ sun/net/ProgressMonitor.java \ sun/net/ProgressSource.java \ sun/net/ProgressEvent.java \
--- a/src/share/classes/java/net/SocketPermission.java Sun Nov 24 13:08:16 2013 +0000 +++ b/src/share/classes/java/net/SocketPermission.java Fri Mar 21 18:39:16 2014 +0000 @@ -44,6 +44,7 @@ import java.io.IOException; import sun.net.util.IPAddressUtil; import sun.net.RegisteredDomain; +import sun.net.PortConfig; import sun.security.util.SecurityConstants; import sun.security.util.Debug; @@ -1213,17 +1214,9 @@ if (val != -1) { return val; } else { - String prop = Security.getProperty( - "network.ephemeralPortRange."+suffix - ); - try { - val = Integer.parseInt(prop); - } catch (NumberFormatException e) { - // shouldn't happen - return defval; - } + return suffix.equals("low") ? + PortConfig.getLower() : PortConfig.getUpper(); } - return val; } } );
--- a/src/share/classes/sun/rmi/registry/RegistryImpl.java Sun Nov 24 13:08:16 2013 +0000 +++ b/src/share/classes/sun/rmi/registry/RegistryImpl.java Fri Mar 21 18:39:16 2014 +0000 @@ -366,7 +366,7 @@ public RegistryImpl run() throws RemoteException { return new RegistryImpl(regPort); } - }, getAccessControlContext()); + }, getAccessControlContext(regPort)); } catch (PrivilegedActionException ex) { throw (RemoteException) ex.getException(); } @@ -396,7 +396,7 @@ * The approach used here is taken from the similar method * getAccessControlContext() in the sun.applet.AppletPanel class. */ - private static AccessControlContext getAccessControlContext() { + private static AccessControlContext getAccessControlContext(int port) { // begin with permissions granted to all code in current policy PermissionCollection perms = AccessController.doPrivileged( new java.security.PrivilegedAction<PermissionCollection>() { @@ -418,6 +418,7 @@ * related classes themselves are more tightly limited by RMI. */ perms.add(new SocketPermission("*", "connect,accept")); + perms.add(new SocketPermission("localhost:"+port, "listen,accept")); perms.add(new RuntimePermission("accessClassInPackage.sun.jvmstat.*")); perms.add(new RuntimePermission("accessClassInPackage.sun.jvm.hotspot.*"));
--- a/src/share/lib/security/java.security Sun Nov 24 13:08:16 2013 +0000 +++ b/src/share/lib/security/java.security Fri Mar 21 18:39:16 2014 +0000 @@ -430,19 +430,3 @@ # Example: # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048 -# -# Default ephemeral port ranges (operating system specific) -# used by java.net.SocketPermission to interpret the meaning of the special -# port value zero, as in the following example: -# -# SocketPermission("localhost:0" , "listen"); -# -# These can be overridden by the system properties: -# -# jdk.net.ephemeralPortRange.low and -# jdk.net.ephemeralPortRange.high -# -# respectively. -# -network.ephemeralPortRange.low=32768 -network.ephemeralPortRange.high=65535
--- a/src/share/lib/security/java.security-macosx Sun Nov 24 13:08:16 2013 +0000 +++ b/src/share/lib/security/java.security-macosx Fri Mar 21 18:39:16 2014 +0000 @@ -432,22 +432,3 @@ # # Example: # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048 - - -# -# Default ephemeral port ranges (operating system specific) -# used by java.net.SocketPermission to interpret the meaning of the special -# port value zero, as in the following example: -# -# SocketPermission("localhost:0" , "listen"); -# -# These can be overridden by the system properties: -# -# jdk.net.ephemeralPortRange.low and -# jdk.net.ephemeralPortRange.high -# -# respectively. -# -network.ephemeralPortRange.low=49152 -network.ephemeralPortRange.high=65535 -
--- a/src/share/lib/security/java.security-solaris Sun Nov 24 13:08:16 2013 +0000 +++ b/src/share/lib/security/java.security-solaris Fri Mar 21 18:39:16 2014 +0000 @@ -431,21 +431,3 @@ # # Example: # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048 - - -# -# Default ephemeral port ranges (operating system specific) -# used by java.net.SocketPermission to interpret the meaning of the special -# port value zero, as in the following example: -# -# SocketPermission("localhost:0" , "listen"); -# -# These can be overridden by the system properties: -# -# jdk.net.ephemeralPortRange.low and -# jdk.net.ephemeralPortRange.high -# -# respectively. -# -network.ephemeralPortRange.low=32768 -network.ephemeralPortRange.high=65535
--- a/src/share/lib/security/java.security-windows Sun Nov 24 13:08:16 2013 +0000 +++ b/src/share/lib/security/java.security-windows Fri Mar 21 18:39:16 2014 +0000 @@ -432,20 +432,3 @@ # # Example: # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048 - -# -# Default ephemeral port ranges (operating system specific) -# used by java.net.SocketPermission to interpret the meaning of the special -# port value zero, as in the following example: -# -# SocketPermission("localhost:0" , "listen"); -# -# These can be overridden by the system properties: -# -# jdk.net.ephemeralPortRange.low and -# jdk.net.ephemeralPortRange.high -# -# respectively. -# -network.ephemeralPortRange.low=49152 -network.ephemeralPortRange.high=65535
--- a/src/solaris/native/java/net/net_util_md.c Sun Nov 24 13:08:16 2013 +0000 +++ b/src/solaris/native/java/net/net_util_md.c Fri Mar 21 18:39:16 2014 +0000 @@ -138,8 +138,7 @@ * of the parameter is assumed to be an 'int'. If the parameter * cannot be obtained return -1 */ -static int -getParam(char *driver, char *param) +int net_getParam(char *driver, char *param) { struct strioctl stri; char buf [64]; @@ -166,7 +165,7 @@ /* * Iterative way to find the max value that SO_SNDBUF or SO_RCVBUF - * for Solaris versions that do not support the ioctl() in getParam(). + * for Solaris versions that do not support the ioctl() in net_getParam(). * Ugly, but only called once (for each sotype). * * As an optimisation, we make a guess using the default values for Solaris @@ -1397,7 +1396,7 @@ * If that fails, we use the search algorithm in findMaxBuf() */ if (!init_tcp_max_buf && sotype == SOCK_STREAM) { - tcp_max_buf = getParam("/dev/tcp", "tcp_max_buf"); + tcp_max_buf = net_getParam("/dev/tcp", "tcp_max_buf"); if (tcp_max_buf == -1) { tcp_max_buf = findMaxBuf(fd, opt, SOCK_STREAM); if (tcp_max_buf == -1) { @@ -1406,7 +1405,7 @@ } init_tcp_max_buf = 1; } else if (!init_udp_max_buf && sotype == SOCK_DGRAM) { - udp_max_buf = getParam("/dev/udp", "udp_max_buf"); + udp_max_buf = net_getParam("/dev/udp", "udp_max_buf"); if (udp_max_buf == -1) { udp_max_buf = findMaxBuf(fd, opt, SOCK_DGRAM); if (udp_max_buf == -1) {
--- a/src/solaris/native/java/net/net_util_md.h Sun Nov 24 13:08:16 2013 +0000 +++ b/src/solaris/native/java/net/net_util_md.h Fri Mar 21 18:39:16 2014 +0000 @@ -81,6 +81,9 @@ int getDefaultIPv6Interface(struct in6_addr *target_addr); #endif +#ifdef __solaris__ +extern int net_getParam(char *driver, char *param); +#endif /* needed from libsocket on Solaris 8 */
--- a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java Sun Nov 24 13:08:16 2013 +0000 +++ b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java Fri Mar 21 18:39:16 2014 +0000 @@ -89,6 +89,17 @@ TestLibrary.RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT); rmid.addOptions(new String[]{ "-Djava.nio.channels.spi.SelectorProvider=RmidViaInheritedChannel$RmidSelectorProvider"}); + if (System.getProperty("os.name").startsWith("Windows") && + System.getProperty("os.version").startsWith("5.")) + { + /* Windows XP/2003 or older + * Need to expand ephemeral range to include RMI test ports + */ + rmid.addOptions(new String[]{ + "-Djdk.net.ephemeralPortRange.low=1024", + "-Djdk.net.ephemeralPortRange.high=64000" + }); + } rmid.start(); /*
--- a/test/java/rmi/registry/readTest/readTest.sh Sun Nov 24 13:08:16 2013 +0000 +++ b/test/java/rmi/registry/readTest/readTest.sh Fri Mar 21 18:39:16 2014 +0000 @@ -29,6 +29,10 @@ # @run shell readTest.sh OS=`uname -s` +VER=`uname -r` +ARGS="" +REGARGS="" + case "$OS" in SunOS | Linux | Darwin ) PS=":" @@ -39,11 +43,19 @@ PS=";" FS="\\" FILEURL="file:/" + if [ "$VER" -eq "5" ]; then + ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000" + REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000" + fi ;; CYGWIN* ) PS=";" FS="/" FILEURL="file:/" + if [ "${VER}" -eq "5" ]; then + ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000" + REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000" + fi ;; * ) echo "Unrecognized system!" @@ -61,8 +73,8 @@ #start rmiregistry without any local classes on classpath cd rmi_tmp # NOTE: This RMI Registry port must match TestLibrary.READTEST_REGISTRY_PORT -${TESTJAVA}${FS}bin${FS}rmiregistry -J-Djava.rmi.server.useCodebaseOnly=false \ - ${TESTTOOLVMOPTS} 64005 > ..${FS}${RMIREG_OUT} 2>&1 & +${TESTJAVA}${FS}bin${FS}rmiregistry ${REGARGS} -J-Djava.rmi.server.useCodebaseOnly=false \ + ${TESTTOOLVMOPTS} 60005 > ..${FS}${RMIREG_OUT} 2>&1 & RMIREG_PID=$! # allow some time to start sleep 3 @@ -74,10 +86,10 @@ ;; * ) CODEBASE=`pwd` - ;; + ;; esac # trailing / after code base is important for rmi codebase property. -${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 & +${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH ${ARGS} -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 & TEST_PID=$! #bulk of testcase - let it run for a while sleep 5 @@ -100,7 +112,7 @@ result2=$? if [ $result1 -eq 0 -a $result2 -eq 0 ] -then +then echo "Passed" exitCode=0; else @@ -108,6 +120,6 @@ exitCode=1 fi rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp -exit ${exitCode} +exit ${exitCode}
--- a/test/java/rmi/testlibrary/TestLibrary.java Sun Nov 24 13:08:16 2013 +0000 +++ b/test/java/rmi/testlibrary/TestLibrary.java Fri Mar 21 18:39:16 2014 +0000 @@ -86,13 +86,13 @@ * FIXED_PORT_MIN or above FIXED_PORT_MAX, then adjust * FIXED_PORT_MIN/MAX appropriately. */ - public final static int FIXED_PORT_MIN = 64001; - public final static int FIXED_PORT_MAX = 64010; - public final static int RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT = 64001; - public final static int RMIDVIAINHERITEDCHANNEL_REGISTRY_PORT = 64002; - public final static int INHERITEDCHANNELNOTSERVERSOCKET_ACTIVATION_PORT = 64003; - public final static int INHERITEDCHANNELNOTSERVERSOCKET_REGISTRY_PORT = 64004; - public final static int READTEST_REGISTRY_PORT = 64005; + public final static int FIXED_PORT_MIN = 60001; + public final static int FIXED_PORT_MAX = 60010; + public final static int RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT = 60001; + public final static int RMIDVIAINHERITEDCHANNEL_REGISTRY_PORT = 60002; + public final static int INHERITEDCHANNELNOTSERVERSOCKET_ACTIVATION_PORT = 60003; + public final static int INHERITEDCHANNELNOTSERVERSOCKET_REGISTRY_PORT = 60004; + public final static int READTEST_REGISTRY_PORT = 60005; private final static int MAX_SERVER_SOCKET_TRIES = 2*(FIXED_PORT_MAX-FIXED_PORT_MIN+1); static void mesg(Object mesg) {