Skip to content

Fix IPv6 socket addresses on Native #3777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lavrov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix IPv6 socket addresses on Native #3777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions io/native/src/main/scala/fs2/io/internal/SocketHelpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ import scala.scalanative.posix.unistd._
import scala.scalanative.posix.sys.socket._
import scala.scalanative.posix.sys.socketOps._
import scala.scalanative.posix.netinet.in._
import scala.scalanative.posix.netinet.inOps._
import scala.scalanative.posix.arpa.inet._
import scala.scalanative.posix.sys.un._
import scala.scalanative.posix.sys.unOps._
import scala.scalanative.unsafe._
import scala.scalanative.unsigned._

import NativeUtil._
import netinetinOps._
import syssocket._
import sysun._
import sysunOps._

private[io] object SocketHelpers {

Expand Down Expand Up @@ -338,8 +338,8 @@ private[io] object SocketHelpers {

val bytes = address.host.toBytes
var i = 0
while (i < 0) {
addr.sin6_addr.s6_addr(i) = bytes(i).toUByte
while (i < 16) {
addr.at4.s6_addr(i) = bytes(i).toUByte
i += 1
}
}
Expand Down
90 changes: 0 additions & 90 deletions io/native/src/main/scala/fs2/io/internal/netinet.scala
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions io/native/src/main/scala/fs2/io/internal/sysun.scala
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions io/native/src/main/scala/fs2/io/net/FdPollingUnixSocketsProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ import fs2.io.file.Files
import fs2.io.internal.NativeUtil._
import fs2.io.internal.SocketHelpers
import fs2.io.internal.syssocket.{connect => uconnect, bind => ubind, _}
import fs2.io.internal.sysun._
import fs2.io.internal.sysunOps._

import scala.scalanative.meta.LinktimeInfo
import scala.scalanative.posix.string._
import scala.scalanative.posix.sys.socket.{accept => _, _}
import scala.scalanative.posix.sys.un._
import scala.scalanative.posix.sys.unOps._
import scala.scalanative.posix.unistd._
import scala.scalanative.unsafe._
import scala.scalanative.unsigned._
Expand Down
16 changes: 16 additions & 0 deletions io/shared/src/test/scala/fs2/io/net/SocketSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,5 +343,21 @@ class SocketSuite extends Fs2Suite with SocketSuitePlatform {
assertEquals(received, expected)
}
}

test("ipv6 - bind, connect and echo over loopback") {
val msg = Chunk.array("fs2.rocks".getBytes)
Network[IO].bind(SocketAddress(ip"::1", Port.Wildcard)).use { serverSocket =>
IO(assertEquals(serverSocket.address.asIpUnsafe.host, ip"::1")) *>
Network[IO].connect(serverSocket.address).use { client =>
serverSocket.accept.head
.evalMap { server =>
IO(assertEquals(server.peerAddress, client.address)) *>
client.write(msg) *> server.readN(msg.size).assertEquals(msg)
}
.compile
.drain
}
}
}
}
}
Loading