Skip to content

Commit a310a0e

Browse files
fix build
1 parent 936c422 commit a310a0e

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

libp2p/src/main/kotlin/io/libp2p/transport/implementation/PlainNettyTransport.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ import io.netty.bootstrap.ServerBootstrap
1919
import io.netty.channel.Channel
2020
import io.netty.channel.ChannelHandler
2121
import io.netty.channel.ChannelOption
22-
import io.netty.channel.nio.NioEventLoopGroup
22+
import io.netty.channel.MultiThreadIoEventLoopGroup
23+
import io.netty.channel.nio.NioIoHandler
2324
import io.netty.channel.socket.nio.NioServerSocketChannel
2425
import io.netty.channel.socket.nio.NioSocketChannel
2526
import java.net.InetSocketAddress
@@ -39,8 +40,12 @@ abstract class PlainNettyTransport(
3940
private val listeners = mutableMapOf<Multiaddr, Channel>()
4041
private val channels = mutableListOf<Channel>()
4142

42-
private var workerGroup by lazyVar { NioEventLoopGroup() }
43-
private var bossGroup by lazyVar { NioEventLoopGroup(1) }
43+
private var workerGroup by lazyVar {
44+
MultiThreadIoEventLoopGroup(NioIoHandler.newFactory())
45+
}
46+
private var bossGroup by lazyVar {
47+
MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory())
48+
}
4449

4550
private var client by lazyVar {
4651
Bootstrap().apply {

libp2p/src/main/kotlin/io/libp2p/transport/quic/QuicTransport.kt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ import io.netty.buffer.PooledByteBufAllocator
3232
import io.netty.channel.*
3333
import io.netty.channel.epoll.Epoll
3434
import io.netty.channel.epoll.EpollDatagramChannel
35-
import io.netty.channel.nio.NioEventLoopGroup
35+
import io.netty.channel.nio.NioIoHandler
3636
import io.netty.channel.socket.nio.NioDatagramChannel
3737
import io.netty.handler.codec.quic.*
3838
import io.netty.handler.ssl.ClientAuth
39+
import org.slf4j.LoggerFactory
3940
import java.net.InetSocketAddress
4041
import java.net.SocketAddress
4142
import java.time.Duration
@@ -48,16 +49,21 @@ class QuicTransport(
4849
private val certAlgorithm: String,
4950
private val protocols: List<ProtocolBinding<*>>
5051
) : NettyTransport {
51-
private val log = LoggerFactory.getLogger(QuicTransport::class.java)
52+
53+
private val logger = LoggerFactory.getLogger(QuicTransport::class.java)
5254

5355
private var closed = false
5456
var connectTimeout = Duration.ofSeconds(15)
5557

5658
private val listeners = mutableMapOf<Multiaddr, Channel>()
5759
private val channels = mutableListOf<Channel>()
5860

59-
private var workerGroup by lazyVar { NioEventLoopGroup() }
60-
private var bossGroup by lazyVar { NioEventLoopGroup(1) }
61+
private var workerGroup by lazyVar {
62+
MultiThreadIoEventLoopGroup(NioIoHandler.newFactory())
63+
}
64+
private var bossGroup by lazyVar {
65+
MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory())
66+
}
6167
private var allocator by lazyVar { PooledByteBufAllocator(true) }
6268
private var multistreamProtocol: MultistreamProtocol = MultistreamProtocolV1
6369
private var incomingMultistreamProtocol: MultistreamProtocol by lazyVar { multistreamProtocol }
@@ -167,7 +173,7 @@ class QuicTransport(
167173
listeners -= addr
168174
}
169175
}
170-
log.info("Quic server listening on {}", addr)
176+
logger.info("Quic server listening on $addr")
171177
res.complete(null)
172178
}
173179
}

libp2p/src/main/kotlin/io/libp2p/transport/ws/WebSocketClientInitializer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ internal class WebSocketClientInitializer(
1212
private val url: String
1313
) : ChannelInitializer<SocketChannel>() {
1414

15-
public override fun initChannel(ch: SocketChannel) {
15+
override fun initChannel(ch: SocketChannel) {
1616
val pipeline = ch.pipeline()
1717

1818
pipeline.addLast(HttpClientCodec())
1919
pipeline.addLast(HttpObjectAggregator(65536))
20-
pipeline.addLast(WebSocketClientCompressionHandler.INSTANCE)
20+
pipeline.addLast(WebSocketClientCompressionHandler(0))
2121
pipeline.addLast(
2222
WebSocketClientHandshake(
2323
connectionBuilder,

libp2p/src/main/kotlin/io/libp2p/transport/ws/WebSocketServerInitializer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ internal class WebSocketServerInitializer(
1212
private val connectionBuilder: ChannelHandler
1313
) : ChannelInitializer<SocketChannel>() {
1414

15-
public override fun initChannel(ch: SocketChannel) {
15+
override fun initChannel(ch: SocketChannel) {
1616
val pipeline = ch.pipeline()
1717

1818
pipeline.addLast(HttpServerCodec())
1919
pipeline.addLast(HttpObjectAggregator(65536))
20-
pipeline.addLast(WebSocketServerCompressionHandler())
20+
pipeline.addLast(WebSocketServerCompressionHandler(0))
2121
pipeline.addLast(WebSocketServerProtocolHandler("/", null, true))
2222
pipeline.addLast(WebSocketServerHandshakeListener(connectionBuilder))
2323
} // initChannel

0 commit comments

Comments
 (0)