Skip to content
This repository was archived by the owner on Apr 3, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7c3bb09

Browse files
committedJan 22, 2021
Rename SockaddrIn to Sockaddr since sockaddr_un is not an Internet address type
1 parent 236e8a0 commit 7c3bb09

File tree

6 files changed

+22
-24
lines changed

6 files changed

+22
-24
lines changed
 

‎src/main/java/io/netty/incubator/channel/uring/AbstractIOUringChannel.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import io.netty.channel.socket.ChannelInputShutdownReadComplete;
3737
import io.netty.channel.socket.SocketChannelConfig;
3838
import io.netty.channel.unix.Buffer;
39-
import io.netty.channel.unix.DomainSocketAddress;
4039
import io.netty.channel.unix.Errors;
4140
import io.netty.channel.unix.FileDescriptor;
4241
import io.netty.channel.unix.UnixChannel;
@@ -677,7 +676,7 @@ public void connect(
677676
remoteAddressMemory = Buffer.allocateDirectWithNativeOrder(Native.SIZEOF_SOCKADDR_STORAGE);
678677
long remoteAddressMemoryAddress = Buffer.memoryAddress(remoteAddressMemory);
679678

680-
int addrLen = SockaddrIn.write(remoteAddressMemoryAddress, remoteAddress);
679+
int addrLen = Sockaddr.write(remoteAddressMemoryAddress, remoteAddress);
681680

682681
final IOUringSubmissionQueue ioUringSubmissionQueue = submissionQueue();
683682
ioUringSubmissionQueue.addConnect(socket.intValue(), remoteAddressMemoryAddress, addrLen, (short) 0);

‎src/main/java/io/netty/incubator/channel/uring/IOUringEventLoop.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ final class IOUringEventLoop extends SingleThreadEventLoop implements IOUringCom
5151
private final FileDescriptor eventfd;
5252

5353
// The maximum number of bytes for an InetAddress / Inet6Address
54-
private final byte[] inet4AddressArray = new byte[SockaddrIn.IPV4_ADDRESS_LENGTH];
55-
private final byte[] inet6AddressArray = new byte[SockaddrIn.IPV6_ADDRESS_LENGTH];
54+
private final byte[] inet4AddressArray = new byte[Sockaddr.IPV4_ADDRESS_LENGTH];
55+
private final byte[] inet6AddressArray = new byte[Sockaddr.IPV6_ADDRESS_LENGTH];
5656

5757
private long prevDeadlineNanos = NONE;
5858
private boolean pendingWakeup;

‎src/main/java/io/netty/incubator/channel/uring/IOUringServerSocketChannel.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.netty.channel.Channel;
1919
import io.netty.channel.socket.ServerSocketChannel;
2020

21-
import java.net.Inet4Address;
2221
import java.net.InetSocketAddress;
2322
import java.net.SocketAddress;
2423

@@ -41,10 +40,10 @@ Channel newChildChannel(int fd, long acceptedAddressMemoryAddress, long accepted
4140
if (socket.isIpv6()) {
4241
byte[] ipv6Array = ((IOUringEventLoop) eventLoop()).inet6AddressArray();
4342
byte[] ipv4Array = ((IOUringEventLoop) eventLoop()).inet4AddressArray();
44-
address = SockaddrIn.readIPv6(acceptedAddressMemoryAddress, ipv6Array, ipv4Array);
43+
address = Sockaddr.readIPv6(acceptedAddressMemoryAddress, ipv6Array, ipv4Array);
4544
} else {
4645
byte[] addressArray = ((IOUringEventLoop) eventLoop()).inet4AddressArray();
47-
address = SockaddrIn.readIPv4(acceptedAddressMemoryAddress, addressArray);
46+
address = Sockaddr.readIPv4(acceptedAddressMemoryAddress, addressArray);
4847
}
4948
return new IOUringSocketChannel(this, new LinuxSocket(fd), address);
5049
}

‎src/main/java/io/netty/incubator/channel/uring/MsgHdrMemory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void write(LinuxSocket socket, InetSocketAddress address, long bufferAddress , i
4040
addressLength = socket.isIpv6() ? Native.SIZEOF_SOCKADDR_IN6 : Native.SIZEOF_SOCKADDR_IN;
4141
PlatformDependent.setMemory(sockAddress, Native.SIZEOF_SOCKADDR_STORAGE, (byte) 0);
4242
} else {
43-
addressLength = SockaddrIn.write(sockAddress, address);
43+
addressLength = Sockaddr.write(sockAddress, address);
4444
}
4545
Iov.write(iovAddress, bufferAddress, length);
4646
MsgHdr.write(memory, sockAddress, addressLength, iovAddress, 1);
@@ -54,10 +54,10 @@ DatagramPacket read(IOUringDatagramChannel channel, ByteBuf buffer, int bytesRea
5454
byte[] ipv6Bytes = eventLoop.inet6AddressArray();
5555
byte[] ipv4bytes = eventLoop.inet4AddressArray();
5656

57-
sender = SockaddrIn.readIPv6(sockAddress, ipv6Bytes, ipv4bytes);
57+
sender = Sockaddr.readIPv6(sockAddress, ipv6Bytes, ipv4bytes);
5858
} else {
5959
byte[] bytes = eventLoop.inet4AddressArray();
60-
sender = SockaddrIn.readIPv4(sockAddress, bytes);
60+
sender = Sockaddr.readIPv4(sockAddress, bytes);
6161
}
6262
long iovAddress = memory + Native.SIZEOF_MSGHDR + Native.SIZEOF_SOCKADDR_STORAGE;
6363
long bufferAddress = Iov.readBufferAddress(iovAddress);

‎src/main/java/io/netty/incubator/channel/uring/SockaddrIn.java renamed to ‎src/main/java/io/netty/incubator/channel/uring/Sockaddr.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@
2828

2929
import static io.netty.util.internal.PlatformDependent.BIG_ENDIAN_NATIVE_ORDER;
3030

31-
final class SockaddrIn {
31+
final class Sockaddr {
3232
static final byte[] IPV4_MAPPED_IPV6_PREFIX = {
3333
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte) 0xff, (byte) 0xff };
3434
static final int IPV4_ADDRESS_LENGTH = 4;
3535
static final int IPV6_ADDRESS_LENGTH = 16;
3636
static final int DOMAIN_ADDRESS_LENGTH = 108;
3737

38-
private SockaddrIn() { }
38+
private Sockaddr() { }
3939

4040
static int write(long memory, SocketAddress address) {
4141
if (address instanceof DomainSocketAddress) {
42-
return SockaddrIn.writeDomain(memory, ((DomainSocketAddress) address).path());
42+
return Sockaddr.writeDomain(memory, ((DomainSocketAddress) address).path());
4343
} else if (address instanceof InetSocketAddress) {
4444
InetSocketAddress inetSocketAddress = (InetSocketAddress) address;
4545
boolean ipv6 = ((InetSocketAddress) address).getAddress() instanceof Inet6Address;
4646
if (ipv6) {
47-
return SockaddrIn.writeIPv6(memory, inetSocketAddress.getAddress(), inetSocketAddress.getPort());
47+
return Sockaddr.writeIPv6(memory, inetSocketAddress.getAddress(), inetSocketAddress.getPort());
4848
} else {
49-
return SockaddrIn.writeIPv4(memory, inetSocketAddress.getAddress(), inetSocketAddress.getPort());
49+
return Sockaddr.writeIPv4(memory, inetSocketAddress.getAddress(), inetSocketAddress.getPort());
5050
}
5151
} else {
5252
throw new IllegalArgumentException("Unknown address family");

‎src/test/java/io/netty/incubator/channel/uring/SockaddrInTest.java renamed to ‎src/test/java/io/netty/incubator/channel/uring/SockaddrTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import static org.junit.Assume.assumeTrue;
3030

31-
public class SockaddrInTest {
31+
public class SockaddrTest {
3232

3333
@BeforeClass
3434
public static void loadJNI() {
@@ -42,9 +42,9 @@ public void testIp4() throws Exception {
4242
long memoryAddress = Buffer.memoryAddress(buffer);
4343
InetAddress address = InetAddress.getByAddress(new byte[] { 10, 10, 10, 10 });
4444
int port = 45678;
45-
Assert.assertEquals(Native.SIZEOF_SOCKADDR_IN, SockaddrIn.writeIPv4(memoryAddress, address, port));
45+
Assert.assertEquals(Native.SIZEOF_SOCKADDR_IN, Sockaddr.writeIPv4(memoryAddress, address, port));
4646
byte[] bytes = new byte[4];
47-
InetSocketAddress sockAddr = SockaddrIn.readIPv4(memoryAddress, bytes);
47+
InetSocketAddress sockAddr = Sockaddr.readIPv4(memoryAddress, bytes);
4848
Assert.assertArrayEquals(address.getAddress(), sockAddr.getAddress().getAddress());
4949
Assert.assertEquals(port, sockAddr.getPort());
5050
} finally {
@@ -60,11 +60,11 @@ public void testIp6() throws Exception {
6060
Inet6Address address = Inet6Address.getByAddress(
6161
null, new byte[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, 12345);
6262
int port = 45678;
63-
Assert.assertEquals(Native.SIZEOF_SOCKADDR_IN6, SockaddrIn.writeIPv6(memoryAddress, address, port));
63+
Assert.assertEquals(Native.SIZEOF_SOCKADDR_IN6, Sockaddr.writeIPv6(memoryAddress, address, port));
6464
byte[] ipv6Bytes = new byte[16];
6565
byte[] ipv4Bytes = new byte[4];
6666

67-
InetSocketAddress sockAddr = SockaddrIn.readIPv6(memoryAddress, ipv6Bytes, ipv4Bytes);
67+
InetSocketAddress sockAddr = Sockaddr.readIPv6(memoryAddress, ipv6Bytes, ipv4Bytes);
6868
Inet6Address inet6Address = (Inet6Address) sockAddr.getAddress();
6969
Assert.assertArrayEquals(address.getAddress(), inet6Address.getAddress());
7070
Assert.assertEquals(address.getScopeId(), inet6Address.getScopeId());
@@ -81,15 +81,15 @@ public void testWriteIp4ReadIpv6Mapped() throws Exception {
8181
long memoryAddress = Buffer.memoryAddress(buffer);
8282
InetAddress address = InetAddress.getByAddress(new byte[] { 10, 10, 10, 10 });
8383
int port = 45678;
84-
Assert.assertEquals(Native.SIZEOF_SOCKADDR_IN6, SockaddrIn.writeIPv6(memoryAddress, address, port));
84+
Assert.assertEquals(Native.SIZEOF_SOCKADDR_IN6, Sockaddr.writeIPv6(memoryAddress, address, port));
8585
byte[] ipv6Bytes = new byte[16];
8686
byte[] ipv4Bytes = new byte[4];
8787

88-
InetSocketAddress sockAddr = SockaddrIn.readIPv6(memoryAddress, ipv6Bytes, ipv4Bytes);
88+
InetSocketAddress sockAddr = Sockaddr.readIPv6(memoryAddress, ipv6Bytes, ipv4Bytes);
8989
Inet4Address ipv4Address = (Inet4Address) sockAddr.getAddress();
9090

91-
System.arraycopy(SockaddrIn.IPV4_MAPPED_IPV6_PREFIX, 0, ipv6Bytes, 0,
92-
SockaddrIn.IPV4_MAPPED_IPV6_PREFIX.length);
91+
System.arraycopy(Sockaddr.IPV4_MAPPED_IPV6_PREFIX, 0, ipv6Bytes, 0,
92+
Sockaddr.IPV4_MAPPED_IPV6_PREFIX.length);
9393
Assert.assertArrayEquals(ipv4Bytes, ipv4Address.getAddress());
9494
Assert.assertEquals(port, sockAddr.getPort());
9595
} finally {

0 commit comments

Comments
 (0)
This repository has been archived.