vacp2p/nim-libp2p
1
0
Fork 0
mirror of https://github.com/vacp2p/nim-libp2p.git synced 2025-03-01 16:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[noci] try something new

Browse Source
This commit is contained in:
Ludovic Chenut 2023-01-02 13:58:40 +01:00
parent a818dfaf59
commit 79611638f9
No known key found for this signature in database
GPG Key ID: D9A59B1907F1D50C
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libp2p/connmanager.nim
View File

@ -294,7 +294,7 @@ proc cleanupConn(c: ConnManager, conn: Connection) {.async.} =
trace "Connection cleaned up", conn trace "Connection cleaned up", conn
proc onConnUpgraded(c: ConnManager, conn: Connection) {.async.} = proc onConnUpgraded*(c: ConnManager, conn: Connection) {.async.} =
try: try:
trace "Triggering connect events", conn trace "Triggering connect events", conn
conn.upgrade() conn.upgrade()
@ -469,8 +469,6 @@ proc storeMuxer*(c: ConnManager,
trace "Stored muxer", trace "Stored muxer",
muxer, handle = not handle.isNil, connections = c.conns.len muxer, handle = not handle.isNil, connections = c.conns.len
asyncSpawn c.onConnUpgraded(muxer.connection)
proc getStream*(c: ConnManager, proc getStream*(c: ConnManager,
peerId: PeerId, peerId: PeerId,
dir: Direction): Future[Connection] {.async, gcsafe.} = dir: Direction): Future[Connection] {.async, gcsafe.} =

22
libp2p/upgrademngrs/muxedupgrade.nim
View File

@ -71,7 +71,10 @@ proc mux*(
# install stream handler # install stream handler
muxer.streamHandler = self.streamHandler muxer.streamHandler = self.streamHandler
let handler = muxer.handle() self.connManager.storeConn(conn)
# store it in muxed connections if we have a peer for it
self.connManager.storeMuxer(muxer, muxer.handle()) # store muxer and start read loop
try: try:
await self.identify(muxer) await self.identify(muxer)
@ -81,10 +84,7 @@ proc mux*(
# loop # loop
debug "Could not identify connection", conn, msg = exc.msg debug "Could not identify connection", conn, msg = exc.msg
self.connManager.storeConn(conn) await self.connManager.onConnUpgraded(muxer.connection)
# store it in muxed connections if we have a peer for it
self.connManager.storeMuxer(muxer, handler) # store muxer and start read loop
return muxer return muxer
@ -176,6 +176,12 @@ proc muxerHandler(
let let
conn = muxer.connection conn = muxer.connection
# store incoming connection
self.connManager.storeConn(conn)
# store muxer and muxed connection
self.connManager.storeMuxer(muxer)
try: try:
await self.identify(muxer) await self.identify(muxer)
when defined(libp2p_agents_metrics): when defined(libp2p_agents_metrics):
@ -199,11 +205,7 @@ proc muxerHandler(
await muxer.close() await muxer.close()
trace "Exception in muxer handler", conn, msg = exc.msg trace "Exception in muxer handler", conn, msg = exc.msg
# store incoming connection await self.connManager.onConnUpgraded(muxer.connection)
self.connManager.storeConn(conn)
# store muxer and muxed connection
self.connManager.storeMuxer(muxer)
proc new*( proc new*(
T: type MuxedUpgrade, T: type MuxedUpgrade,