Index: modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java (revision 500995) +++ modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java (working copy) @@ -113,7 +113,7 @@ public void test_ConstructorI() { // Test for method java.net.DatagramSocket(int) try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber); assertTrue("Created socket with incorrect port", ds.getLocalPort() == portNumber); @@ -128,7 +128,7 @@ public void test_ConstructorILjava_net_InetAddress() { // Test for method java.net.DatagramSocket(int, java.net.InetAddress) try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber, InetAddress .getLocalHost()); assertTrue("Created socket with incorrect port", @@ -146,7 +146,7 @@ public void test_close() { // Test for method void java.net.DatagramSocket.close() try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber); dp = new DatagramPacket("Test String".getBytes(), 11, InetAddress .getLocalHost(), 0); @@ -165,7 +165,7 @@ try { ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress.getLocalHost(); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(inetAddress, portNumber); assertTrue("Incorrect InetAddress", ds.getInetAddress().equals( inetAddress)); @@ -183,7 +183,7 @@ ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress .getByName(Support_Configuration.IPv6GlobalAddressJcl4); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(inetAddress, portNumber); assertTrue("Incorrect InetAddress", ds.getInetAddress().equals( inetAddress)); @@ -264,7 +264,7 @@ try { ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress.getLocalHost(); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(inetAddress, portNumber); DatagramPacket send = new DatagramPacket(new byte[10], 10); ds.send(send); @@ -284,7 +284,7 @@ // validate that we can send/receive with datagram sockets connected at // the native level DatagramServer server = null; - int serverPortNumber = Support_PortManager.getNextPort(); + int serverPortNumber = Support_PortManager.getNextPortForUDP(); try { InetAddress localHost = InetAddress.getLocalHost(); DatagramSocket ds = new DatagramSocket(); @@ -333,7 +333,7 @@ try { ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress.getLocalHost(); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(inetAddress, portNumber); ds.disconnect(); ds.close(); @@ -346,7 +346,7 @@ try { ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress.getLocalHost(); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(inetAddress, portNumber); DatagramPacket send = new DatagramPacket(new byte[10], 10, inetAddress, portNumber + 1); @@ -364,7 +364,7 @@ // validate that we can connect, then disconnect, then connect then // send/recv server = null; - serverPortNumber = Support_PortManager.getNextPort(); + serverPortNumber = Support_PortManager.getNextPortForUDP(); try { InetAddress localHost = InetAddress.getLocalHost(); DatagramSocket ds = new DatagramSocket(); @@ -416,7 +416,7 @@ // validate that we can connect/disconnect then send/recv to any address server = null; - serverPortNumber = Support_PortManager.getNextPort(); + serverPortNumber = Support_PortManager.getNextPortForUDP(); try { InetAddress localHost = InetAddress.getLocalHost(); DatagramSocket ds = new DatagramSocket(); @@ -467,7 +467,7 @@ // validate that we can connect on an allready connected socket and then // send/recv server = null; - serverPortNumber = Support_PortManager.getNextPort(); + serverPortNumber = Support_PortManager.getNextPortForUDP(); try { InetAddress localHost = InetAddress.getLocalHost(); DatagramSocket ds = new DatagramSocket(); @@ -522,7 +522,7 @@ ds = new java.net.DatagramSocket(); byte[] addressBytes = { 0, 0, 0, 0 }; InetAddress inetAddress = InetAddress.getByAddress(addressBytes); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(inetAddress, portNumber); } catch (Exception e) { fail( @@ -539,7 +539,7 @@ 0, 0, 0 }; InetAddress inetAddress = InetAddress .getByAddress(addressBytes); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(inetAddress, portNumber); } catch (Exception e) { fail( @@ -556,7 +556,7 @@ try { ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress.getLocalHost(); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(inetAddress, portNumber); ds.disconnect(); assertNull("Incorrect InetAddress", ds.getInetAddress()); @@ -573,7 +573,7 @@ ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress .getByName(Support_Configuration.IPv6GlobalAddressJcl4); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(inetAddress, portNumber); ds.disconnect(); assertNull("Incorrect InetAddress", ds.getInetAddress()); @@ -600,7 +600,7 @@ // java.net.DatagramSocket.getLocalAddress() InetAddress local = null; try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); local = InetAddress.getLocalHost(); ds = new java.net.DatagramSocket(portNumber, local); assertTrue("Returned incorrect address. Got:" @@ -644,7 +644,7 @@ public void test_getLocalPort() { // Test for method int java.net.DatagramSocket.getLocalPort() try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber); assertTrue("Returned incorrect port", ds.getLocalPort() == portNumber); @@ -658,7 +658,7 @@ */ public void test_getPort() { try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); DatagramSocket theSocket = new DatagramSocket(portNumber); assertEquals("Expected -1 for remote port as not connected", -1, theSocket.getPort()); @@ -678,7 +678,7 @@ */ public void test_getReceiveBufferSize() { try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber); ds.setReceiveBufferSize(130); assertTrue("Incorrect buffer size", @@ -694,7 +694,7 @@ */ public void test_getSendBufferSize() { try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber); ds.setSendBufferSize(134); assertTrue("Incorrect buffer size", ds.getSendBufferSize() >= 134); @@ -710,7 +710,7 @@ public void test_getSoTimeout() { // Test for method int java.net.DatagramSocket.getSoTimeout() try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber); ds.setSoTimeout(100); assertEquals("Returned incorrect timeout", 100, ds.getSoTimeout()); @@ -729,7 +729,7 @@ receive_oversize_java_net_DatagramPacket(); - final int portNumber = Support_PortManager.getNextPort(); + final int portNumber = Support_PortManager.getNextPortForUDP(); class TestDGRcv implements Runnable { public void run() { @@ -738,7 +738,7 @@ localHost = InetAddress.getLocalHost(); Thread.sleep(1000); DatagramSocket sds = new DatagramSocket(Support_PortManager - .getNextPort()); + .getNextPortForUDP()); DatagramPacket rdp = new DatagramPacket("Test String" .getBytes(), 11, localHost, portNumber); sds.send(rdp); @@ -810,7 +810,7 @@ } while (thread.isAlive()); interrupted = false; - final int portNum = Support_PortManager.getNextPort(); + final int portNum = Support_PortManager.getNextPortForUDP(); final DatagramSocket ds2 = new DatagramSocket(); ds2.setSoTimeout(12000); Runnable runnable2 = new Runnable() { @@ -872,7 +872,7 @@ // Test for method void // java.net.DatagramSocket.send(java.net.DatagramPacket) - final int portNumber = Support_PortManager.getNextPort(); + final int portNumber = Support_PortManager.getNextPortForUDP(); class TestDGSend implements Runnable { Thread pThread; @@ -980,7 +980,7 @@ */ public void test_setSendBufferSizeI() { try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber); ds.setSendBufferSize(134); assertTrue("Incorrect buffer size", ds.getSendBufferSize() >= 134); @@ -995,7 +995,7 @@ */ public void test_setReceiveBufferSizeI() { try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber); ds.setReceiveBufferSize(130); assertTrue("Incorrect buffer size", @@ -1012,7 +1012,7 @@ public void test_setSoTimeoutI() { // Test for method void java.net.DatagramSocket.setSoTimeout(int) try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(portNumber); ds.setSoTimeout(100); assertTrue("Set incorrect timeout", ds.getSoTimeout() >= 100); @@ -1051,7 +1051,7 @@ try { try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(new InetSocketAddress( InetAddress.getLocalHost(), portNumber)); assertTrue(ds.getBroadcast()); @@ -1064,7 +1064,7 @@ } try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds = new java.net.DatagramSocket(new mySocketAddress()); fail( "No exception when constucting datagramSocket with unsupported SocketAddress type"); @@ -1093,8 +1093,8 @@ DatagramServer server = null; try { // now create a socket that is not bound and then bind it - int portNumber = Support_PortManager.getNextPort(); - int serverPortNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); + int serverPortNumber = Support_PortManager.getNextPortForUDP(); DatagramSocket theSocket = new DatagramSocket( new InetSocketAddress(InetAddress.getLocalHost(), portNumber)); @@ -1113,7 +1113,7 @@ // now make sure that datagrams sent from this socket appear to come // from the address we bound to InetAddress localHost = InetAddress.getLocalHost(); - portNumber = Support_PortManager.getNextPort(); + portNumber = Support_PortManager.getNextPortForUDP(); DatagramSocket ds = new DatagramSocket(null); ds.bind(new InetSocketAddress(localHost, portNumber)); @@ -1159,7 +1159,7 @@ .bind(new InetSocketAddress( InetAddress .getByAddress(Support_Configuration.nonLocalAddressBytes), - Support_PortManager.getNextPort())); + Support_PortManager.getNextPortForUDP())); fail("No exception when binding to bad address"); } catch (SocketException ex) { } @@ -1171,7 +1171,7 @@ try { InetSocketAddress theAddress = new InetSocketAddress( InetAddress.getLocalHost(), Support_PortManager - .getNextPort()); + .getNextPortForUDP()); theSocket.bind(theAddress); theSocket2.bind(theAddress); fail("No exception binding to address that is not available"); @@ -1208,7 +1208,7 @@ try { ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress.getLocalHost(); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(new InetSocketAddress(inetAddress, portNumber)); DatagramPacket send = new DatagramPacket(new byte[10], 10); ds.send(send); @@ -1228,7 +1228,7 @@ // validate that we can send/receive with datagram sockets connected at // the native level DatagramServer server = null; - int serverPortNumber = Support_PortManager.getNextPort(); + int serverPortNumber = Support_PortManager.getNextPortForUDP(); try { InetAddress localHost = InetAddress.getLocalHost(); DatagramSocket ds = new DatagramSocket(); @@ -1277,7 +1277,7 @@ try { ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress.getLocalHost(); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(new InetSocketAddress(inetAddress, portNumber)); ds.disconnect(); ds.close(); @@ -1290,7 +1290,7 @@ try { ds = new java.net.DatagramSocket(); InetAddress inetAddress = InetAddress.getLocalHost(); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); ds.connect(new InetSocketAddress(inetAddress, portNumber)); DatagramPacket send = new DatagramPacket(new byte[10], 10, inetAddress, portNumber + 1); @@ -1308,7 +1308,7 @@ // validate that we can connect, then disconnect, then connect then // send/recv server = null; - serverPortNumber = Support_PortManager.getNextPort(); + serverPortNumber = Support_PortManager.getNextPortForUDP(); try { InetAddress localHost = InetAddress.getLocalHost(); DatagramSocket ds = new DatagramSocket(); @@ -1360,7 +1360,7 @@ // validate that we can connect/disconnect then send/recv to any address server = null; - serverPortNumber = Support_PortManager.getNextPort(); + serverPortNumber = Support_PortManager.getNextPortForUDP(); try { InetAddress localHost = InetAddress.getLocalHost(); DatagramSocket ds = new DatagramSocket(); @@ -1411,7 +1411,7 @@ // validate that we can connect on an allready connected socket and then // send/recv server = null; - serverPortNumber = Support_PortManager.getNextPort(); + serverPortNumber = Support_PortManager.getNextPortForUDP(); try { InetAddress localHost = InetAddress.getLocalHost(); DatagramSocket ds = new DatagramSocket(); @@ -1467,7 +1467,7 @@ ds = new java.net.DatagramSocket(); byte[] addressBytes = { 0, 0, 0, 0 }; InetAddress inetAddress = InetAddress.getByAddress(addressBytes); - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); InetAddress localHost = InetAddress.getLocalHost(); ds.connect(new InetSocketAddress(inetAddress, portNumber)); assertTrue("Is not connected after connect to inaddr any", ds @@ -1492,7 +1492,7 @@ public void test_isBound() { try { InetAddress addr = InetAddress.getLocalHost(); - int port = Support_PortManager.getNextPort(); + int port = Support_PortManager.getNextPortForUDP(); DatagramSocket theSocket = new DatagramSocket(); assertTrue("Socket indicated not bound when it should be (1)", @@ -1519,7 +1519,7 @@ // now test when we bind explicitely InetSocketAddress theLocalAddress = new InetSocketAddress( InetAddress.getLocalHost(), Support_PortManager - .getNextPort()); + .getNextPortForUDP()); theSocket = new DatagramSocket(null); assertFalse("Socket indicated bound when it should not be (2)", theSocket.isBound()); @@ -1540,7 +1540,7 @@ public void test_isConnected() { try { InetAddress addr = InetAddress.getLocalHost(); - int port = Support_PortManager.getNextPort(); + int port = Support_PortManager.getNextPortForUDP(); // base test DatagramSocket theSocket = new DatagramSocket(); @@ -1552,7 +1552,7 @@ // reconnect the socket and make sure we get the right answer theSocket.connect(new InetSocketAddress(addr, Support_PortManager - .getNextPort())); + .getNextPortForUDP())); assertTrue("Socket indicated not connected when it should be", theSocket.isConnected()); @@ -1578,8 +1578,8 @@ */ public void test_getRemoteSocketAddress() { try { - int sport = Support_PortManager.getNextPort(); - int portNumber = Support_PortManager.getNextPort(); + int sport = Support_PortManager.getNextPortForUDP(); + int portNumber = Support_PortManager.getNextPortForUDP(); DatagramSocket s = new DatagramSocket(new InetSocketAddress( InetAddress.getLocalHost(), portNumber)); s.connect(new InetSocketAddress(InetAddress.getLocalHost(), sport)); @@ -1593,7 +1593,7 @@ // now create one that is not connected and validate that we get the // right answer DatagramSocket theSocket = new DatagramSocket(null); - portNumber = Support_PortManager.getNextPort(); + portNumber = Support_PortManager.getNextPortForUDP(); theSocket.bind(new InetSocketAddress(InetAddress.getLocalHost(), portNumber)); assertNull( @@ -1622,7 +1622,7 @@ public void test_getLocalSocketAddress() { try { - int portNumber = Support_PortManager.getNextPort(); + int portNumber = Support_PortManager.getNextPortForUDP(); DatagramSocket s = new DatagramSocket(new InetSocketAddress( InetAddress.getLocalHost(), portNumber)); assertTrue("Returned incorrect InetSocketAddress(1):" @@ -1646,7 +1646,7 @@ theSocket.getLocalSocketAddress()); // now bind the socket and make sure we get the right answer - portNumber = Support_PortManager.getNextPort(); + portNumber = Support_PortManager.getNextPortForUDP(); theSocket.bind(new InetSocketAddress(InetAddress.getLocalHost(), portNumber)); assertTrue("Returned incorrect InetSocketAddress(2):" @@ -1700,7 +1700,7 @@ try { InetSocketAddress theAddress = new InetSocketAddress( InetAddress.getLocalHost(), Support_PortManager - .getNextPort()); + .getNextPortForUDP()); theSocket1 = new DatagramSocket(null); theSocket2 = new DatagramSocket(null); theSocket1.setReuseAddress(false); @@ -1721,7 +1721,7 @@ try { InetSocketAddress theAddress = new InetSocketAddress( InetAddress.getLocalHost(), Support_PortManager - .getNextPort()); + .getNextPortForUDP()); theSocket1 = new DatagramSocket(null); theSocket2 = new DatagramSocket(null); theSocket1.setReuseAddress(true); @@ -1742,7 +1742,7 @@ try { InetSocketAddress theAddress = new InetSocketAddress( InetAddress.getLocalHost(), Support_PortManager - .getNextPort()); + .getNextPortForUDP()); theSocket1 = new DatagramSocket(null); theSocket2 = new DatagramSocket(null); theSocket1.bind(theAddress); @@ -1795,7 +1795,7 @@ try { theSocket.connect(new InetSocketAddress(InetAddress .getByAddress(theBytes), Support_PortManager - .getNextPort())); + .getNextPortForUDP())); assertFalse( "No exception when connecting to broadcast address with setBroadcast(false)", theSocket.getBroadcast()); @@ -1808,7 +1808,7 @@ theSocket .connect(new InetSocketAddress(InetAddress .getByAddress(theBytes), Support_PortManager - .getNextPort())); + .getNextPortForUDP())); ensureExceptionThrownIfOptionIsUnsupportedOnOS(SO_BROADCAST); } catch (Exception e) { handleException(e, SO_BROADCAST); @@ -1844,7 +1844,7 @@ int IPTOS_LOWDELAY = 0x10; new InetSocketAddress(InetAddress.getLocalHost(), - Support_PortManager.getNextPort()); + Support_PortManager.getNextPortForUDP()); DatagramSocket theSocket = new DatagramSocket(); // validate that value set must be between 0 and 255 @@ -1880,7 +1880,7 @@ int IPTOS_LOWDELAY = 0x10; new InetSocketAddress(InetAddress.getLocalHost(), - Support_PortManager.getNextPort()); + Support_PortManager.getNextPortForUDP()); DatagramSocket theSocket = new DatagramSocket(); /* @@ -1909,7 +1909,7 @@ .isClosed()); InetSocketAddress theAddress = new InetSocketAddress(InetAddress - .getLocalHost(), Support_PortManager.getNextPort()); + .getLocalHost(), Support_PortManager.getNextPortForUDP()); theSocket = new DatagramSocket(theAddress); assertFalse("Socket should indicate it is not closed(2):", theSocket.isClosed()); @@ -1950,7 +1950,7 @@ protected void receive_oversize_java_net_DatagramPacket() { - final int portNumber = Support_PortManager.getNextPort(); + final int portNumber = Support_PortManager.getNextPortForUDP(); class TestDGRcvOver implements Runnable { public void run() { @@ -1959,7 +1959,7 @@ localHost = InetAddress.getLocalHost(); Thread.sleep(1000); DatagramSocket sds = new DatagramSocket(Support_PortManager - .getNextPort()); + .getNextPortForUDP()); DatagramPacket rdp = new DatagramPacket("0123456789" .getBytes(), 10, localHost, portNumber); sds.send(rdp); Index: modules/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java =================================================================== --- modules/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java (revision 500995) +++ modules/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java (working copy) @@ -149,7 +149,7 @@ // java.net.MulticastSocket.getInterface() assertTrue("Used for testing.", true); - int groupPort = Support_PortManager.getNextPort(); + int groupPort = Support_PortManager.getNextPortForUDP(); try { if (atLeastOneInterface) { // validate that we get the expected response when one was not @@ -187,7 +187,7 @@ + mss.getInterface(), firstAddress .equals(mss.getInterface())); - groupPort = Support_PortManager.getNextPort(); + groupPort = Support_PortManager.getNextPortForUDP(); mss = new MulticastSocket(groupPort); mss.setNetworkInterface(networkInterface1); assertTrue( @@ -208,7 +208,7 @@ * @tests java.net.MulticastSocket#getNetworkInterface() */ public void test_getNetworkInterface() { - int groupPort = Support_PortManager.getNextPort(); + int groupPort = Support_PortManager.getNextPortForUDP(); try { if (atLeastOneInterface) { @@ -256,7 +256,7 @@ networkInterface2.equals(mss.getNetworkInterface())); } - groupPort = Support_PortManager.getNextPort(); + groupPort = Support_PortManager.getNextPortForUDP(); mss = new MulticastSocket(groupPort); if (IPV6networkInterface1 != null) { mss.setNetworkInterface(IPV6networkInterface1); @@ -268,7 +268,7 @@ // validate that we get the expected response when we set via // setInterface - groupPort = Support_PortManager.getNextPort(); + groupPort = Support_PortManager.getNextPortForUDP(); mss = new MulticastSocket(groupPort); Enumeration addresses = networkInterface1.getInetAddresses(); if (addresses != null) { @@ -328,14 +328,14 @@ // java.net.MulticastSocket.joinGroup(java.net.InetAddress) String msg = null; InetAddress group = null; - int groupPort = Support_PortManager.getNextPort(); + int groupPort = Support_PortManager.getNextPortForUDP(); try { group = InetAddress.getByName("224.0.0.3"); server = new MulticastServer(group, groupPort); server.start(); Thread.sleep(1000); msg = "Hello World"; - mss = new MulticastSocket(Support_PortManager.getNextPort()); + mss = new MulticastSocket(Support_PortManager.getNextPortForUDP()); DatagramPacket sdp = new DatagramPacket(msg.getBytes(), msg .length(), group, groupPort); mss.send(sdp, (byte) 10); @@ -364,8 +364,8 @@ String msg = null; InetAddress group = null; SocketAddress groupSockAddr = null; - int groupPort = Support_PortManager.getNextPort(); - int serverPort = Support_PortManager.getNextPort(); + int groupPort = Support_PortManager.getNextPortForUDP(); + int serverPort = Support_PortManager.getNextPortForUDP(); try { Enumeration theInterfaces = NetworkInterface.getNetworkInterfaces(); @@ -404,8 +404,8 @@ if (atLeastOneInterface) { // now validate that we can properly join a group with a null // network interface - groupPort = Support_PortManager.getNextPort(); - serverPort = Support_PortManager.getNextPort(); + groupPort = Support_PortManager.getNextPortForUDP(); + serverPort = Support_PortManager.getNextPortForUDP(); mss = new MulticastSocket(groupPort); mss.joinGroup(groupSockAddr, null); mss.setTimeToLive(2); @@ -433,13 +433,13 @@ // now validate that we handled the case were we join a // different multicast address. // verify we do not receive the data - serverPort = Support_PortManager.getNextPort(); + serverPort = Support_PortManager.getNextPortForUDP(); server = new MulticastServer(groupSockAddr, serverPort, networkInterface1); server.start(); Thread.sleep(1000); - groupPort = Support_PortManager.getNextPort(); + groupPort = Support_PortManager.getNextPortForUDP(); mss = new MulticastSocket(groupPort); InetAddress group2 = InetAddress.getByName("224.0.0.4"); mss.setTimeToLive(10); @@ -513,8 +513,8 @@ .nextElement(); } - serverPort = Support_PortManager.getNextPort(); - groupPort = Support_PortManager.getNextPort(); + serverPort = Support_PortManager.getNextPortForUDP(); + groupPort = Support_PortManager.getNextPortForUDP(); groupSockAddr = new InetSocketAddress(group, serverPort); server = new MulticastServer(groupSockAddr, @@ -555,7 +555,7 @@ // validate that we can join the same address on two // different interfaces but not on the same interface - groupPort = Support_PortManager.getNextPort(); + groupPort = Support_PortManager.getNextPortForUDP(); mss = new MulticastSocket(groupPort); mss.joinGroup(groupSockAddr, networkInterface1); mss.joinGroup(groupSockAddr, networkInterface2); @@ -582,7 +582,7 @@ String msg = null; boolean except = false; InetAddress group = null; - int groupPort = Support_PortManager.getNextPort(); + int groupPort = Support_PortManager.getNextPortForUDP(); try { group = InetAddress.getByName("224.0.0.3"); @@ -620,7 +620,7 @@ String msg = null; InetAddress group = null; - int groupPort = Support_PortManager.getNextPort(); + int groupPort = Support_PortManager.getNextPortForUDP(); SocketAddress groupSockAddr = null; SocketAddress groupSockAddr2 = null; @@ -661,7 +661,7 @@ if (atLeastOneInterface) { // now test that we can join and leave a group successfully - groupPort = Support_PortManager.getNextPort(); + groupPort = Support_PortManager.getNextPortForUDP(); mss = new MulticastSocket(groupPort); groupSockAddr = new InetSocketAddress(group, groupPort); mss.joinGroup(groupSockAddr, null); @@ -712,7 +712,7 @@ String msg = "Hello World"; InetAddress group = null; - int groupPort = Support_PortManager.getNextPort(); + int groupPort = Support_PortManager.getNextPortForUDP(); try { group = InetAddress.getByName("224.0.0.3"); @@ -803,8 +803,8 @@ public void test_setNetworkInterfaceLjava_net_NetworkInterface() { String msg = null; InetAddress group = null; - int groupPort = Support_PortManager.getNextPort(); - int serverPort = Support_PortManager.getNextPort(); + int groupPort = Support_PortManager.getNextPortForUDP(); + int serverPort = Support_PortManager.getNextPortForUDP(); try { if (atLeastOneInterface) { // validate that null interface is handled ok @@ -819,7 +819,7 @@ } // validate that we can get and set the interface - groupPort = Support_PortManager.getNextPort(); + groupPort = Support_PortManager.getNextPortForUDP(); mss = new MulticastSocket(groupPort); mss.setNetworkInterface(networkInterface1); assertTrue( @@ -844,7 +844,7 @@ // Pseudo interface that was set (Support_NetworkInterface .useInterface(thisInterface) == true)) { - serverPort = Support_PortManager.getNextPort(); + serverPort = Support_PortManager.getNextPortForUDP(); server = new MulticastServer(group, serverPort); server.start(); // give the server some time to start up @@ -854,7 +854,7 @@ // source address in the received packet // should be one of the addresses for the interface // set - groupPort = Support_PortManager.getNextPort(); + groupPort = Support_PortManager.getNextPortForUDP(); mss = new MulticastSocket(groupPort); mss.setNetworkInterface(thisInterface); msg = thisInterface.getName(); @@ -935,19 +935,19 @@ assertTrue("should not be bound", !ms.isBound() && !ms.isClosed() && !ms.isConnected()); ms.bind(new InetSocketAddress(InetAddress.getLocalHost(), - Support_PortManager.getNextPort())); + Support_PortManager.getNextPortForUDP())); assertTrue("should be bound", ms.isBound() && !ms.isClosed() && !ms.isConnected()); ms.close(); assertTrue("should be closed", ms.isClosed()); ms = new MulticastSocket(new InetSocketAddress(InetAddress - .getLocalHost(), Support_PortManager.getNextPort())); + .getLocalHost(), Support_PortManager.getNextPortForUDP())); assertTrue("should be bound", ms.isBound() && !ms.isClosed() && !ms.isConnected()); ms.close(); assertTrue("should be closed", ms.isClosed()); ms = new MulticastSocket(new InetSocketAddress("localhost", - Support_PortManager.getNextPort())); + Support_PortManager.getNextPortForUDP())); assertTrue("should be bound", ms.isBound() && !ms.isClosed() && !ms.isConnected()); ms.close(); @@ -955,7 +955,7 @@ boolean exception = false; try { ms = new MulticastSocket(new InetSocketAddress("unresolvedname", - Support_PortManager.getNextPort())); + Support_PortManager.getNextPortForUDP())); } catch (IOException e) { exception = true; } @@ -1055,7 +1055,7 @@ try { InetSocketAddress theAddress = new InetSocketAddress( InetAddress.getLocalHost(), Support_PortManager - .getNextPort()); + .getNextPortForUDP()); theSocket1 = new MulticastSocket(null); theSocket2 = new MulticastSocket(null); theSocket1.setReuseAddress(false); @@ -1076,7 +1076,7 @@ try { InetSocketAddress theAddress = new InetSocketAddress( InetAddress.getLocalHost(), Support_PortManager - .getNextPort()); + .getNextPortForUDP()); theSocket1 = new MulticastSocket(null); theSocket2 = new MulticastSocket(null); theSocket1.setReuseAddress(true); @@ -1097,7 +1097,7 @@ try { InetSocketAddress theAddress = new InetSocketAddress( InetAddress.getLocalHost(), Support_PortManager - .getNextPort()); + .getNextPortForUDP()); theSocket1 = new MulticastSocket(null); theSocket2 = new MulticastSocket(null); theSocket1.bind(theAddress);