Initial load
diff --git a/test/java/net/MulticastSocket/Test.java b/test/java/net/MulticastSocket/Test.java
new file mode 100644
index 0000000..14cedd3
--- /dev/null
+++ b/test/java/net/MulticastSocket/Test.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4488458
+ * @summary IPv4 and IPv6 multicasting broken on Linux
+ */
+import java.net.*;
+import java.io.IOException;
+import java.util.Enumeration;
+
+public class Test {
+
+    static int count = 0;
+    static int failures = 0;
+
+    void doTest(String address) throws Exception {
+        boolean failed = false;
+
+        InetAddress ia = InetAddress.getByName(address);
+
+        count++;
+        System.out.println("**********************");
+        System.out.println("Test " + count + ": " + ia);
+
+        MulticastSocket mc = new MulticastSocket();
+        int port = mc.getLocalPort();
+        DatagramSocket s1 = new DatagramSocket();
+
+        byte msg[] = "Hello".getBytes();
+        DatagramPacket p = new DatagramPacket(msg, msg.length);
+
+        mc.setSoTimeout(2000);
+
+        try {
+            for (int i=0; i<2; i++) {
+
+                System.out.println("Join: " + ia);
+                mc.joinGroup(ia);
+
+                /* packets should be received */
+
+                for (int j=0; j<2; j++) {
+                    p.setAddress(ia);
+                    p.setPort(port);
+
+                    System.out.println("Send packet to: " + ia);
+                    s1.send(p);
+
+                    try {
+                        mc.receive(p);
+                        System.out.println("Got packet! - Good.");
+                    } catch (SocketTimeoutException e) {
+                        failed = true;
+                        System.out.println("Failed: No packet received within timeout!!!");
+                    }
+                }
+
+                System.out.println("Leave: " + ia);
+                mc.leaveGroup(ia);
+
+                /*
+                 * If there are multiple interface we might be a couple of
+                 * copies still in our queue
+                 */
+                try {
+                    while (true) {
+                        mc.receive(p);
+                    }
+                } catch (SocketTimeoutException e) { }
+
+                /* packets should not be received */
+
+                p.setAddress(ia);
+                p.setPort(port);
+
+                s1.send(p);
+
+                try {
+                    mc.receive(p);
+                    System.out.println("Failed: Got packet after leaving group!!!");
+                    failed = true;
+                } catch (SocketTimeoutException e) {
+                    System.out.println("No packet received within timeout! - Good.");
+                }
+            }
+
+         } catch (IOException ioe) {
+            System.out.println("Failed: Unexpected exception thrown: ");
+            ioe.printStackTrace();
+            failed = true;
+        }
+
+        mc.close();
+        s1.close();
+
+        if (failed) {
+            failures++;
+            System.out.println("Test failed!!");
+        } else {
+            System.out.println("Test passed.");
+        }
+    }
+
+    void allTests() throws Exception {
+
+        /*
+         * Assume machine has IPv4 address
+         */
+        doTest("224.80.80.80");
+
+        /*
+         * Check if IPv6 is enabled and the scope of the addresses
+         */
+        boolean has_ipv6 = false;
+        boolean has_siteaddress = false;
+        boolean has_linklocaladdress = false;
+        boolean has_globaladdress = false;
+
+        Enumeration nifs = NetworkInterface.getNetworkInterfaces();
+        while (nifs.hasMoreElements()) {
+            NetworkInterface ni = (NetworkInterface)nifs.nextElement();
+            Enumeration addrs = ni.getInetAddresses();
+
+            while (addrs.hasMoreElements()) {
+                InetAddress ia = (InetAddress)addrs.nextElement();
+
+                if (ia instanceof Inet6Address) {
+                    has_ipv6 = true;
+                    if (ia.isLinkLocalAddress()) has_linklocaladdress = true;
+                    if (ia.isSiteLocalAddress()) has_siteaddress = true;
+
+                    if (!ia.isLinkLocalAddress() &&
+                        !ia.isSiteLocalAddress() &&
+                        !ia.isLoopbackAddress()) {
+                        has_globaladdress = true;
+                    }
+                }
+            }
+        }
+
+        /*
+         * If IPv6 is enabled perform multicast tests with various scopes
+         */
+        if (has_ipv6) {
+            doTest("ff01::a");
+        }
+
+        if (has_linklocaladdress) {
+            doTest("ff02::a");
+        }
+
+        if (has_siteaddress) {
+            doTest("ff05::a");
+        }
+
+        if (has_globaladdress) {
+            doTest("ff0e::a");
+        }
+    }
+
+    public static void main(String args[]) throws Exception {
+        Test t = new Test();
+
+        if (args.length == 0) {
+            t.allTests();
+        } else {
+            for (int i=0; i<args.length; i++) {
+                t.doTest(args[i]);
+            }
+        }
+
+        System.out.println("**********************");
+        System.out.println(count + " test(s) executed. " + failures +
+                           " test(s) failed.");
+
+        if (failures > 0) {
+            throw new Exception("Test failed - see log file for details");
+        }
+    }
+}