diff --git a/etc/001.yml b/etc/001.yml index 01a70a76a..ba523820e 100644 --- a/etc/001.yml +++ b/etc/001.yml @@ -32,8 +32,8 @@ listeners: - binding: proxy address: tcp:0.0.0.0:1122 service: ssh - # options: - # mtu: 64 + options: + mtu: 768 # for iperf_tcp (iperf3) - binding: proxy diff --git a/etc/002.yml b/etc/002.yml index 353ce406e..9e82ca24e 100644 --- a/etc/002.yml +++ b/etc/002.yml @@ -13,4 +13,4 @@ ctrl: endpoint: tls:127.0.0.1:6262 link: - listener: quic:127.0.0.1:6002 \ No newline at end of file + listener: transwarp:127.0.0.1:6996 \ No newline at end of file diff --git a/ziti-controller/main.go b/ziti-controller/main.go index 21f5ebb74..b4e9dc8c4 100644 --- a/ziti-controller/main.go +++ b/ziti-controller/main.go @@ -21,6 +21,7 @@ import ( "github.com/netfoundry/ziti-cmd/common/version" "github.com/netfoundry/ziti-cmd/ziti-controller/subcmd" "github.com/netfoundry/ziti-edge/build" + "github.com/netfoundry/ziti-fabric/transwarp" "github.com/netfoundry/ziti-foundation/transport" "github.com/netfoundry/ziti-foundation/transport/quic" "github.com/netfoundry/ziti-foundation/transport/tcp" @@ -30,10 +31,11 @@ import ( func init() { pfxlog.Global(logrus.InfoLevel) - pfxlog.SetPrefix("bitbucket.org/netfoundry/") + pfxlog.SetPrefix("github.com/netfoundry/") transport.AddAddressParser(quic.AddressParser{}) transport.AddAddressParser(tls.AddressParser{}) transport.AddAddressParser(tcp.AddressParser{}) + transport.AddAddressParser(transwarp.AddressParser{}) build.InitBuildInfo(version.GetCmdBuildInfo()) } diff --git a/ziti-router/main.go b/ziti-router/main.go index ddc7824b9..3811c3292 100644 --- a/ziti-router/main.go +++ b/ziti-router/main.go @@ -18,6 +18,7 @@ package main import ( "github.com/netfoundry/ziti-cmd/ziti-router/subcmd" + "github.com/netfoundry/ziti-fabric/transwarp" "github.com/netfoundry/ziti-foundation/transport" "github.com/netfoundry/ziti-foundation/transport/quic" "github.com/netfoundry/ziti-foundation/transport/tcp" @@ -32,6 +33,7 @@ func init() { transport.AddAddressParser(quic.AddressParser{}) transport.AddAddressParser(tls.AddressParser{}) transport.AddAddressParser(tcp.AddressParser{}) + transport.AddAddressParser(transwarp.AddressParser{}) } func main() {