- Update to b30.

- Implement sigset(2) for libjsig.  All supported FreeBSD releases have it.
- Turn UseMembar back on by default until we find better solution.

1 files changed, 0 insertions, 1290 deletions

diff --git a/java/openjdk6/files/icedtea/openjdk/8015743-address_internet_addresses.patch b/java/openjdk6/files/icedtea/openjdk/8015743-address_internet_addresses.patch
deleted file mode 100644
index c44cea89db82..000000000000
--- a/java/openjdk6/files/icedtea/openjdk/8015743-address_internet_addresses.patch
+++ /dev/null
@@ -1,1290 +0,0 @@
-# HG changeset patch
-# User michaelm
-# Date 1381868930 -3600
-#      Tue Oct 15 21:28:50 2013 +0100
-# Node ID 96aee3742c52d2d1a83a3db0be2c14892a511c67
-# Parent  e10e9bfb11b073ee1c108e7a51078d3ead7a2d72
-8015743: Address internet addresses
-Summary: moved Inet6Address fields to holder class
-Reviewed-by: chegar, alanb, skoivu, khazra
-
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/share/classes/java/net/Inet6Address.java
---- jdk/src/share/classes/java/net/Inet6Address.java	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/share/classes/java/net/Inet6Address.java	Tue Oct 15 21:28:50 2013 +0100
-@@ -27,6 +27,8 @@
- 
- import java.security.AccessController;
- import java.io.ObjectInputStream;
-+import java.io.ObjectOutputStream;
-+import java.io.ObjectStreamField;
- import java.io.IOException;
- import java.io.ObjectStreamException;
- import java.io.InvalidObjectException;
-@@ -174,36 +176,196 @@
-      */
-     private transient int cached_scope_id = 0;
- 
--    /**
--     * Holds a 128-bit (16 bytes) IPv6 address.
--     *
--     * @serial
--     */
--    byte[] ipaddress;
-+    private class Inet6AddressHolder {
- 
--    /**
--     * scope_id. The scope specified when the object is created. If the object is created
--     * with an interface name, then the scope_id is not determined until the time it is needed.
--     */
--    private int scope_id = 0;
-+        private Inet6AddressHolder() {
-+            ipaddress = new byte[INADDRSZ];
-+        }
- 
--    /**
--     * This will be set to true when the scope_id field contains a valid
--     * integer scope_id.
--     */
--    private boolean scope_id_set = false;
-+        private Inet6AddressHolder(
-+            byte[] ipaddress, int scope_id, boolean scope_id_set,
-+            NetworkInterface ifname, boolean scope_ifname_set)
-+        {
-+            this.ipaddress = ipaddress;
-+            this.scope_id = scope_id;
-+            this.scope_id_set = scope_id_set;
-+            this.scope_ifname_set = scope_ifname_set;
-+            this.scope_ifname = ifname;
-+        }
- 
--    /**
--     * scoped interface. scope_id is derived from this as the scope_id of the first
--     * address whose scope is the same as this address for the named interface.
--     */
--    private transient NetworkInterface scope_ifname = null;
-+        /**
-+         * Holds a 128-bit (16 bytes) IPv6 address.
-+         */
-+        byte[] ipaddress;
- 
--    /**
--     * set if the object is constructed with a scoped interface instead of a
--     * numeric scope id.
--     */
--    private boolean scope_ifname_set = false;
-+        /**
-+         * scope_id. The scope specified when the object is created. If the object is created
-+         * with an interface name, then the scope_id is not determined until the time it is needed.
-+         */
-+        int scope_id = 0;
-+
-+        /**
-+         * This will be set to true when the scope_id field contains a valid
-+         * integer scope_id.
-+         */
-+        boolean scope_id_set = false;
-+
-+        /**
-+         * scoped interface. scope_id is derived from this as the scope_id of the first
-+         * address whose scope is the same as this address for the named interface.
-+         */
-+        NetworkInterface scope_ifname = null;
-+
-+        /**
-+         * set if the object is constructed with a scoped interface instead of a
-+         * numeric scope id.
-+         */
-+        boolean scope_ifname_set = false;
-+
-+        void setAddr(byte addr[]) {
-+            if (addr.length == INADDRSZ) { // normal IPv6 address
-+                System.arraycopy(addr, 0, ipaddress, 0, INADDRSZ);
-+            }
-+        }
-+
-+        void init(byte addr[], int scope_id) {
-+            setAddr(addr);
-+
-+            if (scope_id >= 0) {
-+                this.scope_id = scope_id;
-+                this.scope_id_set = true;
-+            }
-+        }
-+
-+        void init(byte addr[], NetworkInterface nif)
-+            throws UnknownHostException
-+        {
-+            setAddr(addr);
-+
-+            if (nif != null) {
-+                this.scope_id = deriveNumericScope(ipaddress, nif);
-+                this.scope_id_set = true;
-+                this.scope_ifname = nif;
-+                this.scope_ifname_set = true;
-+            }
-+        }
-+
-+        String getHostAddress() {
-+            String s = numericToTextFormat(ipaddress);
-+            if (scope_ifname_set) { /* must check this first */
-+                s = s + "%" + scope_ifname.getName();
-+            } else if (scope_id_set) {
-+                s = s + "%" + scope_id;
-+            }
-+            return s;
-+        }
-+
-+        public boolean equals(Object o) {
-+            if (! (o instanceof Inet6AddressHolder)) {
-+                return false;
-+            }
-+            Inet6AddressHolder that = (Inet6AddressHolder)o;
-+
-+            for (int i = 0; i < INADDRSZ; i++) {
-+                if (this.ipaddress[i] != that.ipaddress[i])
-+                    return false;
-+            }
-+
-+            return true;
-+        }
-+
-+        public int hashCode() {
-+            if (ipaddress != null) {
-+
-+                int hash = 0;
-+                int i=0;
-+                while (i<INADDRSZ) {
-+                    int j=0;
-+                    int component=0;
-+                    while (j<4 && i<INADDRSZ) {
-+                        component = (component << 8) + ipaddress[i];
-+                        j++;
-+                        i++;
-+                    }
-+                    hash += component;
-+                }
-+                return hash;
-+
-+            } else {
-+                return 0;
-+            }
-+        }
-+
-+        boolean isIPv4CompatibleAddress() {
-+            if ((ipaddress[0] == 0x00) && (ipaddress[1] == 0x00) &&
-+                (ipaddress[2] == 0x00) && (ipaddress[3] == 0x00) &&
-+                (ipaddress[4] == 0x00) && (ipaddress[5] == 0x00) &&
-+                (ipaddress[6] == 0x00) && (ipaddress[7] == 0x00) &&
-+                (ipaddress[8] == 0x00) && (ipaddress[9] == 0x00) &&
-+                (ipaddress[10] == 0x00) && (ipaddress[11] == 0x00))  {
-+                return true;
-+            }
-+            return false;
-+        }
-+
-+        boolean isMulticastAddress() {
-+            return ((ipaddress[0] & 0xff) == 0xff);
-+        }
-+
-+        boolean isAnyLocalAddress() {
-+            byte test = 0x00;
-+            for (int i = 0; i < INADDRSZ; i++) {
-+                test |= ipaddress[i];
-+            }
-+            return (test == 0x00);
-+        }
-+
-+        boolean isLoopbackAddress() {
-+            byte test = 0x00;
-+            for (int i = 0; i < 15; i++) {
-+                test |= ipaddress[i];
-+            }
-+            return (test == 0x00) && (ipaddress[15] == 0x01);
-+        }
-+
-+        boolean isLinkLocalAddress() {
-+            return ((ipaddress[0] & 0xff) == 0xfe
-+                    && (ipaddress[1] & 0xc0) == 0x80);
-+        }
-+
-+
-+        boolean isSiteLocalAddress() {
-+            return ((ipaddress[0] & 0xff) == 0xfe
-+                    && (ipaddress[1] & 0xc0) == 0xc0);
-+        }
-+
-+        boolean isMCGlobal() {
-+            return ((ipaddress[0] & 0xff) == 0xff
-+                    && (ipaddress[1] & 0x0f) == 0x0e);
-+        }
-+
-+        boolean isMCNodeLocal() {
-+            return ((ipaddress[0] & 0xff) == 0xff
-+                    && (ipaddress[1] & 0x0f) == 0x01);
-+        }
-+
-+        boolean isMCLinkLocal() {
-+            return ((ipaddress[0] & 0xff) == 0xff
-+                    && (ipaddress[1] & 0x0f) == 0x02);
-+        }
-+
-+        boolean isMCSiteLocal() {
-+            return ((ipaddress[0] & 0xff) == 0xff
-+                    && (ipaddress[1] & 0x0f) == 0x05);
-+        }
-+
-+        boolean isMCOrgLocal() {
-+            return ((ipaddress[0] & 0xff) == 0xff
-+                    && (ipaddress[1] & 0x0f) == 0x08);
-+        }
-+    }
-+
-+    private final transient Inet6AddressHolder holder6;
- 
-     private static final long serialVersionUID = 6880410070516793377L;
- 
-@@ -216,37 +378,33 @@
- 
-     Inet6Address() {
-         super();
--        holder().hostName = null;
--        ipaddress = new byte[INADDRSZ];
--        holder().family = IPv6;
-+        holder.init(null, IPv6);
-+        holder6 = new Inet6AddressHolder();
-     }
- 
-     /* checking of value for scope_id should be done by caller
-      * scope_id must be >= 0, or -1 to indicate not being set
-      */
-     Inet6Address(String hostName, byte addr[], int scope_id) {
--        holder().hostName = hostName;
--        if (addr.length == INADDRSZ) { // normal IPv6 address
--            holder().family = IPv6;
--            ipaddress = addr.clone();
--        }
--        if (scope_id >= 0) {
--            this.scope_id = scope_id;
--            scope_id_set = true;
--        }
-+        holder.init(hostName, IPv6);
-+        holder6 = new Inet6AddressHolder();
-+        holder6.init(addr, scope_id);
-     }
- 
-     Inet6Address(String hostName, byte addr[]) {
-+        holder6 = new Inet6AddressHolder();
-         try {
-             initif (hostName, addr, null);
-         } catch (UnknownHostException e) {} /* cant happen if ifname is null */
-     }
- 
-     Inet6Address (String hostName, byte addr[], NetworkInterface nif) throws UnknownHostException {
-+        holder6 = new Inet6AddressHolder();
-         initif (hostName, addr, nif);
-     }
- 
-     Inet6Address (String hostName, byte addr[], String ifname) throws UnknownHostException {
-+        holder6 = new Inet6AddressHolder();
-         initstr (hostName, addr, ifname);
-     }
- 
-@@ -328,17 +486,13 @@
-     }
- 
-     private void initif(String hostName, byte addr[],NetworkInterface nif) throws UnknownHostException {
--        holder().hostName = hostName;
-+        int family = -1;
-+        holder6.init(addr, nif);
-+
-         if (addr.length == INADDRSZ) { // normal IPv6 address
--            holder().family = IPv6;
--            ipaddress = addr.clone();
-+            family = IPv6;
-         }
--        if (nif != null) {
--            this.scope_ifname = nif;
--            scope_ifname_set = true;
--            scope_id = deriveNumericScope (nif);
--            scope_id_set = true;
--        }
-+        holder.init(hostName, family);
-     }
- 
-     /* check the two Ipv6 addresses and return false if they are both
-@@ -346,18 +500,21 @@
-      * (ie. one is sitelocal and the other linklocal)
-      * return true otherwise.
-      */
--    private boolean differentLocalAddressTypes(Inet6Address other) {
-+    private static boolean differentLocalAddressTypes(
-+        byte[] thisAddr, byte[] otherAddr) {
- 
--        if (isLinkLocalAddress() && !other.isLinkLocalAddress()) {
-+        if (Inet6Address.isLinkLocalAddress(thisAddr) &&
-+                !Inet6Address.isLinkLocalAddress(otherAddr)) {
-             return false;
-         }
--        if (isSiteLocalAddress() && !other.isSiteLocalAddress()) {
-+        if (Inet6Address.isSiteLocalAddress(thisAddr) &&
-+                !Inet6Address.isSiteLocalAddress(otherAddr)) {
-             return false;
-         }
-         return true;
-     }
- 
--    private int deriveNumericScope (NetworkInterface ifc) throws UnknownHostException {
-+    private static int deriveNumericScope (byte[] thisAddr, NetworkInterface ifc) throws UnknownHostException {
-         Enumeration addresses = ifc.getInetAddresses();
-         while (addresses.hasMoreElements()) {
-             InetAddress address = (InetAddress)addresses.nextElement();
-@@ -366,12 +523,12 @@
-             }
-             Inet6Address ia6_addr = (Inet6Address)address;
-             /* check if site or link local prefixes match */
--            if (!differentLocalAddressTypes(ia6_addr)){
-+            if (!differentLocalAddressTypes(thisAddr, ia6_addr.getAddress())){
-                 /* type not the same, so carry on searching */
-                 continue;
-             }
-             /* found a matching address - return its scope_id */
--            return ia6_addr.scope_id;
-+            return ia6_addr.getScopeId();
-         }
-         throw new UnknownHostException ("no scope_id found");
-     }
-@@ -386,47 +543,67 @@
-         while (en.hasMoreElements()) {
-             NetworkInterface ifc = (NetworkInterface)en.nextElement();
-             if (ifc.getName().equals (ifname)) {
--                Enumeration addresses = ifc.getInetAddresses();
--                while (addresses.hasMoreElements()) {
--                    InetAddress address = (InetAddress)addresses.nextElement();
--                    if (!(address instanceof Inet6Address)) {
--                        continue;
--                    }
--                    Inet6Address ia6_addr = (Inet6Address)address;
--                    /* check if site or link local prefixes match */
--                    if (!differentLocalAddressTypes(ia6_addr)){
--                        /* type not the same, so carry on searching */
--                        continue;
--                    }
--                    /* found a matching address - return its scope_id */
--                    return ia6_addr.scope_id;
--                }
-+                return deriveNumericScope(holder6.ipaddress, ifc);
-             }
-         }
-         throw new UnknownHostException ("No matching address found for interface : " +ifname);
-     }
- 
-     /**
-+     * @serialField ipaddress byte[]
-+     * @serialField scope_id int
-+     * @serialField scope_id_set boolean
-+     * @serialField scope_ifname_set boolean
-+     * @serialField ifname String
-+     */
-+
-+    private static final ObjectStreamField[] serialPersistentFields = {
-+         new ObjectStreamField("ipaddress", byte[].class),
-+         new ObjectStreamField("scope_id", int.class),
-+         new ObjectStreamField("scope_id_set", boolean.class),
-+         new ObjectStreamField("scope_ifname_set", boolean.class),
-+         new ObjectStreamField("ifname", String.class)
-+    };
-+
-+    private static final long FIELDS_OFFSET;
-+    private static final sun.misc.Unsafe UNSAFE;
-+
-+    static {
-+        try {
-+            sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
-+            FIELDS_OFFSET = unsafe.objectFieldOffset(
-+                    Inet6Address.class.getDeclaredField("holder6"));
-+            UNSAFE = unsafe;
-+        } catch (NoSuchFieldException e) {
-+            throw new Error(e);
-+        }
-+    }
-+
-+    /**
-      * restore the state of this object from stream
-      * including the scope information, only if the
-      * scoped interface name is valid on this system
-      */
-     private void readObject(ObjectInputStream s)
-         throws IOException, ClassNotFoundException {
--        scope_ifname = null;
--        scope_ifname_set = false;
-+        NetworkInterface scope_ifname = null;
- 
-         if (getClass().getClassLoader() != null) {
-             throw new SecurityException ("invalid address type");
-         }
- 
--        s.defaultReadObject();
-+        ObjectInputStream.GetField gf = s.readFields();
-+        byte[] ipaddress = (byte[])gf.get("ipaddress", null);
-+        int scope_id = (int)gf.get("scope_id", -1);
-+        boolean scope_id_set = (boolean)gf.get("scope_id_set", false);
-+        boolean scope_ifname_set = (boolean)gf.get("scope_ifname_set", false);
-+        String ifname = (String)gf.get("ifname", null);
- 
-         if (ifname != null && !"".equals (ifname)) {
-             try {
-                 scope_ifname = NetworkInterface.getByName(ifname);
-                 try {
--                    scope_id = deriveNumericScope (scope_ifname);
-+		    scope_id = deriveNumericScope (ipaddress, scope_ifname);
-                 } catch (UnknownHostException e) {
-                     // should not happen
-                     assert false;
-@@ -451,9 +628,37 @@
-                                              ipaddress.length);
-         }
- 
--        if (holder().getFamily() != IPv6) {
-+        if (holder.getFamily() != IPv6) {
-             throw new InvalidObjectException("invalid address family type");
-         }
-+
-+        Inet6AddressHolder h = new Inet6AddressHolder(
-+            ipaddress, scope_id, scope_id_set, scope_ifname, scope_ifname_set
-+        );
-+
-+        UNSAFE.putObject(this, FIELDS_OFFSET, h);
-+    }
-+
-+    /**
-+     * default behavior is overridden in order to write the
-+     * scope_ifname field as a String, rather than a NetworkInterface
-+     * which is not serializable
-+     */
-+    private synchronized void writeObject(ObjectOutputStream s)
-+        throws IOException
-+    {
-+            String ifname = null;
-+
-+        if (holder6.scope_ifname_set) {
-+            ifname = holder6.scope_ifname.getName();
-+        }
-+        ObjectOutputStream.PutField pfields = s.putFields();
-+        pfields.put("ipaddress", holder6.ipaddress);
-+        pfields.put("scope_id", holder6.scope_id);
-+        pfields.put("scope_id_set", holder6.scope_id_set);
-+        pfields.put("scope_ifname_set", holder6.scope_ifname_set);
-+        pfields.put("ifname", ifname);
-+        s.writeFields();
-     }
- 
-     /**
-@@ -466,7 +671,7 @@
-      * @since JDK1.1
-      */
-     public boolean isMulticastAddress() {
--        return ((ipaddress[0] & 0xff) == 0xff);
-+        return holder6.isMulticastAddress();
-     }
- 
-     /**
-@@ -476,11 +681,7 @@
-      * @since 1.4
-      */
-     public boolean isAnyLocalAddress() {
--        byte test = 0x00;
--        for (int i = 0; i < INADDRSZ; i++) {
--            test |= ipaddress[i];
--        }
--        return (test == 0x00);
-+        return holder6.isAnyLocalAddress();
-     }
- 
-     /**
-@@ -491,11 +692,7 @@
-      * @since 1.4
-      */
-     public boolean isLoopbackAddress() {
--        byte test = 0x00;
--        for (int i = 0; i < 15; i++) {
--            test |= ipaddress[i];
--        }
--        return (test == 0x00) && (ipaddress[15] == 0x01);
-+        return holder6.isLoopbackAddress();
-     }
- 
-     /**
-@@ -506,6 +703,11 @@
-      * @since 1.4
-      */
-     public boolean isLinkLocalAddress() {
-+        return holder6.isLinkLocalAddress();
-+    }
-+
-+    /* static version of above */
-+    static boolean isLinkLocalAddress(byte[] ipaddress) {
-         return ((ipaddress[0] & 0xff) == 0xfe
-                 && (ipaddress[1] & 0xc0) == 0x80);
-     }
-@@ -518,6 +720,11 @@
-      * @since 1.4
-      */
-     public boolean isSiteLocalAddress() {
-+        return holder6.isSiteLocalAddress();
-+    }
-+
-+    /* static version of above */
-+    static boolean isSiteLocalAddress(byte[] ipaddress) {
-         return ((ipaddress[0] & 0xff) == 0xfe
-                 && (ipaddress[1] & 0xc0) == 0xc0);
-     }
-@@ -531,8 +738,7 @@
-      * @since 1.4
-      */
-     public boolean isMCGlobal() {
--        return ((ipaddress[0] & 0xff) == 0xff
--                && (ipaddress[1] & 0x0f) == 0x0e);
-+        return holder6.isMCGlobal();
-     }
- 
-     /**
-@@ -544,8 +750,7 @@
-      * @since 1.4
-      */
-     public boolean isMCNodeLocal() {
--        return ((ipaddress[0] & 0xff) == 0xff
--                && (ipaddress[1] & 0x0f) == 0x01);
-+        return holder6.isMCNodeLocal();
-     }
- 
-     /**
-@@ -557,8 +762,7 @@
-      * @since 1.4
-      */
-     public boolean isMCLinkLocal() {
--        return ((ipaddress[0] & 0xff) == 0xff
--                && (ipaddress[1] & 0x0f) == 0x02);
-+        return holder6.isMCLinkLocal();
-     }
- 
-     /**
-@@ -570,8 +774,7 @@
-      * @since 1.4
-      */
-     public boolean isMCSiteLocal() {
--        return ((ipaddress[0] & 0xff) == 0xff
--                && (ipaddress[1] & 0x0f) == 0x05);
-+        return holder6.isMCSiteLocal();
-     }
- 
-     /**
-@@ -584,10 +787,8 @@
-      * @since 1.4
-      */
-     public boolean isMCOrgLocal() {
--        return ((ipaddress[0] & 0xff) == 0xff
--                && (ipaddress[1] & 0x0f) == 0x08);
-+        return holder6.isMCOrgLocal();
-     }
--
-     /**
-      * Returns the raw IP address of this <code>InetAddress</code>
-      * object. The result is in network byte order: the highest order
-@@ -596,7 +797,7 @@
-      * @return  the raw IP address of this object.
-      */
-     public byte[] getAddress() {
--        return ipaddress.clone();
-+        return holder6.ipaddress.clone();
-     }
- 
-     /**
-@@ -607,7 +808,7 @@
-      * @since 1.5
-      */
-      public int getScopeId () {
--        return scope_id;
-+        return holder6.scope_id;
-      }
- 
-     /**
-@@ -618,7 +819,7 @@
-      * @since 1.5
-      */
-      public NetworkInterface getScopedInterface () {
--        return scope_ifname;
-+        return holder6.scope_ifname;
-      }
- 
-     /**
-@@ -630,13 +831,7 @@
-      * @return  the raw IP address in a string format.
-      */
-     public String getHostAddress() {
--        String s = numericToTextFormat(ipaddress);
--        if (scope_ifname_set) { /* must check this first */
--            s = s + "%" + scope_ifname.getName();
--        } else if (scope_id_set) {
--            s = s + "%" + scope_id;
--        }
--        return s;
-+        return holder6.getHostAddress();
-     }
- 
-     /**
-@@ -645,25 +840,7 @@
-      * @return  a hash code value for this IP address.
-      */
-     public int hashCode() {
--        if (ipaddress != null) {
--
--            int hash = 0;
--            int i=0;
--            while (i<INADDRSZ) {
--                int j=0;
--                int component=0;
--                while (j<4 && i<INADDRSZ) {
--                    component = (component << 8) + ipaddress[i];
--                    j++;
--                    i++;
--                }
--                hash += component;
--            }
--            return hash;
--
--        } else {
--            return 0;
--        }
-+        return holder6.hashCode();
-     }
- 
-     /**
-@@ -689,12 +866,7 @@
- 
-         Inet6Address inetAddr = (Inet6Address)obj;
- 
--        for (int i = 0; i < INADDRSZ; i++) {
--            if (ipaddress[i] != inetAddr.ipaddress[i])
--                return false;
--        }
--
--        return true;
-+        return holder6.equals(inetAddr.holder6);
-     }
- 
-     /**
-@@ -706,15 +878,7 @@
-      * @since 1.4
-      */
-     public boolean isIPv4CompatibleAddress() {
--        if ((ipaddress[0] == 0x00) && (ipaddress[1] == 0x00) &&
--            (ipaddress[2] == 0x00) && (ipaddress[3] == 0x00) &&
--            (ipaddress[4] == 0x00) && (ipaddress[5] == 0x00) &&
--            (ipaddress[6] == 0x00) && (ipaddress[7] == 0x00) &&
--            (ipaddress[8] == 0x00) && (ipaddress[9] == 0x00) &&
--            (ipaddress[10] == 0x00) && (ipaddress[11] == 0x00))  {
--            return true;
--        }
--        return false;
-+        return holder6.isIPv4CompatibleAddress();
-     }
- 
-     // Utilities
-@@ -744,23 +908,4 @@
-      * Perform class load-time initializations.
-      */
-     private static native void init();
--
--    /**
--     * Following field is only used during (de)/serialization
--     */
--    private String ifname;
--
--    /**
--     * default behavior is overridden in order to write the
--     * scope_ifname field as a String, rather than a NetworkInterface
--     * which is not serializable
--     */
--    private synchronized void writeObject(java.io.ObjectOutputStream s)
--        throws IOException
--    {
--        if (scope_ifname_set) {
--            ifname = scope_ifname.getName();
--        }
--        s.defaultWriteObject();
--    }
- }
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/share/classes/java/net/InetAddress.java
---- jdk/src/share/classes/java/net/InetAddress.java	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/share/classes/java/net/InetAddress.java	Tue Oct 15 21:28:50 2013 +0100
-@@ -210,6 +210,13 @@
-             this.family = family;
-         }
- 
-+        void init(String hostName, int family) {
-+            this.hostName = hostName;
-+            if (family != -1) {
-+                this.family = family;
-+            }
-+        }
-+
-         String hostName;
- 
-         String getHostName() {
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/share/native/java/net/Inet6Address.c
---- jdk/src/share/native/java/net/Inet6Address.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/share/native/java/net/Inet6Address.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -33,6 +33,8 @@
-  */
- 
- jclass ia6_class;
-+jfieldID ia6_holder6ID;
-+
- jfieldID ia6_ipaddressID;
- jfieldID ia6_scopeidID;
- jfieldID ia6_cachedscopeidID;
-@@ -48,21 +50,26 @@
-  */
- JNIEXPORT void JNICALL
- Java_java_net_Inet6Address_init(JNIEnv *env, jclass cls) {
-+    jclass ia6h_class;
-     jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
-     CHECK_NULL(c);
-     ia6_class = (*env)->NewGlobalRef(env, c);
-     CHECK_NULL(ia6_class);
--    ia6_ipaddressID = (*env)->GetFieldID(env, ia6_class, "ipaddress", "[B");
-+    ia6h_class = (*env)->FindClass(env, "java/net/Inet6Address$Inet6AddressHolder");
-+    CHECK_NULL(ia6h_class);
-+    ia6_holder6ID = (*env)->GetFieldID(env, ia6_class, "holder6", "Ljava/net/Inet6Address$Inet6AddressHolder;");
-+    CHECK_NULL(ia6_holder6ID);
-+    ia6_ipaddressID = (*env)->GetFieldID(env, ia6h_class, "ipaddress", "[B");
-     CHECK_NULL(ia6_ipaddressID);
--    ia6_scopeidID = (*env)->GetFieldID(env, ia6_class, "scope_id", "I");
-+    ia6_scopeidID = (*env)->GetFieldID(env, ia6h_class, "scope_id", "I");
-     CHECK_NULL(ia6_scopeidID);
-     ia6_cachedscopeidID = (*env)->GetFieldID(env, ia6_class, "cached_scope_id", "I");
-     CHECK_NULL(ia6_cachedscopeidID);
--    ia6_scopeidsetID = (*env)->GetFieldID(env, ia6_class, "scope_id_set", "Z");
-+    ia6_scopeidsetID = (*env)->GetFieldID(env, ia6h_class, "scope_id_set", "Z");
-     CHECK_NULL(ia6_scopeidID);
--    ia6_scopeifnameID = (*env)->GetFieldID(env, ia6_class, "scope_ifname", "Ljava/net/NetworkInterface;");
-+    ia6_scopeifnameID = (*env)->GetFieldID(env, ia6h_class, "scope_ifname", "Ljava/net/NetworkInterface;");
-     CHECK_NULL(ia6_scopeifnameID);
--    ia6_scopeifnamesetID = (*env)->GetFieldID(env, ia6_class, "scope_ifname_set", "Z");
-+    ia6_scopeifnamesetID = (*env)->GetFieldID(env, ia6h_class, "scope_ifname_set", "Z");
-     CHECK_NULL(ia6_scopeifnamesetID);
-     ia6_ctrID = (*env)->GetMethodID(env, ia6_class, "<init>", "()V");
-     CHECK_NULL(ia6_ctrID);
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/share/native/java/net/net_util.c
---- jdk/src/share/native/java/net/net_util.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/share/native/java/net/net_util.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -94,6 +94,111 @@
- extern jfieldID iac_addressID;
- extern jfieldID iac_familyID;
- 
-+/**
-+ * set_ methods return JNI_TRUE on success JNI_FALSE on error
-+ * get_ methods that return +ve int return -1 on error
-+ * get_ methods that return objects return NULL on error.
-+ */
-+jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) {
-+    jobject holder;
-+
-+    init(env);
-+    holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+    CHECK_NULL_RETURN(holder, NULL);
-+    return (*env)->GetObjectField(env, holder, ia6_scopeifnameID);
-+}
-+
-+int setInet6Address_scopeifname(JNIEnv *env, jobject iaObj, jobject scopeifname) {
-+    jobject holder;
-+
-+    init(env);
-+    holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+    CHECK_NULL_RETURN(holder, JNI_FALSE);
-+    (*env)->SetObjectField(env, holder, ia6_scopeifnameID, scopeifname);
-+    return JNI_TRUE;
-+}
-+
-+int getInet6Address_scopeifname_set(JNIEnv *env, jobject iaObj) {
-+    jobject holder;
-+
-+    init(env);
-+    holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+    CHECK_NULL_RETURN(holder, -1);
-+    return (*env)->GetBooleanField(env, holder, ia6_scopeifnamesetID);
-+}
-+
-+int setInet6Address_scopeifname_set(JNIEnv *env, jobject iaObj, int scopeifname_set) {
-+    jobject holder;
-+
-+    init(env);
-+    holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+    CHECK_NULL_RETURN(holder, JNI_FALSE);
-+    (*env)->SetBooleanField(env, holder, ia6_scopeifnamesetID, scopeifname_set);
-+    return JNI_TRUE;
-+}
-+
-+int getInet6Address_scopeid_set(JNIEnv *env, jobject iaObj) {
-+    jobject holder;
-+
-+    init(env);
-+    holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+    CHECK_NULL_RETURN(holder, -1);
-+    return (*env)->GetBooleanField(env, holder, ia6_scopeidsetID);
-+}
-+
-+int getInet6Address_scopeid(JNIEnv *env, jobject iaObj) {
-+    jobject holder;
-+
-+    init(env);
-+    holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+    CHECK_NULL_RETURN(holder, -1);
-+    return (*env)->GetIntField(env, holder, ia6_scopeidID);
-+}
-+
-+int setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
-+    jobject holder;
-+
-+    init(env);
-+    holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+    CHECK_NULL_RETURN(holder, JNI_FALSE);
-+    (*env)->SetIntField(env, holder, ia6_scopeidID, scopeid);
-+    if (scopeid > 0) {
-+            (*env)->SetBooleanField(env, holder, ia6_scopeidsetID, JNI_TRUE);
-+    }
-+    return JNI_TRUE;
-+}
-+
-+
-+int getInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *dest) {
-+    jobject holder, addr;
-+    jbyteArray barr;
-+
-+    init(env);
-+    holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+    CHECK_NULL_RETURN(holder, JNI_FALSE);
-+    addr =  (*env)->GetObjectField(env, holder, ia6_ipaddressID);
-+    CHECK_NULL_RETURN(addr, JNI_FALSE);
-+    (*env)->GetByteArrayRegion(env, addr, 0, 16, (jbyte *)dest);
-+    return JNI_TRUE;
-+}
-+
-+int setInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *address) {
-+    jobject holder;
-+    jbyteArray addr;
-+
-+    init(env);
-+    holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
-+    CHECK_NULL_RETURN(holder, JNI_FALSE);
-+    addr =  (jbyteArray)(*env)->GetObjectField(env, holder, ia6_ipaddressID);
-+    if (addr == NULL) {
-+        addr = (*env)->NewByteArray(env, 16);
-+        CHECK_NULL_RETURN(addr, JNI_FALSE);
-+        (*env)->SetObjectField(env, holder, ia6_ipaddressID, addr);
-+    }
-+    (*env)->SetByteArrayRegion(env, addr, 0, 16, (jbyte *)address);
-+    return JNI_TRUE;
-+}
-+
- void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address) {
-     jobject holder;
-     init(env);
-@@ -166,6 +271,7 @@
-             setInetAddress_family(env, iaObj, IPv4);
-         } else {
-             static jclass inet6Cls = 0;
-+            int ret;
-             if (inet6Cls == 0) {
-                 jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
-                 CHECK_NULL_RETURN(c, NULL);
-@@ -175,15 +281,10 @@
-             }
-             iaObj = (*env)->NewObject(env, inet6Cls, ia6_ctrID);
-             CHECK_NULL_RETURN(iaObj, NULL);
--            ipaddress = (*env)->NewByteArray(env, 16);
--            CHECK_NULL_RETURN(ipaddress, NULL);
--            (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
--                                       (jbyte *)&(him6->sin6_addr));
--
--            (*env)->SetObjectField(env, iaObj, ia6_ipaddressID, ipaddress);
--
-+            ret = setInet6Address_ipaddress(env, iaObj, (char *)&(him6->sin6_addr));
-+            CHECK_NULL_RETURN(ret, NULL);
-             setInetAddress_family(env, iaObj, IPv6);
--            (*env)->SetIntField(env, iaObj, ia6_scopeidID, getScopeID(him));
-+	    setInet6Address_scopeid(env, iaObj, getScopeID(him));
-         }
-         *port = ntohs(him6->sin6_port);
-     } else
-@@ -242,9 +343,8 @@
-             if (family == AF_INET) {
-                 return JNI_FALSE;
-             }
--            ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
--            scope = (*env)->GetIntField(env, iaObj, ia6_scopeidID);
--            (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddrCur);
-+            scope = getInet6Address_scopeid(env, iaObj);
-+            getInet6Address_ipaddress(env, iaObj, (char *)caddrCur);
-             if (NET_IsEqual(caddrNew, caddrCur) && cmpScopeID(scope, him)) {
-                 return JNI_TRUE;
-             } else {
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/share/native/java/net/net_util.h
---- jdk/src/share/native/java/net/net_util.h	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/share/native/java/net/net_util.h	Tue Oct 15 21:28:50 2013 +0100
-@@ -58,6 +58,22 @@
- extern jfieldID iac_hostNameID;
- extern jfieldID ia_preferIPv6AddressID;
- 
-+/** (Inet6Address accessors)
-+ * set_ methods return JNI_TRUE on success JNI_FALSE on error
-+ * get_ methods that return int/boolean, return -1 on error
-+ * get_ methods that return objects return NULL on error.
-+ */
-+extern jobject getInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj);
-+extern int setInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj, jobject scopeifname);
-+extern int getInet6Address_scopeifname_set(JNIEnv *env, jobject ia6Obj);
-+extern int setInet6Address_scopeifname_set(JNIEnv *env, jobject ia6Obj,
-+        int scopeifname_set);
-+extern int getInet6Address_scopeid_set(JNIEnv *env, jobject ia6Obj);
-+extern int getInet6Address_scopeid(JNIEnv *env, jobject ia6Obj);
-+extern int setInet6Address_scopeid(JNIEnv *env, jobject ia6Obj, int scopeid);
-+extern int getInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *dest);
-+extern int setInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *address);
-+
- extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address);
- extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family);
- extern void setInetAddress_hostName(JNIEnv *env, jobject iaObj, jobject h);
-@@ -93,6 +109,7 @@
- 
- /* Inet6Address fields */
- extern jclass ia6_class;
-+extern jfieldID ia6_holder6ID;
- extern jfieldID ia6_ipaddressID;
- extern jfieldID ia6_scopeidID;
- extern jfieldID ia6_cachedscopeidID;
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/solaris/native/java/net/Inet6AddressImpl.c
---- jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -120,7 +120,6 @@
- static jclass ni_ia6cls;
- static jmethodID ni_ia4ctrID;
- static jmethodID ni_ia6ctrID;
--static jfieldID ni_ia6ipaddressID;
- static int initialized = 0;
- 
- /*
-@@ -158,7 +157,6 @@
-       ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
-       ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
-       ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
--      ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
-       initialized = 1;
-     }
- 
-@@ -310,6 +308,7 @@
-               goto cleanupAndReturn;
-             }
-             while (iterator != NULL) {
-+              int ret1;
-               if (iterator->ai_family == AF_INET) {
-                 jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID);
-                 if (IS_NULL(iaObj)) {
-@@ -322,20 +321,17 @@
-                 inetIndex++;
-               } else if (iterator->ai_family == AF_INET6) {
-                 jint scope = 0;
--                jbyteArray ipaddress;
- 
-                 jobject iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
-                 if (IS_NULL(iaObj)) {
-                   ret = NULL;
-                   goto cleanupAndReturn;
-                 }
--                ipaddress = (*env)->NewByteArray(env, 16);
--                if (IS_NULL(ipaddress)) {
--                  ret = NULL;
--                  goto cleanupAndReturn;
-+                ret1 = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
-+                if (!ret1) {
-+                    ret = NULL;
-+                    goto cleanupAndReturn;
-                 }
--                (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
--                                           (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
- #ifdef __linux__
-                 if (!kernelIsV22()) {
-                   scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
-@@ -344,10 +340,8 @@
-                 scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
- #endif
-                 if (scope != 0) { /* zero is default value, no need to set */
--                  (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
--                  (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
-+                  setInet6Address_scopeid(env, iaObj, scope);
-                 }
--                (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
-                 setInetAddress_hostName(env, iaObj, name);
-                 (*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj);
-                 inet6Index++;
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/solaris/native/java/net/NetworkInterface.c
---- jdk/src/solaris/native/java/net/NetworkInterface.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/solaris/native/java/net/NetworkInterface.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -101,7 +101,6 @@
- static jmethodID ni_ia4ctrID;
- static jmethodID ni_ia6ctrID;
- static jmethodID ni_ibctrID;
--static jfieldID ni_ia6ipaddressID;
- static jfieldID ni_ibaddressID;
- static jfieldID ni_ib4broadcastID;
- static jfieldID ni_ib4maskID;
-@@ -151,7 +150,6 @@
-     ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
-     ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
-     ni_ibctrID = (*env)->GetMethodID(env, ni_ibcls, "<init>", "()V");
--    ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
-     ni_ibaddressID = (*env)->GetFieldID(env, ni_ibcls, "address", "Ljava/net/InetAddress;");
-     ni_ib4broadcastID = (*env)->GetFieldID(env, ni_ibcls, "broadcast", "Ljava/net/Inet4Address;");
-     ni_ib4maskID = (*env)->GetFieldID(env, ni_ibcls, "maskLength", "S");
-@@ -281,11 +279,9 @@
- #ifdef AF_INET6
-                 if (family == AF_INET6) {
-                     jbyte *bytes = (jbyte *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr);
--                    jbyteArray ipaddress = (*env)->GetObjectField(env, iaObj, ni_ia6ipaddressID);
-                     jbyte caddr[16];
-                     int i;
--
--                    (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
-+                    getInet6Address_ipaddress(env, iaObj, (char *)caddr);
-                     i = 0;
-                     while (i < 16) {
-                         if (caddr[i] != bytes[i]) {
-@@ -468,12 +464,10 @@
-             int scope=0;
-             iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
-             if (iaObj) {
--                jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
--                if (ipaddress == NULL) {
-+                int ret = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr));
-+                if (ret == JNI_FALSE) {
-                     return NULL;
-                 }
--                (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
--                    (jbyte *)&(((struct sockaddr_in6*)addrP->addr)->sin6_addr));
- #ifdef __linux__
-                 if (!kernelIsV22()) {
-                     scope = ((struct sockaddr_in6*)addrP->addr)->sin6_scope_id;
-@@ -482,11 +476,9 @@
-                 scope = ((struct sockaddr_in6*)addrP->addr)->sin6_scope_id;
- #endif
-                 if (scope != 0) { /* zero is default value, no need to set */
--                    (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
--                    (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
--                    (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
-+                    setInet6Address_scopeid(env, iaObj, scope);
-+                    setInet6Address_scopeifname(env, iaObj, netifObj);
-                 }
--                (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
-             }
-             ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
-             if (ibObj) {
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/solaris/native/java/net/PlainDatagramSocketImpl.c
---- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -2311,8 +2311,7 @@
-             caddr[14] = ((address >> 8) & 0xff);
-             caddr[15] = (address & 0xff);
-         } else {
--            ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
--            (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
-+            getInet6Address_ipaddress(env, iaObj, caddr);
-         }
- 
-         memcpy((void *)&(mname6.ipv6mr_multiaddr), caddr, sizeof(struct in6_addr));
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/solaris/native/java/net/net_util_md.c
---- jdk/src/solaris/native/java/net/net_util_md.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/solaris/native/java/net/net_util_md.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -680,7 +680,6 @@
-     /* needs work. 1. family 2. clean up him6 etc deallocate memory */
-     if (ipv6_available() && !(family == IPv4 && v4MappedAddress == JNI_FALSE)) {
-         struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
--        jbyteArray ipaddress;
-         jbyte caddr[16];
-         jint address;
- 
-@@ -701,8 +700,7 @@
-                 caddr[15] = (address & 0xff);
-             }
-         } else {
--            ipaddress = (*env)->GetObjectField(env, iaObj, ia6_ipaddressID);
--            (*env)->GetByteArrayRegion(env, ipaddress, 0, 16, caddr);
-+            getInet6Address_ipaddress(env, iaObj, (char *)caddr);
-         }
-         memset((char *)him6, 0, sizeof(struct sockaddr_in6));
-         him6->sin6_port = htons(port);
-@@ -734,7 +732,7 @@
-                  */
-                 if (!cached_scope_id) {
-                     if (ia6_scopeidID) {
--                        scope_id = (int)(*env)->GetIntField(env,iaObj,ia6_scopeidID);
-+                        scope_id = getInet6Address_scopeid(env, iaObj);
-                     }
-                     if (scope_id != 0) {
-                         /* check user-specified value for loopback case
-@@ -780,7 +778,7 @@
- 
-         if (family != IPv4) {
-             if (ia6_scopeidID) {
--                him6->sin6_scope_id = (int)(*env)->GetIntField(env, iaObj, ia6_scopeidID);
-+                him6->sin6_scope_id = getInet6Address_scopeid(env, iaObj);
-             }
-         }
- #endif
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/windows/native/java/net/Inet6AddressImpl.c
---- jdk/src/windows/native/java/net/Inet6AddressImpl.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/windows/native/java/net/Inet6AddressImpl.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -76,7 +76,6 @@
- static jclass ni_ia6cls;
- static jmethodID ni_ia4ctrID;
- static jmethodID ni_ia6ctrID;
--static jfieldID ni_ia6ipaddressID;
- static int initialized = 0;
- 
- JNIEXPORT jobjectArray JNICALL
-@@ -100,7 +99,6 @@
-       ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
-       ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
-       ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
--      ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
-       initialized = 1;
-     }
-     if (IS_NULL(host)) {
-@@ -249,26 +247,22 @@
-                   (*env)->SetObjectArrayElement(env, ret, inetIndex, iaObj);
-                     inetIndex ++;
-                 } else if (iterator->ai_family == AF_INET6) {
--                  jint scope = 0;
--                  jbyteArray ipaddress;
-+		  jint scope = 0, ret1;
-                   jobject iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
-                   if (IS_NULL(iaObj)) {
-                     ret = NULL;
-                     goto cleanupAndReturn;
-                   }
--                  ipaddress = (*env)->NewByteArray(env, 16);
--                  if (IS_NULL(ipaddress)) {
-+		  ret1 = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
-+
-+		  if (ret1 == JNI_FALSE) {
-                     ret = NULL;
-                     goto cleanupAndReturn;
-                   }
--                  (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
--                                             (jbyte *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
-                   scope = ((struct sockaddr_in6*)iterator->ai_addr)->sin6_scope_id;
-                   if (scope != 0) { /* zero is default value, no need to set */
--                    (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
--                    (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
-+		      setInet6Address_scopeid(env, iaObj, scope);
-                   }
--                  (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
- 		  setInetAddress_hostName(env, iaObj, name);
-                   (*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj);
-                   inet6Index ++;
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/windows/native/java/net/NetworkInterface.c
---- jdk/src/windows/native/java/net/NetworkInterface.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/windows/native/java/net/NetworkInterface.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -103,8 +103,6 @@
- 
- jclass ni_ia6cls;           /* Inet6Address */
- jmethodID ni_ia6ctrID;      /* Inet6Address() */
--jfieldID ni_ia6ipaddressID;
--jfieldID ni_ia6ipaddressID;
- 
- jclass ni_ibcls;            /* InterfaceAddress */
- jmethodID ni_ibctrID;       /* InterfaceAddress() */
-@@ -565,7 +563,6 @@
-     ni_ia6cls = (*env)->FindClass(env, "java/net/Inet6Address");
-     ni_ia6cls = (*env)->NewGlobalRef(env, ni_ia6cls);
-     ni_ia6ctrID = (*env)->GetMethodID(env, ni_ia6cls, "<init>", "()V");
--    ni_ia6ipaddressID = (*env)->GetFieldID(env, ni_ia6cls, "ipaddress", "[B");
- 
-     ni_ibcls = (*env)->FindClass(env, "java/net/InterfaceAddress");
-     ni_ibcls = (*env)->NewGlobalRef(env, ni_ibcls);
-@@ -665,19 +662,16 @@
-             int scope;
-             iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
-             if (iaObj) {
--                jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
--                if (ipaddress == NULL) {
-+                int ret = setInet6Address_ipaddress(env, iaObj,  (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
-+                if (ret == JNI_FALSE) {
-                     return NULL;
-                 }
--                (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
--                    (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
-+
-                 scope = addrs->addr.him6.sin6_scope_id;
-                 if (scope != 0) { /* zero is default value, no need to set */
--                    (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
--                    (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
--                    (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
-+                    setInet6Address_scopeid(env, iaObj, scope);
-+                    setInet6Address_scopeifname(env, iaObj, netifObj);
-                 }
--                (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
-                 ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
-                 if (ibObj == NULL) {
-                   free_netaddr(netaddrP);
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/windows/native/java/net/NetworkInterface_winXP.c
---- jdk/src/windows/native/java/net/NetworkInterface_winXP.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/windows/native/java/net/NetworkInterface_winXP.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -490,19 +490,15 @@
-             int scope;
-             iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID);
-             if (iaObj) {
--                jbyteArray ipaddress = (*env)->NewByteArray(env, 16);
--                if (ipaddress == NULL) {
-+                int ret = setInet6Address_ipaddress(env, iaObj, (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
-+                if (ret == JNI_FALSE) {
-                     return NULL;
-                 }
--                (*env)->SetByteArrayRegion(env, ipaddress, 0, 16,
--                    (jbyte *)&(addrs->addr.him6.sin6_addr.s6_addr));
-                 scope = addrs->addr.him6.sin6_scope_id;
-                 if (scope != 0) { /* zero is default value, no need to set */
--                    (*env)->SetIntField(env, iaObj, ia6_scopeidID, scope);
--                    (*env)->SetBooleanField(env, iaObj, ia6_scopeidsetID, JNI_TRUE);
--                    (*env)->SetObjectField(env, iaObj, ia6_scopeifnameID, netifObj);
-+                    setInet6Address_scopeid(env, iaObj, scope);
-+                    setInet6Address_scopeifname(env, iaObj, netifObj);
-                 }
--                (*env)->SetObjectField(env, iaObj, ni_ia6ipaddressID, ipaddress);
-                 ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
-                 if (ibObj == NULL) {
-                   free_netaddr(netaddrP);
-diff -r e10e9bfb11b0 -r 96aee3742c52 src/windows/native/java/net/TwoStacksPlainSocketImpl.c
---- jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c	Thu Jun 13 10:31:21 2013 +0800
-+++ jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c	Tue Oct 15 21:28:50 2013 +0100
-@@ -726,7 +726,6 @@
-         setInetAddress_family(env, socketAddressObj, IPv4);
-         (*env)->SetObjectField(env, socket, psi_addressID, socketAddressObj);
-     } else {
--        jbyteArray addr;
-         /* AF_INET6 -> Inet6Address */
-         if (inet6Cls == 0) {
-             jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
-@@ -749,10 +748,10 @@
-             NET_SocketClose(fd);
-             return;
-         }
--        addr = (*env)->GetObjectField (env, socketAddressObj, ia6_ipaddressID);
--        (*env)->SetByteArrayRegion (env, addr, 0, 16, (const char *)&him.him6.sin6_addr);
-+        setInet6Address_ipaddress(env, socketAddressObj, (const char *)&him.him6.sin6_addr);
-+
-         setInetAddress_family(env, socketAddressObj, IPv6);
--        (*env)->SetIntField(env, socketAddressObj, ia6_scopeidID, him.him6.sin6_scope_id);
-+        setInet6Address_scopeid(env, socketAddressObj, him.him6.sin6_scope_id);
-     }
-     /* fields common to AF_INET and AF_INET6 */
-