Merge branch 'develop' into newreno

.drone.yml

@@ -5,14 +5,14 @@ name: default
 
 steps:
   - name: format
-    image: golang:1.15
+    image: golang:1.16
     commands:
       - bash -c "gofmt -l . | wc -l | cmp -s <(echo 0) || (gofmt -l . && exit 1)"
 
   - name: install
-    image: golang:1.15
+    image: golang:1.16
     environment:
-      GOPROXY: http://10.20.0.25:3142|direct
+      GOPROXY: http://containers.internal.hillion.co.uk:3142,direct
     volumes:
       - name: cache
         path: /go
@@ -20,7 +20,7 @@ steps:
       - go test -i ./...
 
   - name: test
-    image: golang:1.15
+    image: golang:1.16
     volumes:
       - name: cache
         path: /go
@@ -28,7 +28,7 @@ steps:
       - go test ./...
 
   - name: build (debian)
-    image: golang:1.15-buster
+    image: golang:1.16-buster
     when:
       event:
         - push
@@ -36,8 +36,9 @@ steps:
       - name: cache
         path: /go
     commands:
-      - GOOS=linux GOARCH=amd64         go build -o linux_amd64
-      - GOOS=linux GOARCH=arm   GOARM=7 go build -o linux_arm_v7
+      - GOOS=linux   GOARCH=amd64           go build -o linux_amd64
+      - GOOS=linux   GOARCH=arm    GOARM=7  go build -o linux_arm_v7
+      - GOOS=freebsd GOARCH=arm64           go build -o freebsd_arm64_v8a
 
   - name: upload
     image: minio/mc
@@ -49,9 +50,10 @@ steps:
       SECRET_KEY:
         from_secret: s3_secret_key
     commands:
-      - mc alias set s3 http://10.20.0.25:3900 $${ACCESS_KEY} $${SECRET_KEY}
+      - mc alias set s3 https://s3.us-west-001.backblazeb2.com $${ACCESS_KEY} $${SECRET_KEY}
       - mc cp linux_amd64  s3/dissertation/binaries/debian/${DRONE_BRANCH}_linux_amd64
       - mc cp linux_arm_v7 s3/dissertation/binaries/debian/${DRONE_BRANCH}_linux_arm_v7
+      - mc cp freebsd_arm64_v8a s3/dissertation/binaries/debian/${DRONE_BRANCH}_freebsd_arm64_v8a
 
 volumes:
   - name: cache
@@ -59,6 +61,6 @@ volumes:
 
 ---
 kind: signature
-hmac: a7c498332fbf43f422a68475c53daa0a65b7801004f09300e40275007dec9bee
+hmac: de07a3ab113028b48c590c406f7ab8f74aeae49679287862168d912ec10e9920
 
 ...

go.mod

@@ -3,8 +3,8 @@ module mpbl3p
 go 1.15
 
 require (
+	github.com/JakeHillion/taptun v0.0.0-20210320133200-cf0ef75b1bff
 	github.com/go-playground/validator/v10 v10.4.1
-	github.com/pkg/taptun v0.0.0-20160424131934-bbbd335672ab
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/stretchr/testify v1.4.0
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9

go.sum

@@ -1,3 +1,7 @@
+github.com/JakeHillion/taptun v0.0.0-20160424131934-bbbd335672ab h1:/UB98lLA11PJZOqhdzqeITMTMz6eiTjti9Z9kYq1SWQ=
+github.com/JakeHillion/taptun v0.0.0-20160424131934-bbbd335672ab/go.mod h1:8WBFCKR7ZdT+WVtgyiSPJf6gqXiNZUvfglN8vwkoyBE=
+github.com/JakeHillion/taptun v0.0.0-20210320133200-cf0ef75b1bff h1:O+wiKpOHS2BidwDz6ZuR3dVQNsrD55raE9mY4yub6Wc=
+github.com/JakeHillion/taptun v0.0.0-20210320133200-cf0ef75b1bff/go.mod h1:8WBFCKR7ZdT+WVtgyiSPJf6gqXiNZUvfglN8vwkoyBE=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
@@ -14,8 +18,6 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/pkg/taptun v0.0.0-20160424131934-bbbd335672ab h1:dAXDRtXYxj4sTR5WeRuTFJGH18QMT6AUpUgRwedI6es=
-github.com/pkg/taptun v0.0.0-20160424131934-bbbd335672ab/go.mod h1:N5a/Ll2ZNk5wjiLNW9LIiNtO9RNYcaYmcXSYKMYrlDg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=

tun/tun.go

@@ -1,7 +1,7 @@
 package tun
 
 import (
-	"github.com/pkg/taptun"
+	"github.com/JakeHillion/taptun"
 	"io"
 	"log"
 	"mpbl3p/proxy"