diff options
| author |   Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2020-12-28 13:58:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-12-28 13:58:27 +0000 |
| commit | ae4dcd511e70bd95222c504771fa184d993b5bba (patch) | |
| tree | 379f2a7ce7af4dc6bd0797ed67815965162c6556 /sources/hv-collector-server/src | |
| parent | 4d9d6a5160d38e3ebc026d5e07228cb4418686fb (diff) | |
| parent | f282dc63f560fe3fc3f885097f43142bfc2f9824 (diff) | |
Merge "Upgrade hv-ves, reactor, protobuf and sdk versions"1.6.0
Diffstat (limited to 'sources/hv-collector-server/src')
2 files changed, 5 insertions, 4 deletions
diff --git a/sources/hv-collector-server/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/NettyTcpServer.kt b/sources/hv-collector-server/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/NettyTcpServer.kt index d19b7f49..7f6ad658 100644 --- a/sources/hv-collector-server/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/NettyTcpServer.kt +++ b/sources/hv-collector-server/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/NettyTcpServer.kt @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * dcaegen2-collectors-veshv * ================================================================================ - * Copyright (C) 2018-2019 NOKIA + * Copyright (C) 2018-2020 NOKIA * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ internal class NettyTcpServer(private val serverConfiguration: ServerConfigurati override fun start(): Mono<ServerHandle> = Mono.defer { TcpServer.create() - .addressSupplier { InetSocketAddress(serverConfiguration.listenPort) } + .bindAddress { InetSocketAddress(serverConfiguration.listenPort) } .configureSsl() .handle(this::handleConnection) .bind() diff --git a/sources/hv-collector-server/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/networking.kt b/sources/hv-collector-server/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/networking.kt index eb51cf4b..6bbe08f0 100644 --- a/sources/hv-collector-server/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/networking.kt +++ b/sources/hv-collector-server/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/networking.kt @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * dcaegen2-collectors-veshv * ================================================================================ - * Copyright (C) 2019 NOKIA + * Copyright (C) 2019-2020 NOKIA * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ import reactor.netty.Connection import reactor.netty.NettyInbound import reactor.netty.NettyOutbound import java.net.InetAddress +import java.net.InetSocketAddress import java.security.cert.X509Certificate import javax.net.ssl.SSLSession @@ -76,6 +77,6 @@ internal inline fun withNewClientContextFrom(nettyInbound: NettyInbound, internal fun populateClientContextFromInbound(clientContext: ClientContext, nettyInbound: NettyInbound) = withConnectionFrom(nettyInbound) { connection -> - clientContext.clientAddress = Try { connection.address().address }.toOption() + clientContext.clientAddress = Try { (connection.address() as InetSocketAddress).address }.toOption() clientContext.clientCert = connection.getSslSession().flatMap { it.findClientCert() } } |