You've already forked linux-packaging-mono
Imported Upstream version 4.2.1.36
Former-commit-id: fb75898888a02f4d3a74cf0a5b841681bc4c7fa8
This commit is contained in:
committed by
Jo Shields
parent
9668de7cb8
commit
dd547c45d4
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2007, 2013, Oracle and/or its affiliates. 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
|
||||
@ -263,15 +263,14 @@ static int socketReceiveOrPeekData
|
||||
packetBuffer = dpObj.buf;
|
||||
packetBufferOffset = dpObj.offset;
|
||||
packetBufferLen = dpObj.bufLength;
|
||||
/* Note: the buffer needn't be greater than 65,536 (0xFFFF)
|
||||
* the max size of an IP packet. Anything bigger is truncated anyway.
|
||||
*-/
|
||||
if (packetBufferLen > MAX_PACKET_LEN) {
|
||||
packetBufferLen = MAX_PACKET_LEN;
|
||||
}
|
||||
|
||||
/*
|
||||
if (packetBufferLen > MAX_BUFFER_LEN) {
|
||||
/* Note: the buffer needn't be greater than 65,536 (0xFFFF)
|
||||
* the max size of an IP packet. Anything bigger is truncated anyway.
|
||||
*-/
|
||||
if (packetBufferLen > MAX_PACKET_LEN) {
|
||||
packetBufferLen = MAX_PACKET_LEN;
|
||||
}
|
||||
fullPacket = (char *)malloc(packetBufferLen);
|
||||
if (!fullPacket) {
|
||||
JNU_ThrowOutOfMemoryError(env, "Native heap allocation failed");
|
||||
@ -380,8 +379,10 @@ static int socketReceiveOrPeekData
|
||||
int[] tmp = { port };
|
||||
packetAddress = NET_SockaddrToInetAddress(sa, tmp);
|
||||
port = tmp[0];
|
||||
/* stuff the new Inetaddress into the packet */
|
||||
dpObj.address = packetAddress;
|
||||
if (packetAddress != NULL) {
|
||||
/* stuff the new Inetaddress into the packet */
|
||||
dpObj.address = packetAddress;
|
||||
}
|
||||
}
|
||||
|
||||
/* populate the packet */
|
||||
|
@ -1,332 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2010, Oracle and/or its affiliates. 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. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package java.net;
|
||||
|
||||
import java.io.FileDescriptor;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.channels.FileChannel;
|
||||
import static ikvm.internal.Winsock.*;
|
||||
import static java.net.net_util_md.*;
|
||||
|
||||
import sun.misc.IoTrace;
|
||||
import sun.net.ConnectionResetException;
|
||||
|
||||
/**
|
||||
* This stream extends FileInputStream to implement a
|
||||
* SocketInputStream. Note that this class should <b>NOT</b> be
|
||||
* public.
|
||||
*
|
||||
* @author Jonathan Payne
|
||||
* @author Arthur van Hoff
|
||||
*/
|
||||
class SocketInputStream extends FileInputStream
|
||||
{
|
||||
|
||||
private boolean eof;
|
||||
private AbstractPlainSocketImpl impl = null;
|
||||
private byte temp[];
|
||||
private Socket socket = null;
|
||||
|
||||
/**
|
||||
* Creates a new SocketInputStream. Can only be called
|
||||
* by a Socket. This method needs to hang on to the owner Socket so
|
||||
* that the fd will not be closed.
|
||||
* @param impl the implemented socket input stream
|
||||
*/
|
||||
SocketInputStream(AbstractPlainSocketImpl impl) throws IOException {
|
||||
super(impl.getFileDescriptor());
|
||||
this.impl = impl;
|
||||
socket = impl.getSocket();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the unique {@link java.nio.channels.FileChannel FileChannel}
|
||||
* object associated with this file input stream.</p>
|
||||
*
|
||||
* The <code>getChannel</code> method of <code>SocketInputStream</code>
|
||||
* returns <code>null</code> since it is a socket based stream.</p>
|
||||
*
|
||||
* @return the file channel associated with this file input stream
|
||||
*
|
||||
* @since 1.4
|
||||
* @spec JSR-51
|
||||
*/
|
||||
public final FileChannel getChannel() {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads into an array of bytes at the specified offset using
|
||||
* the received socket primitive.
|
||||
* @param fd the FileDescriptor
|
||||
* @param b the buffer into which the data is read
|
||||
* @param off the start offset of the data
|
||||
* @param len the maximum number of bytes read
|
||||
* @param timeout the read timeout in ms
|
||||
* @return the actual number of bytes read, -1 is
|
||||
* returned when the end of the stream is reached.
|
||||
* @exception IOException If an I/O error has occurred.
|
||||
*/
|
||||
private int socketRead0(FileDescriptor fdObj, byte bufP[], int off, int len, int timeout) throws IOException
|
||||
{
|
||||
// [IKVM] this method is a direct port of the native code in openjdk6-b18\jdk\src\windows\native\java\net\SocketInputStream.c
|
||||
cli.System.Net.Sockets.Socket fd = null;
|
||||
int nread;
|
||||
|
||||
if (IS_NULL(fdObj)) {
|
||||
throw new SocketException("socket closed");
|
||||
}
|
||||
fd = fdObj.getSocket();
|
||||
if (fd == null) {
|
||||
throw new SocketException("Socket closed");
|
||||
}
|
||||
|
||||
if (timeout != 0) {
|
||||
if (timeout <= 5000 || !isRcvTimeoutSupported) {
|
||||
int ret = NET_Timeout (fd, timeout);
|
||||
|
||||
if (ret <= 0) {
|
||||
if (ret == 0) {
|
||||
throw new SocketTimeoutException("Read timed out");
|
||||
} else {
|
||||
// [IKVM] the OpenJDK native code is broken and always throws this exception on any failure of NET_Timeout
|
||||
throw new SocketException("socket closed");
|
||||
}
|
||||
}
|
||||
|
||||
/*check if the socket has been closed while we were in timeout*/
|
||||
if (fdObj.getSocket() == null) {
|
||||
throw new SocketException("Socket Closed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nread = recv(fd, bufP, off, len, 0);
|
||||
if (nread > 0) {
|
||||
// ok
|
||||
} else {
|
||||
if (nread < 0) {
|
||||
/*
|
||||
* Recv failed.
|
||||
*/
|
||||
switch (WSAGetLastError()) {
|
||||
case WSAEINTR:
|
||||
throw new SocketException("socket closed");
|
||||
|
||||
case WSAECONNRESET:
|
||||
case WSAESHUTDOWN:
|
||||
/*
|
||||
* Connection has been reset - Windows sometimes reports
|
||||
* the reset as a shutdown error.
|
||||
*/
|
||||
throw new ConnectionResetException();
|
||||
|
||||
case WSAETIMEDOUT :
|
||||
throw new SocketTimeoutException("Read timed out");
|
||||
|
||||
default:
|
||||
throw NET_ThrowCurrent("recv failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
return nread;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads into a byte array data from the socket.
|
||||
* @param b the buffer into which the data is read
|
||||
* @return the actual number of bytes read, -1 is
|
||||
* returned when the end of the stream is reached.
|
||||
* @exception IOException If an I/O error has occurred.
|
||||
*/
|
||||
public int read(byte b[]) throws IOException {
|
||||
return read(b, 0, b.length);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads into a byte array <i>b</i> at offset <i>off</i>,
|
||||
* <i>length</i> bytes of data.
|
||||
* @param b the buffer into which the data is read
|
||||
* @param off the start offset of the data
|
||||
* @param len the maximum number of bytes read
|
||||
* @return the actual number of bytes read, -1 is
|
||||
* returned when the end of the stream is reached.
|
||||
* @exception IOException If an I/O error has occurred.
|
||||
*/
|
||||
public int read(byte b[], int off, int length) throws IOException {
|
||||
return read(b, off, length, impl.getTimeout());
|
||||
}
|
||||
|
||||
int read(byte b[], int off, int length, int timeout) throws IOException {
|
||||
int n = 0;
|
||||
|
||||
// EOF already encountered
|
||||
if (eof) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
// connection reset
|
||||
if (impl.isConnectionReset()) {
|
||||
throw new SocketException("Connection reset");
|
||||
}
|
||||
|
||||
// bounds check
|
||||
if (length <= 0 || off < 0 || off + length > b.length) {
|
||||
if (length == 0) {
|
||||
return 0;
|
||||
}
|
||||
throw new ArrayIndexOutOfBoundsException();
|
||||
}
|
||||
|
||||
boolean gotReset = false;
|
||||
|
||||
Object traceContext = IoTrace.socketReadBegin();
|
||||
// acquire file descriptor and do the read
|
||||
FileDescriptor fd = impl.acquireFD();
|
||||
try {
|
||||
n = socketRead0(fd, b, off, length, timeout);
|
||||
if (n > 0) {
|
||||
return n;
|
||||
}
|
||||
} catch (ConnectionResetException rstExc) {
|
||||
gotReset = true;
|
||||
} finally {
|
||||
impl.releaseFD();
|
||||
IoTrace.socketReadEnd(traceContext, impl.address, impl.port,
|
||||
timeout, n > 0 ? n : 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* We receive a "connection reset" but there may be bytes still
|
||||
* buffered on the socket
|
||||
*/
|
||||
if (gotReset) {
|
||||
traceContext = IoTrace.socketReadBegin();
|
||||
impl.setConnectionResetPending();
|
||||
impl.acquireFD();
|
||||
try {
|
||||
n = socketRead0(fd, b, off, length, timeout);
|
||||
if (n > 0) {
|
||||
return n;
|
||||
}
|
||||
} catch (ConnectionResetException rstExc) {
|
||||
} finally {
|
||||
impl.releaseFD();
|
||||
IoTrace.socketReadEnd(traceContext, impl.address, impl.port,
|
||||
timeout, n > 0 ? n : 0);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* If we get here we are at EOF, the socket has been closed,
|
||||
* or the connection has been reset.
|
||||
*/
|
||||
if (impl.isClosedOrPending()) {
|
||||
throw new SocketException("Socket closed");
|
||||
}
|
||||
if (impl.isConnectionResetPending()) {
|
||||
impl.setConnectionReset();
|
||||
}
|
||||
if (impl.isConnectionReset()) {
|
||||
throw new SocketException("Connection reset");
|
||||
}
|
||||
eof = true;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads a single byte from the socket.
|
||||
*/
|
||||
public int read() throws IOException {
|
||||
if (eof) {
|
||||
return -1;
|
||||
}
|
||||
temp = new byte[1];
|
||||
int n = read(temp, 0, 1);
|
||||
if (n <= 0) {
|
||||
return -1;
|
||||
}
|
||||
return temp[0] & 0xff;
|
||||
}
|
||||
|
||||
/**
|
||||
* Skips n bytes of input.
|
||||
* @param n the number of bytes to skip
|
||||
* @return the actual number of bytes skipped.
|
||||
* @exception IOException If an I/O error has occurred.
|
||||
*/
|
||||
public long skip(long numbytes) throws IOException {
|
||||
if (numbytes <= 0) {
|
||||
return 0;
|
||||
}
|
||||
long n = numbytes;
|
||||
int buflen = (int) Math.min(1024, n);
|
||||
byte data[] = new byte[buflen];
|
||||
while (n > 0) {
|
||||
int r = read(data, 0, (int) Math.min((long) buflen, n));
|
||||
if (r < 0) {
|
||||
break;
|
||||
}
|
||||
n -= r;
|
||||
}
|
||||
return numbytes - n;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the number of bytes that can be read without blocking.
|
||||
* @return the number of immediately available bytes
|
||||
*/
|
||||
public int available() throws IOException {
|
||||
return impl.available();
|
||||
}
|
||||
|
||||
/**
|
||||
* Closes the stream.
|
||||
*/
|
||||
private boolean closing = false;
|
||||
public void close() throws IOException {
|
||||
// Prevent recursion. See BugId 4484411
|
||||
if (closing)
|
||||
return;
|
||||
closing = true;
|
||||
if (socket != null) {
|
||||
if (!socket.isClosed())
|
||||
socket.close();
|
||||
} else
|
||||
impl.close();
|
||||
closing = false;
|
||||
}
|
||||
|
||||
void setEOF(boolean eof) {
|
||||
this.eof = eof;
|
||||
}
|
||||
|
||||
/**
|
||||
* Overrides finalize, the fd is closed by the Socket.
|
||||
*/
|
||||
protected void finalize() {}
|
||||
}
|
@ -1,254 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2007, Oracle and/or its affiliates. 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. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package java.net;
|
||||
|
||||
import java.io.FileDescriptor;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.channels.FileChannel;
|
||||
import static ikvm.internal.Winsock.*;
|
||||
import static java.net.net_util_md.*;
|
||||
|
||||
import sun.misc.IoTrace;
|
||||
|
||||
/**
|
||||
* This stream extends FileOutputStream to implement a
|
||||
* SocketOutputStream. Note that this class should <b>NOT</b> be
|
||||
* public.
|
||||
*
|
||||
* @author Jonathan Payne
|
||||
* @author Arthur van Hoff
|
||||
*/
|
||||
class SocketOutputStream extends FileOutputStream
|
||||
{
|
||||
private AbstractPlainSocketImpl impl = null;
|
||||
private byte temp[] = new byte[1];
|
||||
private Socket socket = null;
|
||||
|
||||
/**
|
||||
* Creates a new SocketOutputStream. Can only be called
|
||||
* by a Socket. This method needs to hang on to the owner Socket so
|
||||
* that the fd will not be closed.
|
||||
* @param impl the socket output stream inplemented
|
||||
*/
|
||||
SocketOutputStream(AbstractPlainSocketImpl impl) throws IOException {
|
||||
super(impl.getFileDescriptor());
|
||||
this.impl = impl;
|
||||
socket = impl.getSocket();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the unique {@link java.nio.channels.FileChannel FileChannel}
|
||||
* object associated with this file output stream. </p>
|
||||
*
|
||||
* The <code>getChannel</code> method of <code>SocketOutputStream</code>
|
||||
* returns <code>null</code> since it is a socket based stream.</p>
|
||||
*
|
||||
* @return the file channel associated with this file output stream
|
||||
*
|
||||
* @since 1.4
|
||||
* @spec JSR-51
|
||||
*/
|
||||
public final FileChannel getChannel() {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes to the socket.
|
||||
* @param fd the FileDescriptor
|
||||
* @param b the data to be written
|
||||
* @param off the start offset in the data
|
||||
* @param len the number of bytes that are written
|
||||
* @exception IOException If an I/O error has occurred.
|
||||
*/
|
||||
private void socketWrite0(FileDescriptor fdObj, byte[] data, int off, int len) throws IOException
|
||||
{
|
||||
// [IKVM] this method is a direct port of the native code in openjdk6-b18\jdk\src\windows\native\java\net\SocketOutputStream.c
|
||||
final int MAX_BUFFER_LEN = 2048;
|
||||
cli.System.Net.Sockets.Socket fd;
|
||||
int buflen = 65536; // MAX_HEAP_BUFFER_LEN
|
||||
int n;
|
||||
|
||||
if (IS_NULL(fdObj)) {
|
||||
throw new SocketException("socket closed");
|
||||
} else {
|
||||
fd = fdObj.getSocket();
|
||||
}
|
||||
if (IS_NULL(data)) {
|
||||
throw new NullPointerException("data argument");
|
||||
}
|
||||
|
||||
while(len > 0) {
|
||||
int loff = 0;
|
||||
int chunkLen = Math.min(buflen, len);
|
||||
int llen = chunkLen;
|
||||
int retry = 0;
|
||||
|
||||
while(llen > 0) {
|
||||
n = send(fd, data, off + loff, llen, 0);
|
||||
if (n > 0) {
|
||||
llen -= n;
|
||||
loff += n;
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Due to a bug in Windows Sockets (observed on NT and Windows
|
||||
* 2000) it may be necessary to retry the send. The issue is that
|
||||
* on blocking sockets send/WSASend is supposed to block if there
|
||||
* is insufficient buffer space available. If there are a large
|
||||
* number of threads blocked on write due to congestion then it's
|
||||
* possile to hit the NT/2000 bug whereby send returns WSAENOBUFS.
|
||||
* The workaround we use is to retry the send. If we have a
|
||||
* large buffer to send (>2k) then we retry with a maximum of
|
||||
* 2k buffer. If we hit the issue with <=2k buffer then we backoff
|
||||
* for 1 second and retry again. We repeat this up to a reasonable
|
||||
* limit before bailing out and throwing an exception. In load
|
||||
* conditions we've observed that the send will succeed after 2-3
|
||||
* attempts but this depends on network buffers associated with
|
||||
* other sockets draining.
|
||||
*/
|
||||
if (WSAGetLastError() == WSAENOBUFS) {
|
||||
if (llen > MAX_BUFFER_LEN) {
|
||||
buflen = MAX_BUFFER_LEN;
|
||||
chunkLen = MAX_BUFFER_LEN;
|
||||
llen = MAX_BUFFER_LEN;
|
||||
continue;
|
||||
}
|
||||
if (retry >= 30) {
|
||||
throw new SocketException("No buffer space available - exhausted attempts to queue buffer");
|
||||
}
|
||||
cli.System.Threading.Thread.Sleep(1000);
|
||||
retry++;
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Send failed - can be caused by close or write error.
|
||||
*/
|
||||
if (WSAGetLastError() == WSAENOTSOCK) {
|
||||
throw new SocketException("Socket closed");
|
||||
} else {
|
||||
throw NET_ThrowCurrent("socket write error");
|
||||
}
|
||||
}
|
||||
len -= chunkLen;
|
||||
off += chunkLen;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes to the socket with appropriate locking of the
|
||||
* FileDescriptor.
|
||||
* @param b the data to be written
|
||||
* @param off the start offset in the data
|
||||
* @param len the number of bytes that are written
|
||||
* @exception IOException If an I/O error has occurred.
|
||||
*/
|
||||
private void socketWrite(byte b[], int off, int len) throws IOException {
|
||||
|
||||
if (len <= 0 || off < 0 || off + len > b.length) {
|
||||
if (len == 0) {
|
||||
return;
|
||||
}
|
||||
throw new ArrayIndexOutOfBoundsException();
|
||||
}
|
||||
|
||||
Object traceContext = IoTrace.socketWriteBegin();
|
||||
int bytesWritten = 0;
|
||||
FileDescriptor fd = impl.acquireFD();
|
||||
try {
|
||||
socketWrite0(fd, b, off, len);
|
||||
bytesWritten = len;
|
||||
} catch (SocketException se) {
|
||||
if (se instanceof sun.net.ConnectionResetException) {
|
||||
impl.setConnectionResetPending();
|
||||
se = new SocketException("Connection reset");
|
||||
}
|
||||
if (impl.isClosedOrPending()) {
|
||||
throw new SocketException("Socket closed");
|
||||
} else {
|
||||
throw se;
|
||||
}
|
||||
} finally {
|
||||
impl.releaseFD();
|
||||
IoTrace.socketWriteEnd(traceContext, impl.address, impl.port, bytesWritten);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes a byte to the socket.
|
||||
* @param b the data to be written
|
||||
* @exception IOException If an I/O error has occurred.
|
||||
*/
|
||||
public void write(int b) throws IOException {
|
||||
temp[0] = (byte)b;
|
||||
socketWrite(temp, 0, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes the contents of the buffer <i>b</i> to the socket.
|
||||
* @param b the data to be written
|
||||
* @exception SocketException If an I/O error has occurred.
|
||||
*/
|
||||
public void write(byte b[]) throws IOException {
|
||||
socketWrite(b, 0, b.length);
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes <i>length</i> bytes from buffer <i>b</i> starting at
|
||||
* offset <i>len</i>.
|
||||
* @param b the data to be written
|
||||
* @param off the start offset in the data
|
||||
* @param len the number of bytes that are written
|
||||
* @exception SocketException If an I/O error has occurred.
|
||||
*/
|
||||
public void write(byte b[], int off, int len) throws IOException {
|
||||
socketWrite(b, off, len);
|
||||
}
|
||||
|
||||
/**
|
||||
* Closes the stream.
|
||||
*/
|
||||
private boolean closing = false;
|
||||
public void close() throws IOException {
|
||||
// Prevent recursion. See BugId 4484411
|
||||
if (closing)
|
||||
return;
|
||||
closing = true;
|
||||
if (socket != null) {
|
||||
if (!socket.isClosed())
|
||||
socket.close();
|
||||
} else
|
||||
impl.close();
|
||||
closing = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Overrides finalize, the fd is closed by the Socket.
|
||||
*/
|
||||
protected void finalize() {}
|
||||
}
|
@ -515,6 +515,9 @@ static void bind0(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this,
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* NET_BindV6() closes both sockets upon a failure */
|
||||
_this.fd = null;
|
||||
_this.fd1 = null;
|
||||
NET_ThrowCurrent (env, "Cannot bind");
|
||||
return;
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. 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
|
||||
@ -58,7 +58,6 @@ static final int java_net_SocketOptions_SO_LINGER = SocketOptions.SO_LINGER;
|
||||
|
||||
#include "java_net_SocketOptions.h"
|
||||
#include "java_net_TwoStacksPlainSocketImpl.h"
|
||||
#include "java_net_SocketImpl.h"
|
||||
#include "java_net_InetAddress.h"
|
||||
#include "java_io_FileDescriptor.h"
|
||||
#include "java_lang_Integer.h"
|
||||
@ -486,6 +485,10 @@ static void socketBind(JNIEnv env, TwoStacksPlainSocketImpl _this,
|
||||
/* socket was re-created */
|
||||
fd1Obj.setSocket(fd1);
|
||||
}
|
||||
} else {
|
||||
/* NET_BindV6() closes both sockets upon a failure */
|
||||
_this.fd = null;
|
||||
_this.fd1 = null;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
27
external/ikvm/openjdk/java/net/net_util_md.java
vendored
27
external/ikvm/openjdk/java/net/net_util_md.java
vendored
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. 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
|
||||
@ -318,6 +318,11 @@ final class net_util_md
|
||||
{
|
||||
int rv;
|
||||
|
||||
if (level == IPPROTO_IPV6 && optname == IPV6_TCLASS) {
|
||||
((int[])optval)[0] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
rv = getsockopt(s, level, optname, optval);
|
||||
|
||||
|
||||
@ -645,17 +650,17 @@ final class net_util_md
|
||||
* structure for an IPv4 InetAddress.
|
||||
*/
|
||||
static int NET_InetAddressToSockaddr(JNIEnv env, InetAddress iaObj, int port, SOCKETADDRESS him, boolean v4MappedAddress) {
|
||||
if (iaObj.family == InetAddress.IPv4) {
|
||||
him.set(new IPEndPoint(new IPAddress(htonl(iaObj.address) & 0xFFFFFFFFL), port));
|
||||
if (iaObj.holder().family == InetAddress.IPv4) {
|
||||
him.set(new IPEndPoint(new IPAddress(htonl(iaObj.holder().address) & 0xFFFFFFFFL), port));
|
||||
return 0;
|
||||
} else {
|
||||
Inet6Address v6addr = (Inet6Address)iaObj;
|
||||
int scope = v6addr.getScopeId();
|
||||
if (scope == 0) {
|
||||
him.set(new IPEndPoint(new IPAddress(v6addr.ipaddress), port));
|
||||
him.set(new IPEndPoint(new IPAddress(v6addr.getAddress()), port));
|
||||
return 0;
|
||||
} else {
|
||||
him.set(new IPEndPoint(new IPAddress(v6addr.ipaddress, scope & 0xFFFFFFFFL), port));
|
||||
him.set(new IPEndPoint(new IPAddress(v6addr.getAddress(), scope & 0xFFFFFFFFL), port));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@ -725,7 +730,7 @@ final class net_util_md
|
||||
}
|
||||
|
||||
static boolean NET_SockaddrEqualsInetAddress(SOCKETADDRESS him, InetAddress iaObj) {
|
||||
int family = iaObj.family == InetAddress.IPv4 ? AF_INET : AF_INET6;
|
||||
int family = iaObj.holder().family == InetAddress.IPv4 ? AF_INET : AF_INET6;
|
||||
|
||||
if (him.sa_family == AF_INET6) {
|
||||
byte[] caddrNew = him.him6.sin6_addr;
|
||||
@ -736,7 +741,7 @@ final class net_util_md
|
||||
return false;
|
||||
}
|
||||
addrNew = NET_IPv4MappedToIPv4(caddrNew);
|
||||
addrCur = iaObj.address;
|
||||
addrCur = iaObj.holder().address;
|
||||
if (addrNew == addrCur) {
|
||||
return true;
|
||||
} else {
|
||||
@ -750,7 +755,7 @@ final class net_util_md
|
||||
return false;
|
||||
}
|
||||
scope = ((Inet6Address)iaObj).getScopeId();
|
||||
caddrCur = ((Inet6Address)iaObj).ipaddress;
|
||||
caddrCur = ((Inet6Address)iaObj).getAddress();
|
||||
if (NET_IsEqual(caddrNew, caddrCur) && cmpScopeID(scope, him)) {
|
||||
return true;
|
||||
} else {
|
||||
@ -763,7 +768,7 @@ final class net_util_md
|
||||
return false;
|
||||
}
|
||||
addrNew = ntohl(him.him4.sin_addr.s_addr);
|
||||
addrCur = iaObj.address;
|
||||
addrCur = iaObj.holder().address;
|
||||
if (addrNew == addrCur) {
|
||||
return true;
|
||||
} else {
|
||||
@ -875,10 +880,10 @@ final class net_util_md
|
||||
}
|
||||
|
||||
static int getInetAddress_addr(JNIEnv env, InetAddress iaObj) {
|
||||
return iaObj.address;
|
||||
return iaObj.holder().address;
|
||||
}
|
||||
|
||||
static int getInetAddress_family(JNIEnv env, InetAddress iaObj) {
|
||||
return iaObj.family;
|
||||
return iaObj.holder().family;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user