status-im/nim-libp2p
2
0
Fork 0
mirror of https://github.com/status-im/nim-libp2p.git synced 2025-02-18 07:46:42 +00:00
Code Issues Projects Releases Wiki Activity

Observed address handling

Browse Source
This commit is contained in:
Tanguy 2023-01-02 16:22:11 +01:00
parent af0a9ac66e
commit 905f221355
No known key found for this signature in database
GPG Key ID: 7DD8EC6B6CE6C45E
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pinned
View File

@ -8,7 +8,7 @@ json_serialization;https://github.com/status-im/nim-json-serialization@#a7d815ed
metrics;https://github.com/status-im/nim-metrics@#21e99a2e9d9f80e68bef65c80ef781613005fccb metrics;https://github.com/status-im/nim-metrics@#21e99a2e9d9f80e68bef65c80ef781613005fccb
ngtcp2;https://github.com/status-im/nim-ngtcp2@#76bf92475f55728ff55a2a19b45a5fcbb4faa2ab ngtcp2;https://github.com/status-im/nim-ngtcp2@#76bf92475f55728ff55a2a19b45a5fcbb4faa2ab
nimcrypto;https://github.com/cheatfate/nimcrypto@#24e006df85927f64916e60511620583b11403178 nimcrypto;https://github.com/cheatfate/nimcrypto@#24e006df85927f64916e60511620583b11403178
quic;https://github.com/status-im/nim-quic.git@#9dd9b528cfda50f6482f800175d7350cb03911ff quic;https://github.com/status-im/nim-quic.git@#a4e7cdbfc9c02956942aa12f8b6c35fa877f401a
secp256k1;https://github.com/status-im/nim-secp256k1@#fd173fdff863ce2e211cf64c9a03bc7539fe40b0 secp256k1;https://github.com/status-im/nim-secp256k1@#fd173fdff863ce2e211cf64c9a03bc7539fe40b0
serialization;https://github.com/status-im/nim-serialization@#d77417cba6896c26287a68e6a95762e45a1b87e5 serialization;https://github.com/status-im/nim-serialization@#d77417cba6896c26287a68e6a95762e45a1b87e5
stew;https://github.com/status-im/nim-stew@#f2f9685ec904868bbb48485e72ddc026ed51b230 stew;https://github.com/status-im/nim-stew@#f2f9685ec904868bbb48485e72ddc026ed51b230

1
libp2p.nim
View File

@ -48,6 +48,7 @@ else:
stream/connection, stream/connection,
transports/transport, transports/transport,
transports/tcptransport, transports/tcptransport,
transports/quictransport,
transports/wstransport, transports/wstransport,
protocols/secure/noise, protocols/secure/noise,
protocols/ping, protocols/ping,

19
libp2p/transports/quictransport.nim
View File

@ -33,7 +33,7 @@ type
stream: Stream stream: Stream
cached: seq[byte] cached: seq[byte]
proc new(_: type QuicStream, stream: Stream, oaddr: MultiAddress, peerId: PeerId): QuicStream = proc new(_: type QuicStream, stream: Stream, oaddr: Opt[MultiAddress], peerId: PeerId): QuicStream =
let quicstream = QuicStream(stream: stream, observedAddr: oaddr, peerId: peerId) let quicstream = QuicStream(stream: stream, observedAddr: oaddr, peerId: peerId)
procCall P2PConnection(quicstream).initStream() procCall P2PConnection(quicstream).initStream()
quicstream quicstream
@ -201,9 +201,13 @@ method handles*(transport: QuicTransport, address: MultiAddress): bool =
method start*(transport: QuicTransport, addrs: seq[MultiAddress]) {.async.} = method start*(transport: QuicTransport, addrs: seq[MultiAddress]) {.async.} =
doAssert transport.listener.isNil, "start() already called" doAssert transport.listener.isNil, "start() already called"
#TODO handle multiple addr #TODO handle multiple addr
#TODO resolve used address
transport.listener = listen(initTAddress(addrs[0]).tryGet) transport.listener = listen(initTAddress(addrs[0]).tryGet)
await procCall Transport(transport).start(addrs) await procCall Transport(transport).start(addrs)
transport.addrs[0] =
MultiAddress.init(
transport.listener.localAddress(),
IPPROTO_UDP
).tryGet() & MultiAddress.init("/quic").get()
transport.running = true transport.running = true
method stop*(transport: QuicTransport) {.async.} = method stop*(transport: QuicTransport) {.async.} =
@ -215,11 +219,14 @@ method stop*(transport: QuicTransport) {.async.} =
transport.running = false transport.running = false
transport.listener = nil transport.listener = nil
proc wrapConnection(transport: QuicTransport, connection: QuicConnection): P2PConnection = proc wrapConnection(
#TODO currently not exposed from nim-quic transport: QuicTransport,
connection: QuicConnection): P2PConnection {.raises: [Defect, TransportOsError, LPError].} =
let let
observedAddr = MultiAddress.init("/ip4/0.0.0.0/udp/0/quic").get() remoteAddr = connection.remoteAddress()
conres = QuicSession(connection: connection, observedAddr: observedAddr) observedAddr =
MultiAddress.init(remoteAddr, IPPROTO_UDP).get() & MultiAddress.init("/quic").get()
conres = QuicSession(connection: connection, observedAddr: Opt.some(observedAddr))
conres.initStream() conres.initStream()
transport.connections.add(conres) transport.connections.add(conres)