Merge branch 'master' into marshall/refactor-registrar

Author: jmwample

Cargo.lock

@@ -13,13 +13,12 @@ cc="^1.0.3"
 [lib]
 name = "rust_dark_decoy"
 crate-type = ["rlib", "staticlib"]
-
 [dependencies]
 toml = "0.7"
 serde = {version="1.0", features=["derive"]}
 libc = "0.2"
 aes-gcm = { version="0.10", features=["aes"]}
-chrono = "0.4"
+time = {version="0.3.28", features=["macros", "formatting", "local-offset"]} 
 pnet = "0.33"
 arrayref = "0.3"
 log = "0.4"

Cargo.toml

@@ -11,6 +11,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/refraction-networking/conjure/pkg/dtls/dnat"
 	cj "github.com/refraction-networking/conjure/pkg/station/lib"
 	"github.com/refraction-networking/conjure/pkg/station/log"
 	"github.com/refraction-networking/conjure/pkg/transports/connecting/dtls"
@@ -80,7 +81,8 @@ func main() {
 		}
 	}
 
-	dtlsTransport, err := dtls.NewTransport(logIPDTLS(connManager.AddAuthFailConnecting), logIPDTLS(connManager.AddOtherFailConnecting), logIPDTLS(connManager.AddCreatedToDialSuccessfulConnecting), logIPDTLS(connManager.AddCreatedToListenSuccessfulConnecting))
+	dtlsbuilder := dnat.NewDNAT
+	dtlsTransport, err := dtls.NewTransport(logIPDTLS(connManager.AddAuthFailConnecting), logIPDTLS(connManager.AddOtherFailConnecting), logIPDTLS(connManager.AddCreatedToDialSuccessfulConnecting), logIPDTLS(connManager.AddCreatedToListenSuccessfulConnecting), dtlsbuilder)
 
 	if err != nil {
 		log.Fatalf("failed to setup dtls: %v", err)