Enable transwarp.

etc/001.transwarp.yml

@@ -1,72 +0,0 @@
-v: 3
-
-identity:
-  cert:                 etc/ca/intermediate/certs/001-client.cert.pem
-  server_cert:          etc/ca/intermediate/certs/001-server.cert.pem
-  key:                  etc/ca/intermediate/private/001.key.pem
-  ca:                   etc/ca/intermediate/certs/ca-chain.cert.pem
-
-# Configure the forwarder options
-#
-forwarder:
-  # How frequently does the forwarder probe the link latency. This will ultimately determine the resolution of the
-  # responsiveness available to smart routing. This resolution comes at the expense of bandwidth utilization for the
-  # probes, control plane utilization, and CPU utilization processing the results.
-  #
-  latencyProbeInterval: 1000
-
-#trace:
-#  path:                 001.trace
-
-#profile:
-#  memory:
-#    path:               001.memprof
-#  cpu:
-#    path:               001.cpuprof
-
-ctrl:
-  endpoint:             tls:127.0.0.1:6262
-
-link:
-  dialers:
-    - binding:          transwarp
-      bind:             :0
-
-listeners:
-  # basic ssh proxy
-  - binding:            proxy
-    address:            tcp:0.0.0.0:1122
-    service:            ssh
-    options:
-      mtu:              10240
-
-  # for iperf_tcp (iperf3)
-  - binding:            proxy
-    address:            tcp:0.0.0.0:7001
-    service:            iperf
-
-  # for iperf_udp (iperf3)
-  - binding:            proxy_udp
-    address:            udp:0.0.0.0:7001
-    service:            iperf_udp
-
-  # example xgress_transport
-  - binding:            transport
-    address:            tls:0.0.0.0:7002
-    options:
-      retransmission:   true
-      randomDrops:      true
-      drop1InN:         5000
-
-  # example xgress_udp
-  - binding:            transport_udp
-    address:            udp:0.0.0.0:7003
-    options:
-      retransmission:   true
-      randomDrops:      true
-      drop1InN:         5000
-
-# xctrl_example
-#
-#example:
-#  delay:                1

etc/002.transwarp.yml

@@ -1,28 +0,0 @@
-v: 3
-
-identity:
-  cert:                 etc/ca/intermediate/certs/002-client.cert.pem
-  server_cert:          etc/ca/intermediate/certs/002-server.cert.pem
-  key:                  etc/ca/intermediate/private/002.key.pem
-  ca:                   etc/ca/intermediate/certs/ca-chain.cert.pem
-
-#trace:
-#  path:                 002.trace
-
-ctrl:
-  endpoint:             tls:127.0.0.1:6262
-
-link:
-  listeners:
-    - binding:          transwarp
-      bind:             127.0.0.1:6002
-#  listeners:
-#    - binding:          transport
-#      bind:             tls:127.0.0.1:6002
-#      advertise:        tls:127.0.0.1:6002
-#      options:
-#        outQueueSize:   16
-#  dialers:
-#    - binding:          transport
-#      options:
-#        outQueueSize:   32

etc/002.yml

@@ -17,8 +17,14 @@ link:
     - binding:          transport
       bind:             tls:127.0.0.1:6002
       advertise:        tls:127.0.0.1:6002
+
+      # ALPHA: Transwarp
+      #bind:             transwarp:127.0.0.1:6002
+      #advertise:        transwarp:127.0.0.1:6002
+
       options:
         outQueueSize:   16
+
   dialers:
     - binding:          transport
       options:

etc/003.transwarp.yml

@@ -1,37 +0,0 @@
-v: 3
-
-identity:
-  cert:                 etc/ca/intermediate/certs/003-client.cert.pem
-  server_cert:          etc/ca/intermediate/certs/003-server.cert.pem
-  key:                  etc/ca/intermediate/private/003.key.pem
-  ca:                   etc/ca/intermediate/certs/ca-chain.cert.pem
-
-# Configure the forwarder options
-#
-forwarder:
-  # How frequently does the forwarder probe the link latency. This will ultimately determine the resolution of the
-  # responsiveness available to smart routing. This resolution comes at the expense of bandwidth utilization for the
-  # probes, control plane utilization, and CPU utilization processing the results.
-  #
-  latencyProbeInterval: 1000
-
-#trace:
-#  path:                 003.trace
-
-#profile:
-#  memory:
-#    path:               003.memprof
-#    intervalMs:         5000
-
-ctrl:
-  endpoint:             tls:127.0.0.1:6262
-
-link:
-  dialers:
-    - binding:          transwarp
-      bind:             :0
-
-dialers:
-  - binding:            transport
-    options:
-      mtu:              10240

go.mod

@@ -2,7 +2,9 @@ module github.com/openziti/ziti
 
 go 1.14
 
-// replace github.com/openziti/foundation => ../foundation
+replace github.com/openziti/foundation => ../foundation
+
+replace github.com/michaelquigley/dilithium => ../../q/research/dilithium
 
 // replace github.com/openziti/fabric => ../fabric
 
@@ -18,7 +20,7 @@ require (
 	github.com/fatih/color v1.7.0
 	github.com/go-ole/go-ole v1.2.4 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/protobuf v1.3.5
+	github.com/golang/protobuf v1.4.0
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/mux v1.7.4
 	github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d
@@ -37,7 +39,7 @@ require (
 	github.com/shirou/gopsutil v2.19.11+incompatible
 	github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
 	github.com/sirupsen/logrus v1.6.0
-	github.com/spf13/cobra v0.0.7
+	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.5.0
 	github.com/stretchr/testify v1.6.1

ziti-router/main.go

@@ -23,6 +23,7 @@ import (
 	"github.com/openziti/foundation/transport/quic"
 	"github.com/openziti/foundation/transport/tcp"
 	"github.com/openziti/foundation/transport/tls"
+	"github.com/openziti/foundation/transport/transwarp"
 	"github.com/openziti/ziti/common/version"
 	"github.com/openziti/ziti/ziti-router/subcmd"
 	"github.com/sirupsen/logrus"
@@ -34,6 +35,7 @@ func init() {
 	transport.AddAddressParser(quic.AddressParser{})
 	transport.AddAddressParser(tls.AddressParser{})
 	transport.AddAddressParser(tcp.AddressParser{})
+	transport.AddAddressParser(transwarp.AddressParser{})
 
 	build.InitBuildInfo(version.GetCmdBuildInfo())
 }