honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better inet address serialization, also better handle ipv6

This commit is contained in:
kimchy 2010-10-28 01:48:54 +02:00
parent e7fdf16402
commit 6f8b859d90
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/elasticsearch/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
View File

@ -23,6 +23,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import java.io.IOException;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@ -66,18 +67,34 @@ public class InetSocketTransportAddress implements TransportAddress {
}
@Override public void readFrom(StreamInput in) throws IOException {
address = new InetSocketAddress(in.readUTF(), in.readInt());
if (in.readByte() == 0) {
int len = in.readByte();
byte[] a = new byte[len]; // 4 bytes (IPv4) or 16 bytes (IPv6)
in.readFully(a);
InetAddress inetAddress;
if (len == 16) {
int scope_id = in.readInt();
inetAddress = Inet6Address.getByAddress(null, a, scope_id);
} else {
inetAddress = InetAddress.getByAddress(a);
}
int port = in.readInt();
this.address = new InetSocketAddress(inetAddress, port);
} else {
this.address = new InetSocketAddress(in.readUTF(), in.readInt());
}
}
@Override public void writeTo(StreamOutput out) throws IOException {
// prefer host address if possible, better than hostname (for example, on rackspace cloud)
if (address.getAddress() != null) {
if (address.getAddress().getHostAddress() != null) {
out.writeUTF(address.getAddress().getHostAddress());
} else {
out.writeUTF(address.getHostName());
}
out.writeByte((byte) 0);
byte[] bytes = address().getAddress().getAddress(); // 4 bytes (IPv4) or 16 bytes (IPv6)
out.writeByte((byte) bytes.length); // 1 byte
out.write(bytes, 0, bytes.length);
if (address().getAddress() instanceof Inet6Address)
out.writeInt(((Inet6Address) address.getAddress()).getScopeId());
} else {
out.writeByte((byte) 1);
out.writeUTF(address.getHostName());
}
out.writeInt(address.getPort());