strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb21 (1.4.150); FILE MERGED

Browse source 
2004/08/12 14:51:37 sb 1.4.150.1: #i32281# Improved IPv4/IPv6 interoperability.
This commit is contained in:
Rüdiger Timm 2004-08-20 08:21:35 +00:00
parent 3076b0cffe
commit 46ca5bd4c2
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
jurt/com/sun/star/lib/connections/socket/socketConnector.java
View file

@ -2,9 +2,9 @@
*
* $RCSfile: socketConnector.java,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: sb $ $Date: 2002-10-07 13:17:19 $
* last change: $Author: rt $ $Date: 2004-08-20 09:21:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -176,21 +176,35 @@ public final class socketConnector implements XConnector {
if (desc.getHost() == null) {
throw new ConnectionSetupException("host parameter missing");
}
InetAddress adr;
// Try all (IPv4 and IPv6) addresses, in case this client is on a
// dual-stack host and the server process is an IPv4-only process, also
// on a dual-stack host (see Stevens, Fenner, Rudoff: "Unix Network
// Programming, Volume 1: The Sockets Networking API, 3rd Edition",
// p. 359):
InetAddress[] adr;
try {
adr = InetAddress.getByName(desc.getHost());
adr = InetAddress.getAllByName(desc.getHost());
} catch (UnknownHostException e) {
throw new ConnectionSetupException(e.toString());
}
Socket socket = null;
for (int i = 0; i < adr.length; ++i) {
try {
socket = new Socket(adr[i], desc.getPort());
break;
} catch (IOException e) {
if (i == adr.length - 1) {
throw new NoConnectException(e.toString());
}
}
}
XConnection con;
try {
Socket socket = new Socket(adr, desc.getPort());
if (desc.getTcpNoDelay() != null) {
socket.setTcpNoDelay(desc.getTcpNoDelay().booleanValue());
}
con = new SocketConnection(connectionDescription, socket);
}
catch (IOException e) {
} catch (IOException e) {
throw new NoConnectException(e.toString());
}
connected = true;