fix: oversight on dtls.new

vacp2p · Jun 21, 2024 · 24e42a9 · 24e42a9
1 parent 66a2aa7
commit 24e42a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/webrtc/dtls/dtls_transport.nim b/webrtc/dtls/dtls_transport.nim
@@ -40,7 +40,7 @@ type
   Dtls* = ref object of RootObj
     connections: Table[TransportAddress, DtlsConn]
     transport: Stun
-    laddr: TransportAddress
+    laddr*: TransportAddress
     started: bool
     ctr_drbg: mbedtls_ctr_drbg_context
     entropy: mbedtls_entropy_context
@@ -49,13 +49,13 @@ type
     serverCert: mbedtls_x509_crt
     localCert: seq[byte]
 
-proc new*(T: type Dtls, transport: Stun, laddr: TransportAddress): T =
-  var self = T()
-
-  self.connections = initTable[TransportAddress, DtlsConn]()
-  self.transport = transport
-  self.laddr = laddr
-  self.started = true
+proc new*(T: type Dtls, transport: Stun): T =
+  var self = T(
+    connections: initTable[TransportAddress, DtlsConn](),
+    transport: transport,
+    laddr: transport.laddr,
+    started: true
+  )
 
   mb_ctr_drbg_init(self.ctr_drbg)
   mb_entropy_init(self.entropy)
@@ -65,6 +65,7 @@ proc new*(T: type Dtls, transport: Stun, laddr: TransportAddress): T =
   self.serverCert = self.ctr_drbg.generateCertificate(self.serverPrivKey)
   self.localCert = newSeq[byte](self.serverCert.raw.len)
   copyMem(addr self.localCert[0], self.serverCert.raw.p, self.serverCert.raw.len)
+  return self
 
 proc stop*(self: Dtls) {.async.} =
   if not self.started:

diff --git a/webrtc/dtls/dtls_utils.nim b/webrtc/dtls/dtls_utils.nim
@@ -15,6 +15,7 @@ import mbedtls/ctr_drbg
 import mbedtls/x509_crt
 import mbedtls/bignum
 import mbedtls/md
+import mbedtls/error
 
 # This sequence is used for debugging.
 const mb_ssl_states* = @[

diff --git a/webrtc/stun/stun_transport.nim b/webrtc/stun/stun_transport.nim
@@ -21,8 +21,9 @@ type
   Stun* = ref object
     connections: Table[TransportAddress, StunConn]
     pendingConn: AsyncQueue[StunConn]
-    readingLoop: Future[void]
+    readingLoop: Future[void].Raising([CancelledError])
     udp: UdpTransport
+    laddr*: TransportAddress
 
     usernameProvider: StunUsernameProvider
     usernameChecker: StunUsernameChecker
@@ -106,11 +107,12 @@ proc new*(
   ##
   var self = T(
     udp: udp,
+    laddr: udp.laddr,
     usernameProvider: usernameProvider,
     usernameChecker: usernameChecker,
     passwordProvider: passwordProvider,
     rng: rng
   )
-  self.readingLoop = stunReadLoop()
+  self.readingLoop = self.stunReadLoop()
   self.pendingConn = newAsyncQueue[StunConn](StunMaxPendingConnections)
   return self